Skip to contentSkip to conversation

net: phy: micrel: Fix the KSZ9131 MDI-X status issue

PATCH In review Raju Lakkaraju 3 participants 4 messages Jul 12, 2024 – Jul 25, 2024

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

PATCH 1/1 net: phy: micrel: Fix the KSZ9131 MDI-X status issue

Access information about Auto mdix completion and pair selection from the KSZ9131's Auto/MDI/MDI-X status register

Fixes b64e6a8794d9 ("net: phy: micrel: Add PHY Auto/MDI/MDI-X set driver for KSZ9131")
---
 drivers/net/phy/micrel.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/net/phy/micrel.c +18 -5
index ebafedde0ab7..fddc1b91ba7f 100644
@@ -1438,6 +1438,9 @@ static int ksz9131_config_init(struct phy_device *phydev)
 #define MII_KSZ9131_AUTO_MDIX		0x1C
 #define MII_KSZ9131_AUTO_MDI_SET	BIT(7)
 #define MII_KSZ9131_AUTO_MDIX_SWAP_OFF	BIT(6)
+#define MII_KSZ9131_DIG_AXAN_STS	0x14
+#define MII_KSZ9131_DIG_AXAN_STS_LINK_DET	BIT(14)
+#define MII_KSZ9131_DIG_AXAN_STS_A_SELECT	BIT(12)
 
 static int ksz9131_mdix_update(struct phy_device *phydev)
 {
@@ -1452,14 +1455,24 @@ static int ksz9131_mdix_update(struct phy_device *phydev)
 			phydev->mdix_ctrl = ETH_TP_MDI;
 		else
 			phydev->mdix_ctrl = ETH_TP_MDI_X;
+
+		phydev->mdix = phydev->mdix_ctrl;
 	} else {
+		ret = phy_read(phydev, MII_KSZ9131_DIG_AXAN_STS);
+		if (ret < 0)
+			return ret;
+
 		phydev->mdix_ctrl = ETH_TP_MDI_AUTO;
-	}
 
-	if (ret & MII_KSZ9131_AUTO_MDI_SET)
-		phydev->mdix = ETH_TP_MDI;
-	else
-		phydev->mdix = ETH_TP_MDI_X;
+		if (ret & MII_KSZ9131_DIG_AXAN_STS_LINK_DET) {
+			if (ret & MII_KSZ9131_DIG_AXAN_STS_A_SELECT)
+				phydev->mdix = ETH_TP_MDI;
+			else
+				phydev->mdix = ETH_TP_MDI_X;
+		} else {
+			phydev->mdix = ETH_TP_MDI_INVALID;
+		}
+	}
 
 	return 0;
 }
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 5 lines · Raju Lakkaraju

Access information about Auto mdix completion and pair selection from the KSZ9131's Auto/MDI/MDI-X status register

Fixes b64e6a8794d9 ("net: phy: micrel: Add PHY Auto/MDI/MDI-X set driver for KSZ9131")

@Andrew, @Heiner: the patch LGTM, any feedback on your side?

thanks,

Paolo

maintainer
#2 lore raw
In reply to Raju Lakkaraju
Quoted 2 lines · Raju Lakkaraju

Access information about Auto mdix completion and pair selection from the KSZ9131's Auto/MDI/MDI-X status register

Please explain what the broken behaviour is. How would i know i need this patch?

You have not included a Cc: stable tag. Does that mean this does not bother anybody and so does not need backporting?

Quoted 21 lines
Fixes b64e6a8794d9 ("net: phy: micrel: Add PHY Auto/MDI/MDI-X set driver for KSZ9131")
---
 drivers/net/phy/micrel.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/net/phy/micrel.c +3 -0
index ebafedde0ab7..fddc1b91ba7f 100644
@@ -1438,6 +1438,9 @@ static int ksz9131_config_init(struct phy_device *phydev)
 #define MII_KSZ9131_AUTO_MDIX		0x1C
 #define MII_KSZ9131_AUTO_MDI_SET	BIT(7)
 #define MII_KSZ9131_AUTO_MDIX_SWAP_OFF	BIT(6)
