Skip to contentSkip to conversation

net: phy: aquantia: only poll GLOBAL_CFG regs on aqr113, aqr113c and aqr115c

PATCH Applied Bartosz Golaszewski 3 participants 3 messages Jul 29, 2024 – Jul 31, 2024

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

PATCH v2 1/1 net: phy: aquantia: only poll GLOBAL_CFG regs on aqr113, aqr113c and aqr115c

From: Bartosz Golaszewski <[email protected]>

Commit 708405f3e56e ("net: phy: aquantia: wait for the GLOBAL_CFG to start returning real values") introduced a workaround for an issue observed on aqr115c. However there were never any reports of it happening on other models and the workaround has been reported to cause and issue on aqr113c (and it may cause the same on any other model not supporting 10M mode).

Let's limit the impact of the workaround to aqr113, aqr113c and aqr115c and poll the 100M GLOBAL_CFG register instead as both models are known to support it correctly.

Fixes 708405f3e56e ("net: phy: aquantia: wait for the GLOBAL_CFG to start returning real values")

---
v1 -> v2:
- update the commit message to mention aqr113 too
- fix the comment in the source file: 10M -> 100M

 drivers/net/phy/aquantia/aquantia_main.c | 29 +++++++++++++++++-------
 1 file changed, 21 insertions(+), 8 deletions(-)
drivers/net/phy/aquantia/aquantia_main.c +21 -8
index d12e35374231..e982e9ce44a5 100644
@@ -653,13 +653,7 @@ static int aqr107_fill_interface_modes(struct phy_device *phydev)
 	unsigned long *possible = phydev->possible_interfaces;
 	unsigned int serdes_mode, rate_adapt;
 	phy_interface_t interface;
-	int i, val, ret;
-
-	ret = phy_read_mmd_poll_timeout(phydev, MDIO_MMD_VEND1,
-					VEND1_GLOBAL_CFG_10M, val, val != 0,
-					1000, 100000, false);
-	if (ret)
-		return ret;
+	int i, val;
 
 	/* Walk the media-speed configuration registers to determine which
 	 * host-side serdes modes may be used by the PHY depending on the
@@ -708,6 +702,25 @@ static int aqr107_fill_interface_modes(struct phy_device *phydev)
 	return 0;
 }
 
+static int aqr113c_fill_interface_modes(struct phy_device *phydev)
+{
+	int val, ret;
+
+	/* It's been observed on some models that - when coming out of suspend
+	 * - the FW signals that the PHY is ready but the GLOBAL_CFG registers
+	 * continue on returning zeroes for some time. Let's poll the 100M
+	 * register until it returns a real value as both 113c and 115c support
+	 * this mode.
+	 */
+	ret = phy_read_mmd_poll_timeout(phydev, MDIO_MMD_VEND1,
+					VEND1_GLOBAL_CFG_100M, val, val != 0,
+					1000, 100000, false);
+	if (ret)
+		return ret;
+
+	return aqr107_fill_interface_modes(phydev);
+}
+
 static int aqr113c_config_init(struct phy_device *phydev)
 {
 	int ret;
@@ -725,7 +738,7 @@ static int aqr113c_config_init(struct phy_device *phydev)
 	if (ret)
 		return ret;
 
-	return aqr107_fill_interface_modes(phydev);
+	return aqr113c_fill_interface_modes(phydev);
 }
 
 static int aqr107_probe(struct phy_device *phydev)
Signature · 1 line
2.43.0
Reviewed-by on v2 1/1
#1 lore raw

Quoting Bartosz Golaszewski (2024-07-29 17:03:14)

Quoted 13 lines

From: Bartosz Golaszewski <[email protected]>

Commit 708405f3e56e ("net: phy: aquantia: wait for the GLOBAL_CFG to start returning real values") introduced a workaround for an issue observed on aqr115c. However there were never any reports of it happening on other models and the workaround has been reported to cause and issue on aqr113c (and it may cause the same on any other model not supporting 10M mode).

Let's limit the impact of the workaround to aqr113, aqr113c and aqr115c and poll the 100M GLOBAL_CFG register instead as both models are known to support it correctly.

Quoted 5 lines
Fixes 708405f3e56e ("net: phy: aquantia: wait for the GLOBAL_CFG to start returning real values")

Thanks!

Quoted 66 lines

---
v1 -> v2:
- update the commit message to mention aqr113 too
- fix the comment in the source file: 10M -> 100M

 drivers/net/phy/aquantia/aquantia_main.c | 29 +++++++++++++++++-------
 1 file changed, 21 insertions(+), 8 deletions(-)
drivers/net/phy/aquantia/aquantia_main.c +21 -8
index d12e35374231..e982e9ce44a5 100644
@@ -653,13 +653,7 @@ static int aqr107_fill_interface_modes(struct phy_device *phydev)
        unsigned long *possible = phydev->possible_interfaces;
        unsigned int serdes_mode, rate_adapt;
        phy_interface_t interface;
-       int i, val, ret;
-
-       ret = phy_read_mmd_poll_timeout(phydev, MDIO_MMD_VEND1,
-                                       VEND1_GLOBAL_CFG_10M, val, val != 0,
-                                       1000, 100000, false);
-       if (ret)
-               return ret;
+       int i, val;
 
        /* Walk the media-speed configuration registers to determine which
         * host-side serdes modes may be used by the PHY depending on the
@@ -708,6 +702,25 @@ static int aqr107_fill_interface_modes(struct phy_device *phydev)
        return 0;
 }
 
+static int aqr113c_fill_interface_modes(struct phy_device *phydev)
+{
+       int val, ret;
+
+       /* It's been observed on some models that - when coming out of suspend
+        * - the FW signals that the PHY is ready but the GLOBAL_CFG registers
+        * continue on returning zeroes for some time. Let's poll the 100M
+        * register until it returns a real value as both 113c and 115c support
+        * this mode.
+        */
+       ret = phy_read_mmd_poll_timeout(phydev, MDIO_MMD_VEND1,
+                                       VEND1_GLOBAL_CFG_100M, val, val != 0,
+                                       1000, 100000, false);
+       if (ret)
+               return ret;
+
+       return aqr107_fill_interface_modes(phydev);
+}
+
 static int aqr113c_config_init(struct phy_device *phydev)
 {
        int ret;
@@ -725,7 +738,7 @@ static int aqr113c_config_init(struct phy_device *phydev)
        if (ret)
                return ret;
 
-       return aqr107_fill_interface_modes(phydev);
+       return aqr113c_fill_interface_modes(phydev);
 }
 
 static int aqr107_probe(struct phy_device *phydev)
Signature · 1 line
2.43.0
#2 lore raw
In reply to Bartosz Golaszewski
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 10 lines · On Mon, 29 Jul 2024 17:03:14 +0200 you wrote:

From: Bartosz Golaszewski <[email protected]>

Commit 708405f3e56e ("net: phy: aquantia: wait for the GLOBAL_CFG to start returning real values") introduced a workaround for an issue observed on aqr115c. However there were never any reports of it happening on other models and the workaround has been reported to cause and issue on aqr113c (and it may cause the same on any other model not supporting 10M mode).

[...]

Here is the summary with links:
- [net,v2] net: phy: aquantia: only poll GLOBAL_CFG regs on aqr113, aqr113c and aqr115c

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

You are awesome, thank you!

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