Subject: Re: [PATCH v2 net-next 4/9] net: enetc: include MAC Merge / FP registers in register dump

From: Simon Horman <[email-masked]>
Date: Thu, 20 Apr 2023 16:38:00 +0200

On Tue, Apr 18, 2023 at 02:14:54PM +0300, Vladimir Oltean wrote:
> These have been useful in debugging various problems related to frame
> preemption, so make them available through ethtool --register-dump for
> later too.
> 
> Signed-off-by: Vladimir Oltean <[email-masked]>

Reviewed-by: Simon Horman <[email-masked]>

> ---
> v1->v2: patch is new
> 
>  .../ethernet/freescale/enetc/enetc_ethtool.c    | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
> 
> diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
> index 838a92131963..e993ed04ab57 100644
> --- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
> +++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c
> @@ -32,6 +32,12 @@ static const u32 enetc_port_regs[] = {
>  	ENETC_PM0_CMD_CFG, ENETC_PM0_MAXFRM, ENETC_PM0_IF_MODE
>  };
>  
> +static const u32 enetc_port_mm_regs[] = {
> +	ENETC_MMCSR, ENETC_PFPMR, ENETC_PTCFPR(0), ENETC_PTCFPR(1),
> +	ENETC_PTCFPR(2), ENETC_PTCFPR(3), ENETC_PTCFPR(4), ENETC_PTCFPR(5),
> +	ENETC_PTCFPR(6), ENETC_PTCFPR(7),
> +};
> +
>  static int enetc_get_reglen(struct net_device *ndev)
>  {
>  	struct enetc_ndev_priv *priv = netdev_priv(ndev);
> @@ -45,6 +51,9 @@ static int enetc_get_reglen(struct net_device *ndev)
>  	if (hw->port)
>  		len += ARRAY_SIZE(enetc_port_regs);
>  
> +	if (hw->port && !!(priv->si->hw_features & ENETC_SI_F_QBU))

nit: I think you could make the condition.

	if (hw->port && priv->si->hw_features & ENETC_SI_F_QBU)

which would be consistent with the condition in the next hunk.

> +		len += ARRAY_SIZE(enetc_port_mm_regs);
> +
>  	len *= sizeof(u32) * 2; /* store 2 entries per reg: addr and value */
>  
>  	return len;
> @@ -90,6 +99,14 @@ static void enetc_get_regs(struct net_device *ndev, struct ethtool_regs *regs,
>  		*buf++ = addr;
>  		*buf++ = enetc_rd(hw, addr);
>  	}
> +
> +	if (priv->si->hw_features & ENETC_SI_F_QBU) {
> +		for (i = 0; i < ARRAY_SIZE(enetc_port_mm_regs); i++) {
> +			addr = ENETC_PORT_BASE + enetc_port_mm_regs[i];
> +			*buf++ = addr;
> +			*buf++ = enetc_rd(hw, addr);
> +		}
> +	}
>  }
>  
>  static const struct {
> -- 
> 2.34.1
>