mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-10-31 14:04:26 -04:00
13cdc8955c
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.80 Manually rebased: generic/hack-6.1/650-netfilter-add-xt_FLOWOFFLOAD-target.patch[1] All other patches automatically rebased. 1. Acknowledgement to @heheb and @DragonBluep. Upstream commit for ref: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.80&id=9c5662e95a8dcc232c3ef4deb21033badcd260f6 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
62 lines
1.7 KiB
Diff
62 lines
1.7 KiB
Diff
From 312753d0aadba0f58841ae513b80fdbabc887523 Mon Sep 17 00:00:00 2001
|
|
From: Chukun Pan <amadeus@jmu.edu.cn>
|
|
Date: Wed, 8 Feb 2023 16:32:18 +0800
|
|
Subject: [PATCH] net: phy: realtek: support switching between SGMII and
|
|
2500BASE-X for RTL822x series
|
|
|
|
After commit ace6aba ("net: phy: realtek: rtl8221: allow to configure
|
|
SERDES mode"), the rtl8221 phy can work in SGMII and 2500base-x modes
|
|
respectively. So add interface automatic switching for rtl8221 phy to
|
|
match various wire speeds.
|
|
|
|
Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
|
|
---
|
|
drivers/net/phy/realtek.c | 26 ++++++++++++++++++++++++--
|
|
1 file changed, 24 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/phy/realtek.c
|
|
+++ b/drivers/net/phy/realtek.c
|
|
@@ -686,6 +686,25 @@ static int rtl822x_config_aneg(struct ph
|
|
return __genphy_config_aneg(phydev, ret);
|
|
}
|
|
|
|
+static void rtl822x_update_interface(struct phy_device *phydev)
|
|
+{
|
|
+ /* Automatically switch SERDES interface between
|
|
+ * SGMII and 2500-BaseX according to speed.
|
|
+ */
|
|
+ switch (phydev->speed) {
|
|
+ case SPEED_2500:
|
|
+ phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
|
|
+ break;
|
|
+ case SPEED_1000:
|
|
+ case SPEED_100:
|
|
+ case SPEED_10:
|
|
+ phydev->interface = PHY_INTERFACE_MODE_SGMII;
|
|
+ break;
|
|
+ default:
|
|
+ break;
|
|
+ }
|
|
+}
|
|
+
|
|
static int rtl822x_read_status(struct phy_device *phydev)
|
|
{
|
|
int ret;
|
|
@@ -704,11 +723,14 @@ static int rtl822x_read_status(struct ph
|
|
phydev->lp_advertising, lpadv & RTL_LPADV_2500FULL);
|
|
}
|
|
|
|
- ret = genphy_read_status(phydev);
|
|
+ ret = rtlgen_read_status(phydev);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
- return rtlgen_get_speed(phydev);
|
|
+ if (phydev->is_c45 && phydev->link)
|
|
+ rtl822x_update_interface(phydev);
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
static bool rtlgen_supports_2_5gbps(struct phy_device *phydev)
|