mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-06 20:54:00 -05:00
generic: backport upstream v6.18 Realtek PHY patch
34167f1a0 net: phy: realtek: convert RTL8226-CG to c45 only 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>
This commit is contained in:
Markus Stockhausen
Hauke Mehrtens
parent
d5ad59ffb1
commit
92a3dd9a96
@ -0,0 +1,169 @@
|
||||
From 34167f1a024d2c5abae0b0325a6d0b8257160f86 Mon Sep 17 00:00:00 2001
|
||||
From: Markus Stockhausen <markus.stockhausen@gmx.de>
|
||||
Date: Wed, 13 Aug 2025 01:44:07 -0400
|
||||
Subject: net: phy: realtek: convert RTL8226-CG to c45 only
|
||||
|
||||
Short: Convert the RTL8226-CG to c45 so it can be used in its
|
||||
Realtek based ecosystems.
|
||||
|
||||
Long: The RTL8226-CG can be mainly found on devices of the
|
||||
Realtek Otto switch platform. Devices like the Zyxel XGS1210-12
|
||||
are based on it. These implement a hardware based phy polling
|
||||
in the background to update SoC status registers.
|
||||
|
||||
The hardware provides 4 smi busses where phys are attached to.
|
||||
For each bus one can decide if it is polled in c45 or c22 mode.
|
||||
See https://svanheule.net/realtek/longan/register/smi_glb_ctrl
|
||||
With this setting the register access will be limited by the
|
||||
hardware. This is very complex (including caching and special
|
||||
c45-over-c22 handling). But basically it boils down to "enable
|
||||
protocol x and SoC will disable register access via protocol y".
|
||||
|
||||
Mainline already gained support for the rtl9300 mdio driver
|
||||
in commit 24e31e474769 ("net: mdio: Add RTL9300 MDIO driver").
|
||||
|
||||
It covers the basic features, but a lot effort is still needed
|
||||
to understand hardware properly. So it runs a simple setup by
|
||||
selecting the proper bus mode during startup.
|
||||
|
||||
/* Put the interfaces into C45 mode if required */
|
||||
glb_ctrl_mask = GENMASK(19, 16);
|
||||
for (i = 0; i < MAX_SMI_BUSSES; i++)
|
||||
if (priv->smi_bus_is_c45[i])
|
||||
glb_ctrl_val |= GLB_CTRL_INTF_SEL(i);
|
||||
...
|
||||
err = regmap_update_bits(regmap, SMI_GLB_CTRL,
|
||||
glb_ctrl_mask, glb_ctrl_val);
|
||||
|
||||
To avoid complex coding later on, it limits access by only
|
||||
providing either c22 or c45:
|
||||
|
||||
bus->name = "Realtek Switch MDIO Bus";
|
||||
if (priv->smi_bus_is_c45[mdio_bus]) {
|
||||
bus->read_c45 = rtl9300_mdio_read_c45;
|
||||
bus->write_c45 = rtl9300_mdio_write_c45;
|
||||
} else {
|
||||
bus->read = rtl9300_mdio_read_c22;
|
||||
bus->write = rtl9300_mdio_write_c22;
|
||||
}
|
||||
|
||||
Because of these limitations the existing RTL8226 phy driver
|
||||
is not working at all on Realtek switches. Convert the driver
|
||||
to c45-only.
|
||||
|
||||
Luckily the RTL8226 seems to support proper MDIO_PMA_EXTABLE
|
||||
flags. So standard function genphy_c45_pma_read_abilities() can
|
||||
call genphy_c45_pma_read_ext_abilities() and 10/100/1000 is
|
||||
populated right. Thus conversion is straight forward.
|
||||
|
||||
Outputs before - REMARK: For this a "hacked" bus was used that
|
||||
toggles the mode for each c22/c45 access. But that is slow and
|
||||
produces unstable data in the SoC status registers).
|
||||
|
||||
Settings for lan9:
|
||||
Supported ports: [ TP MII ]
|
||||
Supported link modes: 10baseT/Half 10baseT/Full
|
||||
100baseT/Half 100baseT/Full
|
||||
1000baseT/Full
|
||||
2500baseT/Full
|
||||
Supported pause frame use: Symmetric Receive-only
|
||||
Supports auto-negotiation: Yes
|
||||
Supported FEC modes: Not reported
|
||||
Advertised link modes: 10baseT/Half 10baseT/Full
|
||||
100baseT/Half 100baseT/Full
|
||||
1000baseT/Full
|
||||
2500baseT/Full
|
||||
Advertised pause frame use: Symmetric Receive-only
|
||||
Advertised auto-negotiation: Yes
|
||||
Advertised FEC modes: Not reported
|
||||
Speed: Unknown!
|
||||
Duplex: Unknown! (255)
|
||||
Port: Twisted Pair
|
||||
PHYAD: 24
|
||||
Transceiver: external
|
||||
Auto-negotiation: on
|
||||
MDI-X: Unknown
|
||||
Supports Wake-on: d
|
||||
Wake-on: d
|
||||
Link detected: no
|
||||
|
||||
Outputs with this commit:
|
||||
|
||||
Settings for lan9:
|
||||
Supported ports: [ TP ]
|
||||
Supported link modes: 10baseT/Half 10baseT/Full
|
||||
100baseT/Half 100baseT/Full
|
||||
1000baseT/Full
|
||||
2500baseT/Full
|
||||
Supported pause frame use: Symmetric Receive-only
|
||||
Supports auto-negotiation: Yes
|
||||
Supported FEC modes: Not reported
|
||||
Advertised link modes: 10baseT/Half 10baseT/Full
|
||||
100baseT/Half 100baseT/Full
|
||||
1000baseT/Full
|
||||
2500baseT/Full
|
||||
Advertised pause frame use: Symmetric Receive-only
|
||||
Advertised auto-negotiation: Yes
|
||||
Advertised FEC modes: Not reported
|
||||
Speed: Unknown!
|
||||
Duplex: Unknown! (255)
|
||||
Port: Twisted Pair
|
||||
PHYAD: 24
|
||||
Transceiver: external
|
||||
Auto-negotiation: on
|
||||
MDI-X: Unknown
|
||||
Supports Wake-on: d
|
||||
Wake-on: d
|
||||
Link detected: no
|
||||
|
||||
Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
|
||||
Link: https://patch.msgid.link/20250813054407.1108285-1-markus.stockhausen@gmx.de
|
||||
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
---
|
||||
drivers/net/phy/realtek/realtek_main.c | 28 +++++++++++++++++++++-------
|
||||
1 file changed, 21 insertions(+), 7 deletions(-)
|
||||
|
||||
--- a/drivers/net/phy/realtek/realtek_main.c
|
||||
+++ b/drivers/net/phy/realtek/realtek_main.c
|
||||
@@ -1274,6 +1274,21 @@ static int rtl822x_c45_read_status(struc
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static int rtl822x_c45_soft_reset(struct phy_device *phydev)
|
||||
+{
|
||||
+ int ret, val;
|
||||
+
|
||||
+ ret = phy_modify_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_CTRL1,
|
||||
+ MDIO_CTRL1_RESET, MDIO_CTRL1_RESET);
|
||||
+ if (ret < 0)
|
||||
+ return ret;
|
||||
+
|
||||
+ return phy_read_mmd_poll_timeout(phydev, MDIO_MMD_PMAPMD,
|
||||
+ MDIO_CTRL1, val,
|
||||
+ !(val & MDIO_CTRL1_RESET),
|
||||
+ 5000, 100000, true);
|
||||
+}
|
||||
+
|
||||
static int rtl822xb_c45_read_status(struct phy_device *phydev)
|
||||
{
|
||||
int ret;
|
||||
@@ -1660,13 +1675,12 @@ static struct phy_driver realtek_drvs[]
|
||||
}, {
|
||||
PHY_ID_MATCH_EXACT(0x001cc838),
|
||||
.name = "RTL8226-CG 2.5Gbps PHY",
|
||||
- .get_features = rtl822x_get_features,
|
||||
- .config_aneg = rtl822x_config_aneg,
|
||||
- .read_status = rtl822x_read_status,
|
||||
- .suspend = genphy_suspend,
|
||||
- .resume = rtlgen_resume,
|
||||
- .read_page = rtl821x_read_page,
|
||||
- .write_page = rtl821x_write_page,
|
||||
+ .soft_reset = rtl822x_c45_soft_reset,
|
||||
+ .get_features = rtl822x_c45_get_features,
|
||||
+ .config_aneg = rtl822x_c45_config_aneg,
|
||||
+ .read_status = rtl822x_c45_read_status,
|
||||
+ .suspend = genphy_c45_pma_suspend,
|
||||
+ .resume = rtlgen_c45_resume,
|
||||
}, {
|
||||
PHY_ID_MATCH_EXACT(0x001cc848),
|
||||
.name = "RTL8226B-CG_RTL8221B-CG 2.5Gbps PHY",
|
||||
@ -15,7 +15,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
--- a/drivers/net/phy/realtek/realtek_main.c
|
||||
+++ b/drivers/net/phy/realtek/realtek_main.c
|
||||
@@ -1638,6 +1638,7 @@ static struct phy_driver realtek_drvs[]
|
||||
@@ -1653,6 +1653,7 @@ static struct phy_driver realtek_drvs[]
|
||||
}, {
|
||||
.name = "RTL8226 2.5Gbps PHY",
|
||||
.match_phy_device = rtl8226_match_phy_device,
|
||||
@ -23,7 +23,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
.get_features = rtl822x_get_features,
|
||||
.config_aneg = rtl822x_config_aneg,
|
||||
.read_status = rtl822x_read_status,
|
||||
@@ -1648,6 +1649,7 @@ static struct phy_driver realtek_drvs[]
|
||||
@@ -1663,6 +1664,7 @@ static struct phy_driver realtek_drvs[]
|
||||
}, {
|
||||
.match_phy_device = rtl8221b_match_phy_device,
|
||||
.name = "RTL8226B_RTL8221B 2.5Gbps PHY",
|
||||
@ -31,15 +31,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
.get_features = rtl822x_get_features,
|
||||
.config_aneg = rtl822x_config_aneg,
|
||||
.config_init = rtl822xb_config_init,
|
||||
@@ -1660,6 +1662,7 @@ static struct phy_driver realtek_drvs[]
|
||||
}, {
|
||||
PHY_ID_MATCH_EXACT(0x001cc838),
|
||||
.name = "RTL8226-CG 2.5Gbps PHY",
|
||||
+ .soft_reset = genphy_soft_reset,
|
||||
.get_features = rtl822x_get_features,
|
||||
.config_aneg = rtl822x_config_aneg,
|
||||
.read_status = rtl822x_read_status,
|
||||
@@ -1670,6 +1673,7 @@ static struct phy_driver realtek_drvs[]
|
||||
@@ -1684,6 +1686,7 @@ static struct phy_driver realtek_drvs[]
|
||||
}, {
|
||||
PHY_ID_MATCH_EXACT(0x001cc848),
|
||||
.name = "RTL8226B-CG_RTL8221B-CG 2.5Gbps PHY",
|
||||
@ -47,7 +39,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
.get_features = rtl822x_get_features,
|
||||
.config_aneg = rtl822x_config_aneg,
|
||||
.config_init = rtl822xb_config_init,
|
||||
@@ -1682,6 +1686,7 @@ static struct phy_driver realtek_drvs[]
|
||||
@@ -1696,6 +1699,7 @@ static struct phy_driver realtek_drvs[]
|
||||
}, {
|
||||
.match_phy_device = rtl8221b_vb_cg_c22_match_phy_device,
|
||||
.name = "RTL8221B-VB-CG 2.5Gbps PHY (C22)",
|
||||
@ -55,7 +47,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
.probe = rtl822x_probe,
|
||||
.get_features = rtl822x_get_features,
|
||||
.config_aneg = rtl822x_config_aneg,
|
||||
@@ -1695,6 +1700,7 @@ static struct phy_driver realtek_drvs[]
|
||||
@@ -1709,6 +1713,7 @@ static struct phy_driver realtek_drvs[]
|
||||
}, {
|
||||
.match_phy_device = rtl8221b_vb_cg_c45_match_phy_device,
|
||||
.name = "RTL8221B-VB-CG 2.5Gbps PHY (C45)",
|
||||
@ -63,7 +55,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
.probe = rtl822x_probe,
|
||||
.config_init = rtl822xb_config_init,
|
||||
.get_rate_matching = rtl822xb_get_rate_matching,
|
||||
@@ -1706,6 +1712,7 @@ static struct phy_driver realtek_drvs[]
|
||||
@@ -1720,6 +1725,7 @@ static struct phy_driver realtek_drvs[]
|
||||
}, {
|
||||
.match_phy_device = rtl8221b_vn_cg_c22_match_phy_device,
|
||||
.name = "RTL8221B-VM-CG 2.5Gbps PHY (C22)",
|
||||
@ -71,7 +63,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
.probe = rtl822x_probe,
|
||||
.get_features = rtl822x_get_features,
|
||||
.config_aneg = rtl822x_config_aneg,
|
||||
@@ -1719,6 +1726,7 @@ static struct phy_driver realtek_drvs[]
|
||||
@@ -1733,6 +1739,7 @@ static struct phy_driver realtek_drvs[]
|
||||
}, {
|
||||
.match_phy_device = rtl8221b_vn_cg_c45_match_phy_device,
|
||||
.name = "RTL8221B-VN-CG 2.5Gbps PHY (C45)",
|
||||
|
||||
@ -18,7 +18,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
--- a/drivers/net/phy/realtek/realtek_main.c
|
||||
+++ b/drivers/net/phy/realtek/realtek_main.c
|
||||
@@ -1313,9 +1313,11 @@ static bool rtlgen_supports_2_5gbps(stru
|
||||
@@ -1328,9 +1328,11 @@ static bool rtlgen_supports_2_5gbps(stru
|
||||
{
|
||||
int val;
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
|
||||
--- a/drivers/net/phy/realtek/realtek_main.c
|
||||
+++ b/drivers/net/phy/realtek/realtek_main.c
|
||||
@@ -1368,10 +1368,32 @@ static int rtl8226_match_phy_device(stru
|
||||
@@ -1383,10 +1383,32 @@ static int rtl8226_match_phy_device(stru
|
||||
static int rtlgen_is_c45_match(struct phy_device *phydev, unsigned int id,
|
||||
bool is_c45)
|
||||
{
|
||||
|
||||
@ -12,7 +12,7 @@ Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
|
||||
|
||||
--- a/drivers/net/phy/realtek/realtek_main.c
|
||||
+++ b/drivers/net/phy/realtek/realtek_main.c
|
||||
@@ -1580,6 +1580,51 @@ static irqreturn_t rtl9000a_handle_inter
|
||||
@@ -1595,6 +1595,51 @@ static irqreturn_t rtl9000a_handle_inter
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
@ -64,7 +64,7 @@ Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
|
||||
static struct phy_driver realtek_drvs[] = {
|
||||
{
|
||||
PHY_ID_MATCH_EXACT(0x00008201),
|
||||
@@ -1745,6 +1790,8 @@ static struct phy_driver realtek_drvs[]
|
||||
@@ -1758,6 +1803,8 @@ static struct phy_driver realtek_drvs[]
|
||||
}, {
|
||||
.match_phy_device = rtl8221b_vb_cg_c22_match_phy_device,
|
||||
.name = "RTL8221B-VB-CG 2.5Gbps PHY (C22)",
|
||||
@ -73,7 +73,7 @@ Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
|
||||
.soft_reset = genphy_soft_reset,
|
||||
.probe = rtl822x_probe,
|
||||
.get_features = rtl822x_get_features,
|
||||
@@ -1759,6 +1806,8 @@ static struct phy_driver realtek_drvs[]
|
||||
@@ -1772,6 +1819,8 @@ static struct phy_driver realtek_drvs[]
|
||||
}, {
|
||||
.match_phy_device = rtl8221b_vb_cg_c45_match_phy_device,
|
||||
.name = "RTL8221B-VB-CG 2.5Gbps PHY (C45)",
|
||||
@ -82,7 +82,7 @@ Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
|
||||
.soft_reset = genphy_soft_reset,
|
||||
.probe = rtl822x_probe,
|
||||
.config_init = rtl822xb_config_init,
|
||||
@@ -1771,6 +1820,8 @@ static struct phy_driver realtek_drvs[]
|
||||
@@ -1784,6 +1833,8 @@ static struct phy_driver realtek_drvs[]
|
||||
}, {
|
||||
.match_phy_device = rtl8221b_vn_cg_c22_match_phy_device,
|
||||
.name = "RTL8221B-VM-CG 2.5Gbps PHY (C22)",
|
||||
@ -91,7 +91,7 @@ Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
|
||||
.soft_reset = genphy_soft_reset,
|
||||
.probe = rtl822x_probe,
|
||||
.get_features = rtl822x_get_features,
|
||||
@@ -1785,6 +1836,8 @@ static struct phy_driver realtek_drvs[]
|
||||
@@ -1798,6 +1849,8 @@ static struct phy_driver realtek_drvs[]
|
||||
}, {
|
||||
.match_phy_device = rtl8221b_vn_cg_c45_match_phy_device,
|
||||
.name = "RTL8221B-VN-CG 2.5Gbps PHY (C45)",
|
||||
|
||||
@ -38,7 +38,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
static int rtl822xb_get_rate_matching(struct phy_device *phydev,
|
||||
phy_interface_t iface)
|
||||
{
|
||||
@@ -1813,7 +1829,7 @@ static struct phy_driver realtek_drvs[]
|
||||
@@ -1826,7 +1842,7 @@ static struct phy_driver realtek_drvs[]
|
||||
.handle_interrupt = rtl8221b_handle_interrupt,
|
||||
.soft_reset = genphy_soft_reset,
|
||||
.probe = rtl822x_probe,
|
||||
@ -47,7 +47,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
.get_rate_matching = rtl822xb_get_rate_matching,
|
||||
.get_features = rtl822x_c45_get_features,
|
||||
.config_aneg = rtl822x_c45_config_aneg,
|
||||
@@ -1843,7 +1859,7 @@ static struct phy_driver realtek_drvs[]
|
||||
@@ -1856,7 +1872,7 @@ static struct phy_driver realtek_drvs[]
|
||||
.handle_interrupt = rtl8221b_handle_interrupt,
|
||||
.soft_reset = genphy_soft_reset,
|
||||
.probe = rtl822x_probe,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user