net: stmmac: dwmac-spacemit: Fix wrong macro definition
Subsystems (7)
Inochi Amaoto
maintainerv2 cover net: stmmac: dwmac-spacemit: Fix wrong macro definition
Fix Wrong macro definition of the Spacemit K3.
Changed from v1:
- https://lore.kernel.org/netdev/[email protected]
1. Separate the patch into two patches
2. Use the right macro name for the LPI interrupt.
Inochi Amaoto (2):
net: stmmac: dwmac-spacemit: Fix wrong phy interface definition
net: stmmac: dwmac-spacemit: Fix wrong irq definition
.../net/ethernet/stmicro/stmmac/dwmac-spacemit.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
--
2.54.0
Inochi Amaoto
maintainerPATCH v2 1/2 net: stmmac: dwmac-spacemit: Fix wrong phy interface definition
The current MII interface register definition from the vendor is wrong, use the right number for the macro. Also, correct the interface mask in spacemit_set_phy_intf_sel() so it can update the register with the right number
--- drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c +6 -3
@@ -18,8 +18,10 @@#include "stmmac_platform.h" /* ctrl register bits */ -#define CTRL_PHY_INTF_RGMII BIT(3) -#define CTRL_PHY_INTF_MII BIT(4) +#define CTRL_PHY_INTF_MODE GENMASK(4, 3) +#define CTRL_PHY_INTF_RMII FIELD_PREP(CTRL_PHY_INTF_MODE, 0) +#define CTRL_PHY_INTF_RGMII FIELD_PREP(CTRL_PHY_INTF_MODE, 1) +#define CTRL_PHY_INTF_MII FIELD_PREP(CTRL_PHY_INTF_MODE, 3)#define CTRL_WAKE_IRQ_EN BIT(9)#define CTRL_PHY_IRQ_EN BIT(12)
@@ -118,7 +120,7 @@ static void spacemit_get_interfaces(struct stmmac_priv *priv, void *bsp_priv,static int spacemit_set_phy_intf_sel (void *bsp_priv,u8 phy_intf_sel) { -unsigned int mask =CTRL_PHY_INTF_MII |CTRL_PHY_INTF_RGMII ; +unsigned int mask =CTRL_PHY_INTF_MODE ;struct spacmit_dwmac *dwmac = bsp_priv;unsigned int val =0 ;
@@ -128,6 +130,7 @@ static int spacemit_set_phy_intf_sel(void *bsp_priv, u8 phy_intf_sel)break ;case PHY_INTF_SEL_RMII : + val =CTRL_PHY_INTF_RMII ;break ;case PHY_INTF_SEL_RGMII :
Signature · 1 line
2.54.0
Re: [PATCH net v2 1/2] net: stmmac: dwmac-spacemit: Fix wrong phy interface definition
Hello,
Quoted 38 lines · Inochi Amaoto
The current MII interface register definition from the vendor is wrong, use the right number for the macro. Also, correct the interface mask in
spacemit_set_phy_intf_sel()so it can update the register with the right numberFixes 30f0ba420ed3 ("net: stmmac: Add glue layer for Spacemit K3 SoC")Signed-off-by Inochi Amaoto <[email protected]>--- drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c +5
-3@@ -18,8 +18,10 @@#include "stmmac_platform.h" /* ctrl register bits */ -#define CTRL_PHY_INTF_RGMII BIT(3) -#define CTRL_PHY_INTF_MII BIT(4) +#define CTRL_PHY_INTF_MODE GENMASK(4, 3) +#define CTRL_PHY_INTF_RMII FIELD_PREP(CTRL_PHY_INTF_MODE, 0) +#define CTRL_PHY_INTF_RGMII FIELD_PREP(CTRL_PHY_INTF_MODE, 1) +#define CTRL_PHY_INTF_MII FIELD_PREP(CTRL_PHY_INTF_MODE, 3)#define CTRL_WAKE_IRQ_EN BIT(9)#define CTRL_PHY_IRQ_EN BIT(12)@@ -118,7 +120,7 @@ static void spacemit_get_interfaces(struct stmmac_priv *priv, void *bsp_priv,static int spacemit_set_phy_intf_sel (void *bsp_priv,u8 phy_intf_sel) { -unsigned int mask =CTRL_PHY_INTF_MII |CTRL_PHY_INTF_RGMII ; +unsigned int mask =CTRL_PHY_INTF_MODE ;struct spacmit_dwmac *dwmac = bsp_priv;unsigned int val =0 ;
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c static int spacemit_set_phy_intf_sel(void *bsp_priv, u8 phy_intf_sel) · line 133
Quoted 4 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c +1
-0@@ -128,6 +130,7 @@ static int spacemit_set_phy_intf_sel(void *bsp_priv, u8 phy_intf_sel)break ;case PHY_INTF_SEL_RMII : + val =CTRL_PHY_INTF_RMII ;
This isn't strictly-speaking necessary as this is 0 and val is already 0, maybe compilers can figure it out and this leaves us with more self-documenting code ?
So I'm ok with that personally,
Maxime
Quoted 3 lines
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c +0
-0break ;case PHY_INTF_SEL_RGMII :
Inochi Amaoto
maintainerPATCH v2 2/2 net: stmmac: dwmac-spacemit: Fix wrong irq definition
In reply to Inochi AmaotoThe current irq definition of the wake irq and the lpi irq is wrong, replace them with the right number and name.
--- drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c +2 -2
@@ -22,8 +22,8 @@#define CTRL_PHY_INTF_RMII FIELD_PREP(CTRL_PHY_INTF_MODE, 0)#define CTRL_PHY_INTF_RGMII FIELD_PREP(CTRL_PHY_INTF_MODE, 1)#define CTRL_PHY_INTF_MII FIELD_PREP(CTRL_PHY_INTF_MODE, 3) -#define CTRL_WAKE_IRQ_EN BIT(9) -#define CTRL_PHY_IRQ_EN BIT(12) +#define CTRL_LPI_IRQ_EN BIT(9) +#define CTRL_WAKE_IRQ_EN BIT(12)/* dline register bits */ #define RGMII_RX_DLINE_EN BIT(0)
Signature · 1 line
2.54.0
Re: [PATCH net v2 2/2] net: stmmac: dwmac-spacemit: Fix wrong irq definition
Hi,
Quoted 5 lines · Inochi Amaoto
The current irq definition of the wake irq and the lpi irq is wrong, replace them with the right number and name.
Fixes 30f0ba420ed3 ("net: stmmac: Add glue layer for Spacemit K3 SoC")Signed-off-by Inochi Amaoto <[email protected]>
Maxime
Quoted 19 lines
--- drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/net/ethernet/stmicro/stmmac/dwmac-spacemit.c +2
-2@@ -22,8 +22,8 @@#define CTRL_PHY_INTF_RMII FIELD_PREP(CTRL_PHY_INTF_MODE, 0)#define CTRL_PHY_INTF_RGMII FIELD_PREP(CTRL_PHY_INTF_MODE, 1)#define CTRL_PHY_INTF_MII FIELD_PREP(CTRL_PHY_INTF_MODE, 3) -#define CTRL_WAKE_IRQ_EN BIT(9) -#define CTRL_PHY_IRQ_EN BIT(12) +#define CTRL_LPI_IRQ_EN BIT(9) +#define CTRL_WAKE_IRQ_EN BIT(12)/* dline register bits */ #define RGMII_RX_DLINE_EN BIT(0)
This series was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Tue, 23 Jun 2026 15:46:33 +0800 you wrote:
Fix Wrong macro definition of the Spacemit K3.
Changed from v1:
- https://lore.kernel.org/netdev/[email protected]
1. Separate the patch into two patches
2. Use the right macro name for the LPI interrupt.[...]
Here is the summary with links:
- [net,v2,1/2] net: stmmac: dwmac-spacemit: Fix wrong phy interface definition
https://git.kernel.org/netdev/net/c/d1e3a4c3b24d - [net,v2,2/2] net: stmmac: dwmac-spacemit: Fix wrong irq definition https://git.kernel.org/netdev/net/c/bf5cd5d4ca42
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html