]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net: phy: deal properly with autoneg incomplete in genphy_c45_read_lpa
authorHeiner Kallweit <hkallweit1@gmail.com>
Sun, 31 Mar 2019 17:54:07 +0000 (19:54 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Apr 2019 20:16:17 +0000 (13:16 -0700)
The link partner advertisement registers are not guaranteed to contain
valid values if autoneg is incomplete. Therefore, if
MDIO_AN_STAT1_COMPLETE isn't set, let's clear all link partner
capability bits. This also avoids unnecessary register reads if link
is down and phylib is in polling mode.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/phy-c45.c

index 666fbb0eec040d27ee0bcc38339bcd4bc76f05e7..05c3e87ffc2d034025d9b388fa1f64a3ab9b7e88 100644 (file)
@@ -266,6 +266,17 @@ int genphy_c45_read_lpa(struct phy_device *phydev)
        if (val < 0)
                return val;
 
+       if (!(val & MDIO_AN_STAT1_COMPLETE)) {
+               linkmode_clear_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
+                                  phydev->lp_advertising);
+               mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
+               mii_adv_mod_linkmode_adv_t(phydev->lp_advertising, 0);
+               phydev->pause = 0;
+               phydev->asym_pause = 0;
+
+               return 0;
+       }
+
        linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, phydev->lp_advertising,
                         val & MDIO_AN_STAT1_LPABLE);