mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 21:58:04 +00: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>
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
From 2b1b8c4c215af7988136401c902338d091d408a1 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Mon, 3 Apr 2023 01:21:57 +0300
|
|
Subject: [PATCH 2/2] net: phy: realtek: disable SGMII in-band AN for 2.5G PHYs
|
|
|
|
MAC drivers don't use SGMII in-band autonegotiation unless told to do so
|
|
in device tree using 'managed = "in-band-status"'. When using MDIO to
|
|
access a PHY, in-band-status is unneeded as we have link-status via
|
|
MDIO. Switch off SGMII in-band autonegotiation using magic values.
|
|
|
|
Reported-by: Chen Minqiang <ptpt52@gmail.com>
|
|
Reported-by: Chukun Pan <amadeus@jmu.edu.cn>
|
|
Reported-by: Yevhen Kolomeiko <jarvis2709@gmail.com>
|
|
Tested-by: Yevhen Kolomeiko <jarvis2709@gmail.com>
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
drivers/net/phy/realtek.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
--- a/drivers/net/phy/realtek.c
|
|
+++ b/drivers/net/phy/realtek.c
|
|
@@ -885,6 +885,7 @@ static irqreturn_t rtl9000a_handle_inter
|
|
static int rtl8221b_config_init(struct phy_device *phydev)
|
|
{
|
|
u16 option_mode;
|
|
+ int val;
|
|
|
|
switch (phydev->interface) {
|
|
case PHY_INTERFACE_MODE_2500BASEX:
|
|
@@ -921,6 +922,13 @@ static int rtl8221b_config_init(struct p
|
|
break;
|
|
}
|
|
|
|
+ /* Disable SGMII AN */
|
|
+ phy_write_mmd(phydev, RTL8221B_MMD_SERDES_CTRL, 0x7588, 0x2);
|
|
+ phy_write_mmd(phydev, RTL8221B_MMD_SERDES_CTRL, 0x7589, 0x71d0);
|
|
+ phy_write_mmd(phydev, RTL8221B_MMD_SERDES_CTRL, 0x7587, 0x3);
|
|
+ phy_read_mmd_poll_timeout(phydev, RTL8221B_MMD_SERDES_CTRL, 0x7587,
|
|
+ val, !(val & BIT(0)), 500, 100000, false);
|
|
+
|
|
return 0;
|
|
}
|
|
|