998b973157
* use interface mode switching only when operating in C45 mode Linux prevents switching the interface mode when using C22 MDIO, hence use rate-adapter mode in case the PHY controlled via C22. * use phy_read_paged where appropriate * use existing generic inline functions to handle 10GbE advertisements instead of redundantly defining register macros in realtek.c which are not actually vendor-specific. * make sure 10GbE advertisement is valid, preventing false-positive warning "Downshift occurred from negotiated speed 2.5Gbps to actual speed 1Gbps, check cabling!" with some link-partners using 1G mode. * Support Link Down Power Saving Mode (ALDPS) Signed-off-by: Daniel Golle <daniel@makrotopia.org>
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
|
|
@@ -676,6 +676,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;
|
|
@@ -694,11 +713,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)
|