net: phy: realtek: clear 1000Base-T lpa if link is down
authorDaniel Golle <daniel@makrotopia.org>
Wed, 15 Jan 2025 14:43:35 +0000 (14:43 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Jan 2025 12:01:40 +0000 (12:01 +0000)
Only read 1000Base-T link partner advertisement if autonegotiation has
completed and otherwise 1000Base-T link partner advertisement bits.

This fixes bogus 1000Base-T link partner advertisement after link goes
down (eg. by disconnecting the wire).
Fixes: 5cb409b3960e ("net: phy: realtek: clear 1000Base-T link partner advertisement")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/realtek.c

index f65d7f1f348e730b9086c9d50153de621e00f448..26b324ab0f90feaf845ae39de134f8af35fa375a 100644 (file)
@@ -1023,23 +1023,20 @@ static int rtl822x_c45_read_status(struct phy_device *phydev)
 {
        int ret, val;
 
-       ret = genphy_c45_read_status(phydev);
-       if (ret < 0)
-               return ret;
-
-       if (phydev->autoneg == AUTONEG_DISABLE ||
-           !genphy_c45_aneg_done(phydev))
-               mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
-
        /* Vendor register as C45 has no standardized support for 1000BaseT */
-       if (phydev->autoneg == AUTONEG_ENABLE) {
+       if (phydev->autoneg == AUTONEG_ENABLE && genphy_c45_aneg_done(phydev)) {
                val = phy_read_mmd(phydev, MDIO_MMD_VEND2,
                                   RTL822X_VND2_GANLPAR);
                if (val < 0)
                        return val;
-
-               mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);
+       } else {
+               val = 0;
        }
+       mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, val);
+
+       ret = genphy_c45_read_status(phydev);
+       if (ret < 0)
+               return ret;
 
        if (!phydev->link)
                return 0;