net: phy: realtek: clear master_slave_state if link is down
authorDaniel Golle <daniel@makrotopia.org>
Wed, 15 Jan 2025 14:43:43 +0000 (14:43 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Jan 2025 12:01:40 +0000 (12:01 +0000)
rtlgen_decode_physr() which sets master_slave_state isn't called in case
the link is down and other than rtlgen_read_status(),
rtl822x_c45_read_status() doesn't implicitely clear master_slave_state.

Avoid stale master_slave_state by always setting it to
MASTER_SLAVE_STATE_UNKNOWN in rtl822x_c45_read_status() in case the link
is down.

Fixes: 081c9c0265c9 ("net: phy: realtek: read duplex and gbit master from PHYSR register")
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 26b324ab0f90feaf845ae39de134f8af35fa375a..93704abb678784b3e53f8637ceeaff0ba38d98b4 100644 (file)
@@ -1038,8 +1038,10 @@ static int rtl822x_c45_read_status(struct phy_device *phydev)
        if (ret < 0)
                return ret;
 
-       if (!phydev->link)
+       if (!phydev->link) {
+               phydev->master_slave_state = MASTER_SLAVE_STATE_UNKNOWN;
                return 0;
+       }
 
        /* Read actual speed from vendor register. */
        val = phy_read_mmd(phydev, MDIO_MMD_VEND2, RTL_VND2_PHYSR);