target/linux/generic/pending-6.1/727-net-phy-realtek-use-inline-functions-for-10GbE-adver.patch

   1 From 92c8b9d558160d94b981dd8a2b9c47657627ffdc Mon Sep 17 00:00:00 2001
   2 From: Daniel Golle <daniel@makrotopia.org>
   3 Date: Sat, 22 Apr 2023 01:23:08 +0100
   4 Subject: [PATCH 2/3] net: phy: realtek: use inline functions for 10GbE
   5  advertisement
   6
   7 Use existing generic inline functions to encode local advertisement
   8 of 10GbE link modes as well as to decode link-partner advertisement.
   9
  10 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  11 ---
  12  drivers/net/phy/realtek.c | 22 +++++-----------------
  13  1 file changed, 5 insertions(+), 17 deletions(-)
  14
  15 --- a/drivers/net/phy/realtek.c
  16 +++ b/drivers/net/phy/realtek.c
  17 @@ -68,10 +68,6 @@
  18  #define RTL_SUPPORTS_5000FULL                  BIT(14)
  19  #define RTL_SUPPORTS_2500FULL                  BIT(13)
  20  #define RTL_SUPPORTS_10000FULL                 BIT(0)
  21 -#define RTL_ADV_2500FULL                       BIT(7)
  22 -#define RTL_LPADV_10000FULL                    BIT(11)
  23 -#define RTL_LPADV_5000FULL                     BIT(6)
  24 -#define RTL_LPADV_2500FULL                     BIT(5)
  25
  26  #define RTL9000A_GINMR                         0x14
  27  #define RTL9000A_GINMR_LINK_STATUS             BIT(4)
  28 @@ -671,14 +667,11 @@ static int rtl822x_config_aneg(struct ph
  29         int ret = 0;
  30
  31         if (phydev->autoneg == AUTONEG_ENABLE) {
  32 -               u16 adv2500 = 0;
  33 -
  34 -               if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
  35 -                                     phydev->advertising))
  36 -                       adv2500 = RTL_ADV_2500FULL;
  37 -
  38                 ret = phy_modify_paged_changed(phydev, 0xa5d, 0x12,
  39 -                                              RTL_ADV_2500FULL, adv2500);
  40 +                                              MDIO_AN_10GBT_CTRL_ADV10G |
  41 +                                              MDIO_AN_10GBT_CTRL_ADV5G |
  42 +                                              MDIO_AN_10GBT_CTRL_ADV2_5G,
  43 +                       linkmode_adv_to_mii_10gbt_adv_t(phydev->advertising));
  44                 if (ret < 0)
  45                         return ret;
  46         }
  47 @@ -715,12 +708,7 @@ static int rtl822x_read_status(struct ph
  48                 if (lpadv < 0)
  49                         return lpadv;
  50
  51 -               linkmode_mod_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT,
  52 -                       phydev->lp_advertising, lpadv & RTL_LPADV_10000FULL);
  53 -               linkmode_mod_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
  54 -                       phydev->lp_advertising, lpadv & RTL_LPADV_5000FULL);
  55 -               linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
  56 -                       phydev->lp_advertising, lpadv & RTL_LPADV_2500FULL);
  57 +               mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, lpadv);
  58         }
  59
  60         ret = rtlgen_read_status(phydev);