be3ce63822
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.36 Remove upstream patches: generic/backport-6.12/780-09-v6.13-r8169-add-support-for-RTL8125D.patch[1] generic/backport-6.12/781-04-v6.13-net-phy-realtek-merge-the-drivers-for-internal-NBase.patch[2] generic/backport-6.12/781-05-v6.13-net-phy-realtek-add-RTL8125D-internal-PHY.patch[3] All other patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.36&id=37cb5967bd2513416398ff1a87a5ee2e63270b00 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.36&id=5eb0b10eea271e2e1f7d4fa1a6af6c09b2ecc4f5 [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.36&id=5d479182d4ccde76df830a72927b3bdaafd142bf Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Tested-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/19317 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
From 5cb409b3960e75467cbb0a8e1e5596b4490570e3 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Thu, 10 Oct 2024 14:07:39 +0100
|
|
Subject: [PATCH] net: phy: realtek: clear 1000Base-T link partner
|
|
advertisement
|
|
|
|
Clear 1000Base-T link partner advertisement bits in Clause-45
|
|
read_status() function in case auto-negotiation is disabled or has not
|
|
been completed.
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
Link: https://patch.msgid.link/9dc9b47b2d675708afef3ad366bfd78eb584d958.1728565530.git.daniel@makrotopia.org
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|
---
|
|
drivers/net/phy/realtek.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
--- a/drivers/net/phy/realtek.c
|
|
+++ b/drivers/net/phy/realtek.c
|
|
@@ -1027,6 +1027,10 @@ static int rtl822x_c45_read_status(struc
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
+ if (phydev->autoneg == AUTONEG_DISABLE ||
|
|
+ !genphy_c45_aneg_done(phydev))
|
|
+ mii_stat1000_mod_linkmode_lpa_t(phydev->lp_advertising, 0);
|
|
+
|
|
/* Vendor register as C45 has no standardized support for 1000BaseT */
|
|
if (phydev->autoneg == AUTONEG_ENABLE) {
|
|
val = phy_read_mmd(phydev, MDIO_MMD_VEND2,
|