From 5c782915c5aecbece7780e38dceec8a0f7c7d15c Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mar 11 2024 08:12:41 +0000 Subject: net: phy: realtek: add 5Gbps support to rtl822x_config_aneg() (bsc#1217417). --- diff --git a/patches.suse/net-phy-realtek-add-5Gbps-support-to-rtl822x_config_.patch b/patches.suse/net-phy-realtek-add-5Gbps-support-to-rtl822x_config_.patch new file mode 100644 index 0000000..5a70a9d --- /dev/null +++ b/patches.suse/net-phy-realtek-add-5Gbps-support-to-rtl822x_config_.patch @@ -0,0 +1,53 @@ +From db1bb7741ff29bf2cefcbc0ca567644e9ed1caa9 Mon Sep 17 00:00:00 2001 +From: Heiner Kallweit +Date: Sun, 4 Feb 2024 15:18:50 +0100 +Subject: [PATCH] net: phy: realtek: add 5Gbps support to rtl822x_config_aneg() +Git-commit: db1bb7741ff29bf2cefcbc0ca567644e9ed1caa9 +Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git +Patch-mainline: Queued in subsystem maintainer repo +References: bsc#1217417 + +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 +Link: https://lore.kernel.org/r/5644ab50-e3e9-477c-96db-05cd5bdc2563@gmail.com +Signed-off-by: Jakub Kicinski +Acked-by: Takashi Iwai + +--- + drivers/net/phy/realtek.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c +index b5deccafdd9e..962df2b83070 100644 +--- a/drivers/net/phy/realtek.c ++++ b/drivers/net/phy/realtek.c +@@ -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; + } +-- +2.35.3 + diff --git a/series.conf b/series.conf index b07c8b0..91aa245 100644 --- a/series.conf +++ b/series.conf @@ -77,6 +77,7 @@ patches.suse/net-phy-realtek-add-support-for-RTL8126A-integrated-.patch patches.suse/net-mdio-add-2.5g-and-5g-related-PMA-speed-constants.patch patches.suse/net-phy-realtek-use-generic-MDIO-constants.patch + patches.suse/net-phy-realtek-add-5Gbps-support-to-rtl822x_config_.patch ######################################################## # kbuild/module infrastructure fixes