[net-next] net: phy: check PMAPMD link status only in genphy_c45_read_link
diff mbox series

Message ID 9c7b68ea-ac30-a7ec-1c88-ae819dbbb7b4@gmail.com
State Accepted
Delegated to: David Miller
Headers show
Series
  • [net-next] net: phy: check PMAPMD link status only in genphy_c45_read_link
Related show

Commit Message

Heiner Kallweit Feb. 22, 2019, 9:59 p.m. UTC
The current code reports a link as up if all devices (except a few
blacklisted ones) report the link as up. This breaks Aquantia AQCS109
for lower speeds because on this PHY the PCS link status reflects a
10G link only. For Marvell there's a similar issue, therefore PHYXS
device isn't checked.

There may be more PHYs where depending on the mode the link status
of only selected devices is relevant.

For now it seems to be sufficient to check the link status of the
PMAPMD device only. Leave the loop in the code to be prepared in
case we have to add functionality to check more than one device,
depending on the mode.

Successfully tested on a board with an AQCS109.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/phy/phy-c45.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

Comments

David Miller Feb. 25, 2019, 1:43 a.m. UTC | #1
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Fri, 22 Feb 2019 22:59:38 +0100

> The current code reports a link as up if all devices (except a few
> blacklisted ones) report the link as up. This breaks Aquantia AQCS109
> for lower speeds because on this PHY the PCS link status reflects a
> 10G link only. For Marvell there's a similar issue, therefore PHYXS
> device isn't checked.
> 
> There may be more PHYs where depending on the mode the link status
> of only selected devices is relevant.
> 
> For now it seems to be sufficient to check the link status of the
> PMAPMD device only. Leave the loop in the code to be prepared in
> case we have to add functionality to check more than one device,
> depending on the mode.
> 
> Successfully tested on a board with an AQCS109.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

Applied.

Patch
diff mbox series

diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c
index d80797e8d..ce5fa5346 100644
--- a/drivers/net/phy/phy-c45.c
+++ b/drivers/net/phy/phy-c45.c
@@ -215,17 +215,10 @@  EXPORT_SYMBOL_GPL(genphy_c45_aneg_done);
  */
 int genphy_c45_read_link(struct phy_device *phydev)
 {
-	u32 mmd_mask = phydev->c45_ids.devices_in_package;
+	u32 mmd_mask = MDIO_DEVS_PMAPMD;
 	int val, devad;
 	bool link = true;
 
-	/* The vendor devads and C22EXT do not report link status. Avoid the
-	 * PHYXS instance as its status may depend on the MAC being
-	 * appropriately configured for the negotiated speed.
-	 */
-	mmd_mask &= ~(MDIO_DEVS_VEND1 | MDIO_DEVS_VEND2 | MDIO_DEVS_C22EXT |
-		      MDIO_DEVS_PHYXS);
-
 	while (mmd_mask && link) {
 		devad = __ffs(mmd_mask);
 		mmd_mask &= ~BIT(devad);