mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-05-20 05:07:59 +00:00
94dbbe3496
Upstream e2015942e90a couldn't be backported to 6.6 because the following symbols were missing: - disable_work - disable_work_sync - enable_work Seee2015942e9Upstream 34e5ededf4b8 couldn't be backported to 6.6 because the following symbol was missing: - pcim_iomap_region See34e5ededf4Reorganize patch numbers now that < 6.12 patches are no longer needed. The following patches still differ from upstream: - e340bff27e63 phy_set_eee_broken symbol is missing in 6.12 https://github.com/torvalds/linux/commit/e340bff27e63 The following patches can't be backported to 6.12 due to missing symbols: - 5e7a74b6a357 phy_disable_eee_mode symbol is missing in 6.12 https://github.com/torvalds/linux/commit/5e7a74b6a357 Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From eb90f876b7961d702d7fc549e14614860f531e60 Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Thu, 31 Oct 2024 22:42:52 +0100
|
|
Subject: [PATCH] r8169: align RTL8125 EEE config with vendor driver
|
|
|
|
Align the EEE config for RTL8125A/RTL8125B with vendor driver r8125.
|
|
This should help to avoid compatibility issues.
|
|
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Link: https://patch.msgid.link/044c925e-8669-4b98-87df-95b4056f4f5f@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
.../net/ethernet/realtek/r8169_phy_config.c | 18 ++++++++++++------
|
|
1 file changed, 12 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
|
|
@@ -89,19 +89,25 @@ static void rtl8168h_config_eee_phy(stru
|
|
phy_modify_paged(phydev, 0xa42, 0x14, 0x0000, 0x0080);
|
|
}
|
|
|
|
-static void rtl8125a_config_eee_phy(struct phy_device *phydev)
|
|
+static void rtl8125_common_config_eee_phy(struct phy_device *phydev)
|
|
{
|
|
- rtl8168h_config_eee_phy(phydev);
|
|
+ phy_modify_paged(phydev, 0xa6d, 0x14, 0x0010, 0x0000);
|
|
+ phy_modify_paged(phydev, 0xa42, 0x14, 0x0080, 0x0000);
|
|
+ phy_modify_paged(phydev, 0xa4a, 0x11, 0x0200, 0x0000);
|
|
+}
|
|
|
|
+static void rtl8125a_config_eee_phy(struct phy_device *phydev)
|
|
+{
|
|
+ rtl8168g_config_eee_phy(phydev);
|
|
+ /* disable EEE at 2.5Gbps */
|
|
phy_modify_paged(phydev, 0xa6d, 0x12, 0x0001, 0x0000);
|
|
- phy_modify_paged(phydev, 0xa6d, 0x14, 0x0010, 0x0000);
|
|
+ rtl8125_common_config_eee_phy(phydev);
|
|
}
|
|
|
|
static void rtl8125b_config_eee_phy(struct phy_device *phydev)
|
|
{
|
|
- phy_modify_paged(phydev, 0xa6d, 0x14, 0x0010, 0x0000);
|
|
- phy_modify_paged(phydev, 0xa42, 0x14, 0x0080, 0x0000);
|
|
- phy_modify_paged(phydev, 0xa4a, 0x11, 0x0200, 0x0000);
|
|
+ rtl8168g_config_eee_phy(phydev);
|
|
+ rtl8125_common_config_eee_phy(phydev);
|
|
}
|
|
|
|
static void rtl8169s_hw_phy_config(struct rtl8169_private *tp,
|