net: phy: realtek: always clear NBase-T lpa
authorDaniel Golle <daniel@makrotopia.org>
Wed, 15 Jan 2025 14:45:00 +0000 (14:45 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Jan 2025 12:01:40 +0000 (12:01 +0000)
Clear NBase-T link partner advertisement before calling
rtlgen_read_status() to avoid phy_resolve_aneg_linkmode() wrongly
setting speed and duplex.

This fixes bogus 2.5G/5G/10G link partner advertisement and thus
speed and duplex being set by phy_resolve_aneg_linkmode() due to stale
NBase-T lpa.

Fixes: 68d5cd09e891 ("net: phy: realtek: change order of calls in C22 read_status()")
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 93704abb678784b3e53f8637ceeaff0ba38d98b4..9cefca1aefa1b167e08c49a6ce052716e29a4d99 100644 (file)
@@ -952,15 +952,15 @@ static int rtl822x_read_status(struct phy_device *phydev)
 {
        int lpadv, ret;
 
+       mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
+
        ret = rtlgen_read_status(phydev);
        if (ret < 0)
                return ret;
 
        if (phydev->autoneg == AUTONEG_DISABLE ||
-           !phydev->autoneg_complete) {
-               mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
+           !phydev->autoneg_complete)
                return 0;
-       }
 
        lpadv = phy_read_paged(phydev, 0xa5d, 0x13);
        if (lpadv < 0)