+#define MII_KSZ9131_DIG_AXAN_STS	0x14
+#define MII_KSZ9131_DIG_AXAN_STS_LINK_DET	BIT(14)
+#define MII_KSZ9131_DIG_AXAN_STS_A_SELECT	BIT(12)
 
 static int ksz9131_mdix_update(struct phy_device *phydev)
 {

drivers/net/phy/micrel.c static int ksz9131_mdix_update(struct phy_device *phydev) · line 1459

Quoted 5 lines
drivers/net/phy/micrel.c +2 -0
@@ -1452,14 +1455,24 @@ static int ksz9131_mdix_update(struct phy_device *phydev)
 			phydev->mdix_ctrl = ETH_TP_MDI;
 		else
 			phydev->mdix_ctrl = ETH_TP_MDI_X;
+
+		phydev->mdix = phydev->mdix_ctrl;

This seems a bit odd. phydev->mdix_ctrl is what the user wants to happen. This is generally ETH_TP_MDI_AUTO, meaning the PHY should figure it out. It can be ETH_TP_MDI_X, or ETH_TP_MDI which forces the configuration. phydev->mdix is what it has ended up using.

So the code above first seems to change what the user asked for. This is likely to replace ETH_TP_MDI_AUTO with one of the fixed modes, which will then break when the user replaces a crossed cable with a straight cable, and the forced mode is then wrong.

Setting mdix to mdix_ctrl then seems wrong. In most cases, you are going to get ETH_TP_MDI_AUTO, when in fact you should be returning what the PHY has decided on, ETH_TP_MDI_X, ETH_TP_MDI, or ETH_TP_MDI_INVALID because the link is down.

Maybe genphy_c45_read_mdix() will help you. It simply reads a PHY status register, sets phydev->mdix and it is done.

Andrew

#3 lore raw

Hi Andrew,

Thank you for review the patch.

Quoted 9 lines · Andrew Lunn

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

Quoted 2 lines · Raju Lakkaraju

Access information about Auto mdix completion and pair selection from the KSZ9131's Auto/MDI/MDI-X status register

Please explain what the broken behaviour is. How would i know i need this patch?

Ok. I will add broken behaviour details.

Quoted 3 lines

You have not included a Cc: stable tag. Does that mean this does not bother anybody and so does not need backporting?

Ok. I will add "Cc: stable tag"

Quoted 18 lines
Quoted 18 lines
Fixes b64e6a8794d9 ("net: phy: micrel: Add PHY Auto/MDI/MDI-X set driver for KSZ9131")
---
 drivers/net/phy/micrel.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/net/phy/micrel.c +3 -0
index ebafedde0ab7..fddc1b91ba7f 100644
@@ -1438,6 +1438,9 @@ static int ksz9131_config_init(struct phy_device *phydev)
 #define MII_KSZ9131_AUTO_MDIX                0x1C
 #define MII_KSZ9131_AUTO_MDI_SET     BIT(7)
 #define MII_KSZ9131_AUTO_MDIX_SWAP_OFF       BIT(6)
+#define MII_KSZ9131_DIG_AXAN_STS     0x14
+#define MII_KSZ9131_DIG_AXAN_STS_LINK_DET    BIT(14)
+#define MII_KSZ9131_DIG_AXAN_STS_A_SELECT    BIT(12)
 
Quoted 14 lines

drivers/net/phy/micrel.c static int ksz9131_mdix_update(struct phy_device *phydev) · line 1459

Quoted 8 lines
drivers/net/phy/micrel.c +2 -0
 static int ksz9131_mdix_update(struct phy_device *phydev)
 {
@@ -1452,14 +1455,24 @@ static int ksz9131_mdix_update(struct phy_device *phydev)
                      phydev->mdix_ctrl = ETH_TP_MDI;
              else
                      phydev->mdix_ctrl = ETH_TP_MDI_X;
+
+             phydev->mdix = phydev->mdix_ctrl;

This seems a bit odd. phydev->mdix_ctrl is what the user wants to happen. This is generally ETH_TP_MDI_AUTO, meaning the PHY should figure it out. It can be ETH_TP_MDI_X, or ETH_TP_MDI which forces the configuration. phydev->mdix is what it has ended up using.

I agree. I will fix it.

Quoted 9 lines

So the code above first seems to change what the user asked for. This is likely to replace ETH_TP_MDI_AUTO with one of the fixed modes, which will then break when the user replaces a crossed cable with a straight cable, and the forced mode is then wrong.

Setting mdix to mdix_ctrl then seems wrong. In most cases, you are going to get ETH_TP_MDI_AUTO, when in fact you should be returning what the PHY has decided on, ETH_TP_MDI_X, ETH_TP_MDI, or ETH_TP_MDI_INVALID because the link is down.

Yes. I agree with you.
I will fix it in next version of patch.

Quoted 4 lines

Maybe genphy_c45_read_mdix() will help you. It simply reads a PHY status register, sets phydev->mdix and it is done.

Ok

Quoted 1 line

Andrew

Signature · 2 lines
Thanks,                                                                         
Raju