mirror of
https://github.com/cjdelisle/openwrt.git
synced 2025-10-08 05:57:10 +00:00
1673390905
3a752e678 net: phy: realtek: enable serdes option mode for RTL8226-CG Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de> Link: https://github.com/openwrt/openwrt/pull/19843 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
93 lines
3.2 KiB
Diff
93 lines
3.2 KiB
Diff
From 3a752e67800106a5c42d802d67e06c60aa71d07b Mon Sep 17 00:00:00 2001
|
|
From: Markus Stockhausen <markus.stockhausen@gmx.de>
|
|
Date: Fri, 15 Aug 2025 04:20:09 -0400
|
|
Subject: net: phy: realtek: enable serdes option mode for RTL8226-CG
|
|
|
|
The RTL8226-CG can make use of the serdes option mode feature to
|
|
dynamically switch between SGMII and 2500base-X. From what is
|
|
known the setup sequence is much simpler with no magic values.
|
|
|
|
Convert the exiting config_init() into a helper that configures
|
|
the PHY depending on generation 1 or 2. Call the helper from two
|
|
separated new config_init() functions.
|
|
|
|
Finally convert the phy_driver specs of the RTL8226-CG to make
|
|
use of the new configuration and switch over to the extended
|
|
read_status() function to dynamically change the interface
|
|
according to the serdes mode.
|
|
|
|
Remark! The logic could be simpler if the serdes mode could be
|
|
set before all other generation 2 magic values. Due to missing
|
|
RTL8221B test hardware the mmd command order was kept.
|
|
|
|
Tested on Zyxel XGS1210-12.
|
|
|
|
Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
|
|
Link: https://patch.msgid.link/20250815082009.3678865-1-markus.stockhausen@gmx.de
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/phy/realtek/realtek_main.c | 26 ++++++++++++++++++++------
|
|
1 file changed, 20 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/phy/realtek/realtek_main.c
|
|
+++ b/drivers/net/phy/realtek/realtek_main.c
|
|
@@ -1032,7 +1032,7 @@ static int rtl822x_probe(struct phy_devi
|
|
return 0;
|
|
}
|
|
|
|
-static int rtl822xb_config_init(struct phy_device *phydev)
|
|
+static int rtl822x_set_serdes_option_mode(struct phy_device *phydev, bool gen1)
|
|
{
|
|
bool has_2500, has_sgmii;
|
|
u16 mode;
|
|
@@ -1067,15 +1067,18 @@ static int rtl822xb_config_init(struct p
|
|
/* the following sequence with magic numbers sets up the SerDes
|
|
* option mode
|
|
*/
|
|
- ret = phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x75f3, 0);
|
|
- if (ret < 0)
|
|
- return ret;
|
|
+
|
|
+ if (!gen1) {
|
|
+ ret = phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x75f3, 0);
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+ }
|
|
|
|
ret = phy_modify_mmd_changed(phydev, MDIO_MMD_VEND1,
|
|
RTL822X_VND1_SERDES_OPTION,
|
|
RTL822X_VND1_SERDES_OPTION_MODE_MASK,
|
|
mode);
|
|
- if (ret < 0)
|
|
+ if (gen1 || ret < 0)
|
|
return ret;
|
|
|
|
ret = phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x6a04, 0x0503);
|
|
@@ -1089,6 +1092,16 @@ static int rtl822xb_config_init(struct p
|
|
return phy_write_mmd(phydev, MDIO_MMD_VEND1, 0x6f11, 0x8020);
|
|
}
|
|
|
|
+static int rtl822x_config_init(struct phy_device *phydev)
|
|
+{
|
|
+ return rtl822x_set_serdes_option_mode(phydev, true);
|
|
+}
|
|
+
|
|
+static int rtl822xb_config_init(struct phy_device *phydev)
|
|
+{
|
|
+ return rtl822x_set_serdes_option_mode(phydev, false);
|
|
+}
|
|
+
|
|
static int rtl822xb_get_rate_matching(struct phy_device *phydev,
|
|
phy_interface_t iface)
|
|
{
|
|
@@ -1678,7 +1691,8 @@ static struct phy_driver realtek_drvs[]
|
|
.soft_reset = rtl822x_c45_soft_reset,
|
|
.get_features = rtl822x_c45_get_features,
|
|
.config_aneg = rtl822x_c45_config_aneg,
|
|
- .read_status = rtl822x_c45_read_status,
|
|
+ .config_init = rtl822x_config_init,
|
|
+ .read_status = rtl822xb_c45_read_status,
|
|
.suspend = genphy_c45_pma_suspend,
|
|
.resume = rtlgen_c45_resume,
|
|
}, {
|