Skip to contentSkip to conversation

net: stmmac: xgmac: fix a typo of register name in DPP safety handling

PATCH Applied Furong Xu 5 participants 5 messages Feb 3, 2024 – Feb 6, 2024

Subsystems (4)
lore
Share & tools
lore

Furong Xu

author
#0 lore raw

PATCH 1/1 net: stmmac: xgmac: fix a typo of register name in DPP safety handling

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")
---
 drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h      | 2 +-
 drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +1 -1
index 5c67a3f89f08..6a2c7d22df1e 100644
@@ -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
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +1 -1
index 04d7c4dc2e35..323c57f03c93 100644
@@ -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;
Signature · 1 line
2.34.1
#1 lore raw
Quoted 10 lines · 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")

Looks okay, but this is net-next material.

Quoted 35 lines

---
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 +-
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +-

2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +1 -1
index 5c67a3f89f08..6a2c7d22df1e 100644
@@ -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
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +1 -1
index 04d7c4dc2e35..323c57f03c93 100644
@@ -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;
Signature · 1 line
2.34.1
maintainer
#2 lore raw
Quoted 7 lines · Jiri Pirko
Quoted 6 lines · 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.

Quoted 6 lines
Quoted 4 lines

The macro name should be XGMAC_DPP_DISABLE.

Fixes 46eba193d04f ("net: stmmac: xgmac: fix handling of DPP safety error for DMA channels")

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

Reviewed-by on v1 1/1
#3 lore raw
In reply to Furong Xu
Quoted 7 lines · Furong Xu

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.

Thanks!

-Serge(y)

Quoted 37 lines
Fixes 46eba193d04f ("net: stmmac: xgmac: fix handling of DPP safety error for DMA channels")
---
 drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h      | 2 +-
 drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h +1 -1
index 5c67a3f89f08..6a2c7d22df1e 100644
@@ -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
drivers/net/ethernet/stmicro/stmmac/dwxgmac2_core.c +1 -1
index 04d7c4dc2e35..323c57f03c93 100644
@@ -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;
Signature · 1 line
2.34.1
#4 lore raw
In reply to Furong Xu
This patch was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:

Quoted 9 lines · On Sat, 3 Feb 2024 13:31:33 +0800 you 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.

[...]

Here is the summary with links:
- [net] net: stmmac: xgmac: fix a typo of register name in DPP safety handling

    https://git.kernel.org/netdev/net/c/1ce2654d87e2

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html