]> www.infradead.org Git - users/hch/misc.git/commitdiff
net: phy: realtek: add 5Gbps support to rtl822x_config_aneg()
authorHeiner Kallweit <hkallweit1@gmail.com>
Sun, 4 Feb 2024 14:18:50 +0000 (15:18 +0100)
committerJakub Kicinski <kuba@kernel.org>
Thu, 8 Feb 2024 02:19:51 +0000 (18:19 -0800)
RTL8126 as an evolution of RTL8125 supports 5Gbps. rtl822x_config_aneg()
is used by the PHY driver for the integrated PHY, therefore add 5Gbps
support to it.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/5644ab50-e3e9-477c-96db-05cd5bdc2563@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/phy/realtek.c

index b5deccafdd9e22736c0480b1127b037cce8f2813..962df2b830705a4e6720b4fdfa55a7b9189e0fe2 100644 (file)
@@ -680,15 +680,19 @@ static int rtl822x_config_aneg(struct phy_device *phydev)
        int ret = 0;
 
        if (phydev->autoneg == AUTONEG_ENABLE) {
-               u16 adv2500 = 0;
+               u16 adv = 0;
 
                if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,
                                      phydev->advertising))
-                       adv2500 = MDIO_AN_10GBT_CTRL_ADV2_5G;
+                       adv |= MDIO_AN_10GBT_CTRL_ADV2_5G;
+               if (linkmode_test_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT,
+                                     phydev->advertising))
+                       adv |= MDIO_AN_10GBT_CTRL_ADV5G;
 
                ret = phy_modify_paged_changed(phydev, 0xa5d, 0x12,
-                                              MDIO_AN_10GBT_CTRL_ADV2_5G,
-                                              adv2500);
+                                              MDIO_AN_10GBT_CTRL_ADV2_5G |
+                                              MDIO_AN_10GBT_CTRL_ADV5G,
+                                              adv);
                if (ret < 0)
                        return ret;
        }