forked from Openwrt/openwrt
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>
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
From e3e9e9039fa6ae885c7d5c954d7b9f105fa23e8f Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Wed, 6 Nov 2024 17:57:08 +0100
|
|
Subject: [PATCH] r8169: align WAKE_PHY handling with r8125/r8126 vendor
|
|
drivers
|
|
|
|
Vendor drivers r8125/r8126 apply this additional magic setting when
|
|
enabling WAKE_PHY, so do the same here.
|
|
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://patch.msgid.link/51130715-45be-4db5-abb7-05d87e1f5df9@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169_main.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -1561,6 +1561,9 @@ static void __rtl8169_set_wol(struct rtl
|
|
}
|
|
|
|
r8169_mod_reg8_cond(tp, Config3, LinkUp, wolopts & WAKE_PHY);
|
|
+ if (rtl_is_8125(tp))
|
|
+ r8168_mac_ocp_modify(tp, 0xe0c6, 0x3f,
|
|
+ wolopts & WAKE_PHY ? 0x13 : 0);
|
|
r8169_mod_reg8_cond(tp, Config5, UWF, wolopts & WAKE_UCAST);
|
|
r8169_mod_reg8_cond(tp, Config5, BWF, wolopts & WAKE_BCAST);
|
|
r8169_mod_reg8_cond(tp, Config5, MWF, wolopts & WAKE_MCAST);
|