2024-02-03 13:19:02

by Jiri Pirko

Subject: Re: [PATCH net] net: stmmac: xgmac: fix a typo of register name in DPP safety handling

Sat, Feb 03, 2024 at 06:31:33AM CET, [email protected] wrote:
>DDPP is copied from Synopsys Data book:
>
>DDPP: Disable Data path Parity Protection.
> When it is 0x0, Data path Parity Protection is enabled.
> When it is 0x1, Data path Parity Protection is disabled.
>
>The macro name should be XGMAC_DPP_DISABLE.
>
>Fixes: 46eba193d04f ("net: stmmac: xgmac: fix handling of DPP safety error for DMA channels")
>Signed-off-by: Furong Xu <[email protected]>

Looks okay, but this is net-next material.


>---
> drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 +-
> drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
>index 5c67a3f89f08..6a2c7d22df1e 100644
>--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
>+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h
>@@ -304,7 +304,7 @@
> #define XGMAC_TXCEIE BIT(0)
> #define XGMAC_MTL_ECC_INT_STATUS 0x000010cc
> #define XGMAC_MTL_DPP_CONTROL 0x000010e0
>-#define XGMAC_DDPP_DISABLE BIT(0)
>+#define XGMAC_DPP_DISABLE BIT(0)
> #define XGMAC_MTL_TXQ_OPMODE(x) (0x00001100 + (0x80 * (x)))
> #define XGMAC_TQS GENMASK(25, 16)
> #define XGMAC_TQS_SHIFT 16
>diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
>index 04d7c4dc2e35..323c57f03c93 100644
>--- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
>+++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c
>@@ -928,7 +928,7 @@ dwxgmac3_safety_feat_config(void __iomem *ioaddr, unsigned int asp,
> /* 5. Enable Data Path Parity Protection */
> value = readl(ioaddr + XGMAC_MTL_DPP_CONTROL);
> /* already enabled by default, explicit enable it again */
>- value &= ~XGMAC_DDPP_DISABLE;
>+ value &= ~XGMAC_DPP_DISABLE;
> writel(value, ioaddr + XGMAC_MTL_DPP_CONTROL);
>
> return 0;
>--
>2.34.1
>
>

2024-02-06 12:57:34

by Paolo Abeni

Subject: Re: [PATCH net] net: stmmac: xgmac: fix a typo of register name in DPP safety handling

On Sat, 2024-02-03 at 14:18 +0100, Jiri Pirko wrote:
> Sat, Feb 03, 2024 at 06:31:33AM CET, [email protected] wrote:
> > DDPP is copied from Synopsys Data book:
> >
> > DDPP: Disable Data path Parity Protection.
> > When it is 0x0, Data path Parity Protection is enabled.
> > When it is 0x1, Data path Parity Protection is disabled.
> >
> > The macro name should be XGMAC_DPP_DISABLE.
> >
> > Fixes: 46eba193d04f ("net: stmmac: xgmac: fix handling of DPP safety error for DMA channels")
> > Signed-off-by: Furong Xu <[email protected]>
>
> Looks okay, but this is net-next material.

The blamed commit has been applied to net before Serge spotted the typo
during patch review. I think it deserves the net target, so the typo
will never land into vanilla.

Cheers,

Paolo