| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960 |
- From 92c8b9d558160d94b981dd8a2b9c47657627ffdc Mon Sep 17 00:00:00 2001
- From: Daniel Golle <[email protected]>
- Date: Sat, 22 Apr 2023 01:23:08 +0100
- Subject: [PATCH 2/3] net: phy: realtek: use inline functions for 10GbE
- advertisement
- Use existing generic inline functions to encode local advertisement
- of 10GbE link modes as well as to decode link-partner advertisement.
- Signed-off-by: Daniel Golle <[email protected]>
- ---
- drivers/net/phy/realtek.c | 22 +++++-----------------
- 1 file changed, 5 insertions(+), 17 deletions(-)
- --- a/drivers/net/phy/realtek.c
- +++ b/drivers/net/phy/realtek.c
- @@ -69,10 +69,6 @@
- #define RTL_SUPPORTS_5000FULL BIT(14)
- #define RTL_SUPPORTS_2500FULL BIT(13)
- #define RTL_SUPPORTS_10000FULL BIT(0)
- -#define RTL_ADV_2500FULL BIT(7)
- -#define RTL_LPADV_10000FULL BIT(11)
- -#define RTL_LPADV_5000FULL BIT(6)
- -#define RTL_LPADV_2500FULL BIT(5)
-
- #define RTL9000A_GINMR 0x14
- #define RTL9000A_GINMR_LINK_STATUS BIT(4)
- @@ -699,14 +695,11 @@ static int rtl822x_config_aneg(struct ph
- int ret = 0;
-
- if (phydev->autoneg == AUTONEG_ENABLE) {
- - u16 adv2500 = 0;
- -
- - if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
- - phydev->advertising))
- - adv2500 = RTL_ADV_2500FULL;
- -
- ret = phy_modify_paged_changed(phydev, 0xa5d, 0x12,
- - RTL_ADV_2500FULL, adv2500);
- + MDIO_AN_10GBT_CTRL_ADV10G |
- + MDIO_AN_10GBT_CTRL_ADV5G |
- + MDIO_AN_10GBT_CTRL_ADV2_5G,
- + linkmode_adv_to_mii_10gbt_adv_t(phydev->advertising));
- if (ret < 0)
- return ret;
- }
- @@ -743,12 +736,7 @@ static int rtl822x_read_status(struct ph
- if (lpadv < 0)
- return lpadv;
-
- - linkmode_mod_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT,
- - phydev->lp_advertising, lpadv & RTL_LPADV_10000FULL);
- - linkmode_mod_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
- - phydev->lp_advertising, lpadv & RTL_LPADV_5000FULL);
- - linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
- - phydev->lp_advertising, lpadv & RTL_LPADV_2500FULL);
- + mii_10gbt_stat_mod_linkmode_lpa_t(phydev->lp_advertising, lpadv);
- }
-
- ret = rtlgen_read_status(phydev);
|
