git.openwrt.org Git - openwrt/staging/nbd.git/blob

   1 From ea8318cb33e593bbfc59d637eae45a69732c5387 Mon Sep 17 00:00:00 2001
   2 From: Daniel Golle <daniel@makrotopia.org>
   3 Date: Wed, 15 Jan 2025 14:43:43 +0000
   4 Subject: [PATCH] net: phy: realtek: clear master_slave_state if link is down
   5
   6 rtlgen_decode_physr() which sets master_slave_state isn't called in case
   7 the link is down and other than rtlgen_read_status(),
   8 rtl822x_c45_read_status() doesn't implicitely clear master_slave_state.
   9
  10 Avoid stale master_slave_state by always setting it to
  11 MASTER_SLAVE_STATE_UNKNOWN in rtl822x_c45_read_status() in case the link
  12 is down.
  13
  14 Fixes: 081c9c0265c9 ("net: phy: realtek: read duplex and gbit master from PHYSR register")
  15 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  16 Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
  17 Signed-off-by: David S. Miller <davem@davemloft.net>
  18 ---
  19  drivers/net/phy/realtek.c | 4 +++-
  20  1 file changed, 3 insertions(+), 1 deletion(-)
  21
  22 --- a/drivers/net/phy/realtek.c
  23 +++ b/drivers/net/phy/realtek.c
  24 @@ -1038,8 +1038,10 @@ static int rtl822x_c45_read_status(struc
  25         if (ret < 0)
  26                 return ret;
  27
  28 -       if (!phydev->link)
  29 +       if (!phydev->link) {
  30 +               phydev->master_slave_state = MASTER_SLAVE_STATE_UNKNOWN;
  31                 return 0;
  32 +       }
  33
  34         /* Read actual speed from vendor register. */
  35         val = phy_read_mmd(phydev, MDIO_MMD_VEND2, RTL_VND2_PHYSR);