Skip to contentSkip to conversation

net: dpaa: fix mode setting

PATCH Applied Michael Walle 4 participants 6 messages Jul 17 – Jul 22

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 net: dpaa: fix mode setting

Before converting to the phylink interface, the init function would have set a non-reserved I/F mode in the maccfg2 register. After converting to phylink, 0 is written as mode, which is a reserved value (although it's the hardware default). Without a valid mode, a SGMII link is never established between the MAC and the PHY and thus .link_up() is never called which could set the correct mode according to the actual speed.

Fix it by setting the maximum speed of the phy_interface_t in use in .mac_config() - just like the driver did before the phylink conversion.

Fixes 5d93cfcf7360 ("net: dpaa: Convert to phylink")

---
I didn't grab Sean's Rb tag as this is somewhat different.

Changes in v3:
- keep the mode setting also in .adjust_link().
- reword the commit message, to be (hopefully) more precise
- Link to v2: https://lore.kernel.org/r/[email protected]/

Changes in v2:
- the setting is/was based on the maximum speed, not the current speed. thus, move the setting into mac_config().
- Link to v1: https://lore.kernel.org/r/[email protected]/

 .../net/ethernet/freescale/fman/fman_dtsec.c    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/net/ethernet/freescale/fman/fman_dtsec.c +12 -5
index fe35703c509e..b8d70c0ecb6c 100644
@@ -900,22 +900,28 @@ static void dtsec_mac_config(struct phylink_config *config, unsigned int mode,
 {
 	struct mac_device *mac_dev = fman_config_to_mac(config);
 	struct dtsec_regs __iomem *regs = mac_dev->fman_mac->regs;
-	u32 tmp;
+	u32 ecntrl, maccfg2;
+
+	maccfg2 = ioread32be(&regs->maccfg2);
+	maccfg2 &= ~(MACCFG2_NIBBLE_MODE | MACCFG2_BYTE_MODE);
 
 	switch (state->interface) {
 	case PHY_INTERFACE_MODE_RMII:
-		tmp = DTSEC_ECNTRL_RMM;
+		ecntrl = DTSEC_ECNTRL_RMM;
+		maccfg2 |= MACCFG2_NIBBLE_MODE;
 		break;
 	case PHY_INTERFACE_MODE_RGMII:
 	case PHY_INTERFACE_MODE_RGMII_ID:
 	case PHY_INTERFACE_MODE_RGMII_RXID:
 	case PHY_INTERFACE_MODE_RGMII_TXID:
-		tmp = DTSEC_ECNTRL_GMIIM | DTSEC_ECNTRL_RPM;
+		ecntrl = DTSEC_ECNTRL_GMIIM | DTSEC_ECNTRL_RPM;
+		maccfg2 |= MACCFG2_BYTE_MODE;
 		break;
 	case PHY_INTERFACE_MODE_SGMII:
 	case PHY_INTERFACE_MODE_1000BASEX:
 	case PHY_INTERFACE_MODE_2500BASEX:
-		tmp = DTSEC_ECNTRL_TBIM | DTSEC_ECNTRL_SGMIIM;
+		ecntrl = DTSEC_ECNTRL_TBIM | DTSEC_ECNTRL_SGMIIM;
+		maccfg2 |= MACCFG2_BYTE_MODE;
 		break;
 	default:
 		dev_warn(mac_dev->dev, "cannot configure dTSEC for %s\n",
@@ -923,7 +929,8 @@ static void dtsec_mac_config(struct phylink_config *config, unsigned int mode,
 		return;
 	}
 
-	iowrite32be(tmp, &regs->ecntrl);
+	iowrite32be(ecntrl, &regs->ecntrl);
+	iowrite32be(maccfg2, &regs->maccfg2);
 }
 
 static void dtsec_link_up(struct phylink_config *config, struct phy_device *phy,
Signature · 1 line
2.47.3
reviewer Reviewed-by on v3 1/1
#1 lore raw
Quoted 67 lines · Michael Walle

Before converting to the phylink interface, the init function would have set a non-reserved I/F mode in the maccfg2 register. After converting to phylink, 0 is written as mode, which is a reserved value (although it's the hardware default). Without a valid mode, a SGMII link is never established between the MAC and the PHY and thus .link_up() is never called which could set the correct mode according to the actual speed.

Fix it by setting the maximum speed of the phy_interface_t in use in .mac_config() - just like the driver did before the phylink conversion.

Fixes 5d93cfcf7360 ("net: dpaa: Convert to phylink")

---
I didn't grab Sean's Rb tag as this is somewhat different.

Changes in v3:
- keep the mode setting also in .adjust_link().
- reword the commit message, to be (hopefully) more precise
- Link to v2: https://lore.kernel.org/r/[email protected]/

Changes in v2:
- the setting is/was based on the maximum speed, not the current speed. thus, move the setting into mac_config().
- Link to v1: https://lore.kernel.org/r/[email protected]/

  .../net/ethernet/freescale/fman/fman_dtsec.c    | 17 ++++++++++++-----
  1 file changed, 12 insertions(+), 5 deletions(-)
drivers/net/ethernet/freescale/fman/fman_dtsec.c +10 -4
index fe35703c509e..b8d70c0ecb6c 100644
@@ -900,22 +900,28 @@ static void dtsec_mac_config(struct phylink_config *config, unsigned int mode,
  {
  	struct mac_device *mac_dev = fman_config_to_mac(config);
  	struct dtsec_regs __iomem *regs = mac_dev->fman_mac->regs;
-	u32 tmp;
+	u32 ecntrl, maccfg2;
+
+	maccfg2 = ioread32be(&regs->maccfg2);
+	maccfg2 &= ~(MACCFG2_NIBBLE_MODE | MACCFG2_BYTE_MODE);
 
  	switch (state->interface) {
  	case PHY_INTERFACE_MODE_RMII:
-		tmp = DTSEC_ECNTRL_RMM;
+		ecntrl = DTSEC_ECNTRL_RMM;
+		maccfg2 |= MACCFG2_NIBBLE_MODE;
  		break;
  	case PHY_INTERFACE_MODE_RGMII:
  	case PHY_INTERFACE_MODE_RGMII_ID:
  	case PHY_INTERFACE_MODE_RGMII_RXID:
  	case PHY_INTERFACE_MODE_RGMII_TXID:
-		tmp = DTSEC_ECNTRL_GMIIM | DTSEC_ECNTRL_RPM;
+		ecntrl = DTSEC_ECNTRL_GMIIM | DTSEC_ECNTRL_RPM;
+		maccfg2 |= MACCFG2_BYTE_MODE;
  		break;
  	case PHY_INTERFACE_MODE_SGMII:
  	case PHY_INTERFACE_MODE_1000BASEX:
  	case PHY_INTERFACE_MODE_2500BASEX:
-		tmp = DTSEC_ECNTRL_TBIM | DTSEC_ECNTRL_SGMIIM;
+		ecntrl = DTSEC_ECNTRL_TBIM | DTSEC_ECNTRL_SGMIIM;
+		maccfg2 |= MACCFG2_BYTE_MODE;
  		break;
  	default:
  		dev_warn(mac_dev->dev, "cannot configure dTSEC for %s\n",

drivers/net/ethernet/freescale/fman/fman_dtsec.c static void dtsec_mac_config(struct phylink_config *config, unsigned int mode, · line 936

Quoted 9 lines
drivers/net/ethernet/freescale/fman/fman_dtsec.c +2 -1
@@ -923,7 +929,8 @@ static void dtsec_mac_config(struct phylink_config *config, unsigned int mode,
  		return;
  	}
 
-	iowrite32be(tmp, &regs->ecntrl);
+	iowrite32be(ecntrl, &regs->ecntrl);
+	iowrite32be(maccfg2, &regs->maccfg2);
  }
 
  static void dtsec_link_up(struct phylink_config *config, struct phy_device *phy,

Christian, can you test this patch with ethernet at 100/1G speed if you still have access to those P5020/P5040 boards?

https://lore.kernel.org/all/[email protected]/

Reviewed-by Sean Anderson
#2 lore raw

On 17 July 2026 at 11:11 am, Sean Anderson <[email protected]> wrote:

On 7/17/26 09:20, Michael Walle wrote:

---
I didn't grab Sean's Rb tag as this is somewhat different.
Changes in v3:
- keep the mode setting also in .adjust_link().
- reword the commit message, to be (hopefully) more precise
- Link to v2: https://lore.kernel.org/r/[email protected]/
Changes in v2:
- the setting is/was based on the maximum speed, not the current speed. thus, move the setting into mac_config().
- Link to v1: https://lore.kernel.org/r/[email protected]/

 .../net/ethernet/freescale/fman/fman_dtsec.c    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/net/ethernet/freescale/fman/fman_dtsec.c +12 -4
index fe35703c509e..b8d70c0ecb6c 100644
@@ -900,22 +900,28 @@ static void dtsec_mac_config(struct phylink_config *config, unsigned int mode,
 {
     struct mac_device *mac_dev = fman_config_to_mac(config);
     struct dtsec_regs __iomem *regs = mac_dev->fman_mac->regs;
-    u32 tmp;
+    u32 ecntrl, maccfg2;
+
+    maccfg2 = ioread32be(&regs->maccfg2);
+    maccfg2 &= ~(MACCFG2_NIBBLE_MODE | MACCFG2_BYTE_MODE);
       switch (state->interface) {
     case PHY_INTERFACE_MODE_RMII:
-        tmp = DTSEC_ECNTRL_RMM;
+        ecntrl = DTSEC_ECNTRL_RMM;
+        maccfg2 |= MACCFG2_NIBBLE_MODE;
         break;
     case PHY_INTERFACE_MODE_RGMII:
     case PHY_INTERFACE_MODE_RGMII_ID:
     case PHY_INTERFACE_MODE_RGMII_RXID:
     case PHY_INTERFACE_MODE_RGMII_TXID:
-        tmp = DTSEC_ECNTRL_GMIIM | DTSEC_ECNTRL_RPM;
+        ecntrl = DTSEC_ECNTRL_GMIIM | DTSEC_ECNTRL_RPM;
+        maccfg2 |= MACCFG2_BYTE_MODE;
         break;
     case PHY_INTERFACE_MODE_SGMII:
     case PHY_INTERFACE_MODE_1000BASEX:
     case PHY_INTERFACE_MODE_2500BASEX:
-        tmp = DTSEC_ECNTRL_TBIM | DTSEC_ECNTRL_SGMIIM;
+        ecntrl = DTSEC_ECNTRL_TBIM | DTSEC_ECNTRL_SGMIIM;
+        maccfg2 |= MACCFG2_BYTE_MODE;
         break;
     default:
         dev_warn(mac_dev->dev, "cannot configure dTSEC for %s\n",
@@ -923,7 +929,8 @@ static void dtsec_mac_config(struct phylink_config *config, unsigned int mode,
         return;
     }
 -    iowrite32be(tmp, &regs->ecntrl);
+    iowrite32be(ecntrl, &regs->ecntrl);
+    iowrite32be(maccfg2, &regs->maccfg2);
 }
   static void dtsec_link_up(struct phylink_config *config, struct phy_device *phy,
 

Christian, can you test this patch with ethernet at 100/1G speed if you still have access to those P5020/P5040 boards?

- - -

Yes, I will test it as soon as possible.

- Christian

#3 lore raw
In reply to Sean Anderson
Quoted 79 lines · Sean Anderson
Quoted 67 lines · Michael Walle

Before converting to the phylink interface, the init function would have set a non-reserved I/F mode in the maccfg2 register. After converting to phylink, 0 is written as mode, which is a reserved value (although it's the hardware default). Without a valid mode, a SGMII link is never established between the MAC and the PHY and thus .link_up() is never called which could set the correct mode according to the actual speed.

Fix it by setting the maximum speed of the phy_interface_t in use in .mac_config() - just like the driver did before the phylink conversion.

Fixes 5d93cfcf7360 ("net: dpaa: Convert to phylink")

---
I didn't grab Sean's Rb tag as this is somewhat different.

Changes in v3:
  - keep the mode setting also in .adjust_link().
  - reword the commit message, to be (hopefully) more precise
  - Link to v2: https://lore.kernel.org/r/[email protected]/

Changes in v2:
  - the setting is/was based on the maximum speed, not the current speed. thus, move the setting into mac_config().
  - Link to v1: https://lore.kernel.org/r/[email protected]/

  .../net/ethernet/freescale/fman/fman_dtsec.c    | 17 ++++++++++++-----

  1 file changed, 12 insertions(+), 5 deletions(-)
drivers/net/ethernet/freescale/fman/fman_dtsec.c +4 -1
index fe35703c509e..b8d70c0ecb6c 100644
@@ -900,22 +900,28 @@ static void dtsec_mac_config(struct 
 phylink_config *config, unsigned int mode,
   {
       struct mac_device *mac_dev = fman_config_to_mac(config);
       struct dtsec_regs __iomem *regs = mac_dev->fman_mac->regs;
-    u32 tmp;
+    u32 ecntrl, maccfg2;
+
+    maccfg2 = ioread32be(&regs->maccfg2);
+    maccfg2 &= ~(MACCFG2_NIBBLE_MODE | MACCFG2_BYTE_MODE);
         switch (state->interface) {

      case PHY_INTERFACE_MODE_RMII:
-        tmp = DTSEC_ECNTRL_RMM;
+        ecntrl = DTSEC_ECNTRL_RMM;
+        maccfg2 |= MACCFG2_NIBBLE_MODE;
          break;
      case PHY_INTERFACE_MODE_RGMII:
      case PHY_INTERFACE_MODE_RGMII_ID:
      case PHY_INTERFACE_MODE_RGMII_RXID:
      case PHY_INTERFACE_MODE_RGMII_TXID:
-        tmp = DTSEC_ECNTRL_GMIIM | DTSEC_ECNTRL_RPM;
+        ecntrl = DTSEC_ECNTRL_GMIIM | DTSEC_ECNTRL_RPM; +        maccfg2 |= MACCFG2_BYTE_MODE;
          break;
      case PHY_INTERFACE_MODE_SGMII:
      case PHY_INTERFACE_MODE_1000BASEX:
      case PHY_INTERFACE_MODE_2500BASEX:
-        tmp = DTSEC_ECNTRL_TBIM | DTSEC_ECNTRL_SGMIIM; +        ecntrl = DTSEC_ECNTRL_TBIM | DTSEC_ECNTRL_SGMIIM; +        maccfg2 |= MACCFG2_BYTE_MODE;
          break;
      default:
          dev_warn(mac_dev->dev, "cannot configure dTSEC for %s\n",

drivers/net/ethernet/freescale/fman/fman_dtsec.c static void dtsec_mac_config(struct · line 936

Quoted 8 lines
drivers/net/ethernet/freescale/fman/fman_dtsec.c +2 -0
@@ -923,7 +929,8 @@ static void dtsec_mac_config(struct 
 phylink_config *config, unsigned int mode,
           return;
       }
   -    iowrite32be(tmp, &regs->ecntrl);
+    iowrite32be(ecntrl, &regs->ecntrl);
+    iowrite32be(maccfg2, &regs->maccfg2);
   }
     static void dtsec_link_up(struct phylink_config *config, struct phy_device *phy,
Quoted 5 lines

Christian, can you test this patch with ethernet at 100/1G speed if you still have access to those P5020/P5040 boards?

https://lore.kernel.org/all/[email protected]/

I tested the patch today. I don't see any differences.

Further information: https://github.com/chzigotzky/kernels/releases/tag/v7.2.0-rc3-fman-dtsec-patch

Christian

Signature · 1 line
Sent with BrassMonkey 34.2.2 (https://github.com/chzigotzky/Web-Browsers-and-Suites-for-Linux-PPC/releases/tag/BrassMonkey_34.2.2)
#4 lore raw

PATCH v3 1/1 net: dpaa: fix mode setting

Quoted 84 lines · Christian Zigotzky
Quoted 83 lines · Sean Anderson
Quoted 68 lines · Michael Walle

Before converting to the phylink interface, the init function would have set a non-reserved I/F mode in the maccfg2 register. After converting to phylink, 0 is written as mode, which is a reserved value (although it's the hardware default). Without a valid mode, a SGMII link is never established between the MAC and the PHY and thus .link_up() is never called which could set the correct mode according to the actual speed.

Fix it by setting the maximum speed of the phy_interface_t in use in .mac_config() - just like the driver did before the phylink conversion.

Fixes 5d93cfcf7360 ("net: dpaa: Convert to phylink")

---
I didn't grab Sean's Rb tag as this is somewhat different.

Changes in v3:
  - keep the mode setting also in .adjust_link().
  - reword the commit message, to be (hopefully) more precise
  - Link to v2: https://lore.kernel.org/r/[email protected]/

Changes in v2:
  - the setting is/was based on the maximum speed, not the current speed. thus, move the setting into mac_config().
  - Link to v1: https://lore.kernel.org/r/[email protected]/

  .../net/ethernet/freescale/fman/fman_dtsec.c    | 17
++++++++++++-----

  1 file changed, 12 insertions(+), 5 deletions(-)
drivers/net/ethernet/freescale/fman/fman_dtsec.c +4 -1
index fe35703c509e..b8d70c0ecb6c 100644
@@ -900,22 +900,28 @@ static void dtsec_mac_config(struct 
 phylink_config *config, unsigned int mode,
   {
       struct mac_device *mac_dev = fman_config_to_mac(config);
       struct dtsec_regs __iomem *regs = mac_dev->fman_mac->regs;
-    u32 tmp;
+    u32 ecntrl, maccfg2;
+
+    maccfg2 = ioread32be(&regs->maccfg2);
+    maccfg2 &= ~(MACCFG2_NIBBLE_MODE | MACCFG2_BYTE_MODE);
         switch (state->interface) {

      case PHY_INTERFACE_MODE_RMII:
-        tmp = DTSEC_ECNTRL_RMM;
+        ecntrl = DTSEC_ECNTRL_RMM;
+        maccfg2 |= MACCFG2_NIBBLE_MODE;
          break;
      case PHY_INTERFACE_MODE_RGMII:
      case PHY_INTERFACE_MODE_RGMII_ID:
      case PHY_INTERFACE_MODE_RGMII_RXID:
      case PHY_INTERFACE_MODE_RGMII_TXID:
-        tmp = DTSEC_ECNTRL_GMIIM | DTSEC_ECNTRL_RPM;
+        ecntrl = DTSEC_ECNTRL_GMIIM | DTSEC_ECNTRL_RPM; +        maccfg2 |= MACCFG2_BYTE_MODE;
          break;
      case PHY_INTERFACE_MODE_SGMII:
      case PHY_INTERFACE_MODE_1000BASEX:
      case PHY_INTERFACE_MODE_2500BASEX:
-        tmp = DTSEC_ECNTRL_TBIM | DTSEC_ECNTRL_SGMIIM; +        ecntrl = DTSEC_ECNTRL_TBIM | DTSEC_ECNTRL_SGMIIM; +        maccfg2 |= MACCFG2_BYTE_MODE;
          break;
      default:
          dev_warn(mac_dev->dev, "cannot configure dTSEC for %s\n",

drivers/net/ethernet/freescale/fman/fman_dtsec.c static void dtsec_mac_config(struct · line 936

Quoted 8 lines
drivers/net/ethernet/freescale/fman/fman_dtsec.c +2 -0
@@ -923,7 +929,8 @@ static void dtsec_mac_config(struct 
 phylink_config *config, unsigned int mode,
           return;
       }
   -    iowrite32be(tmp, &regs->ecntrl);
+    iowrite32be(ecntrl, &regs->ecntrl);
+    iowrite32be(maccfg2, &regs->maccfg2);
   }
     static void dtsec_link_up(struct phylink_config *config, struct phy_device *phy,

Christian, can you test this patch with ethernet at 100/1G speed if you still have access to those P5020/P5040 boards?

Quoted 8 lines
Quoted 2 lines

https://lore.kernel.org/all/[email protected]/

I tested the patch today. I don't see any differences.

Further information: https://github.com/chzigotzky/kernels/releases/tag/v7.2.0-rc3-fman-dtsec-patch

Christian

I tested further the new patch today and switching between 100Mbit/s and 1Gbit/s works without any problems.

[ 1692.006428] fsl_dpaa_mac ffe4e8000.ethernet eth0: PHY [mdio@ffe4e1120:03] driver [Micrel KSZ9021 Gigabit PHY] (irq=POLL)
[ 1692.006448] fsl_dpaa_mac ffe4e8000.ethernet eth0: configuring for phy/rgmii link mode
[ 1692.021436] fsl_dpaa_mac ffe5e8000.ethernet eth2: PHY [mdio@ffe4e1120:07] driver [Micrel KSZ9021 Gigabit PHY] (irq=POLL)
[ 1692.021456] fsl_dpaa_mac ffe5e8000.ethernet eth2: configuring for phy/rgmii link mode
[ 1695.057699] fsl_dpaa_mac ffe4e8000.ethernet eth0: Link is Up - 1Gbps/Full - flow control rx/tx
[ 2148.681140] fsl_dpaa_mac ffe4e8000.ethernet eth0: Link is Down
[ 2149.704534] fsl_dpaa_mac ffe4e8000.ethernet eth0: Link is Up - 100Mbps/Full - flow control rx/tx
[ 2199.875179] fsl_dpaa_mac ffe4e8000.ethernet eth0: Link is Down
[ 2201.923103] fsl_dpaa_mac ffe4e8000.ethernet eth0: Link is Up - 1Gbps/Full - flow control rx/tx

- Christian

Signature · 1 line
Sent with BrassMonkey 34.2.2 (https://github.com/chzigotzky/Web-Browsers-and-Suites-for-Linux-PPC/releases/tag/BrassMonkey_34.2.2)
#5 lore raw
In reply to Michael Walle
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:

Hello:

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

Quoted 8 lines · On Fri, 17 Jul 2026 15:20:29 +0200 you wrote:

Before converting to the phylink interface, the init function would have set a non-reserved I/F mode in the maccfg2 register. After converting to phylink, 0 is written as mode, which is a reserved value (although it's the hardware default). Without a valid mode, a SGMII link is never established between the MAC and the PHY and thus .link_up() is never called which could set the correct mode according to the actual speed.

[...]

Here is the summary with links:
- [net,v3] net: dpaa: fix mode setting

    https://git.kernel.org/netdev/net/c/da2c6bcc5e30

You are awesome, thank you!

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