lkml.org 
[lkml]   [2023]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH net-next 6/8] 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 <daniel@makrotopia.org>
    ---
    drivers/net/phy/realtek.c | 22 +++++-----------------
    1 file changed, 5 insertions(+), 17 deletions(-)

    diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
    index e6a46c4d97b1..cde61a30ac4c 100644
    --- a/drivers/net/phy/realtek.c
    +++ b/drivers/net/phy/realtek.c
    @@ -68,10 +68,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)
    @@ -669,14 +665,11 @@ static int rtl822x_config_aneg(struct phy_device *phydev)
    int val, 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;
    }
    @@ -722,12 +715,7 @@ static int rtl822x_read_status(struct phy_device *phydev)
    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);
    --
    2.40.0
    \
     
     \ /
      Last update: 2023-05-11 01:03    [W:6.550 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site