Skip to contentSkip to conversation

r8169: fix ASPM-related problem for chip version 42 and 43

PATCH Applied Heiner Kallweit 2 participants 2 messages Jul 14, 2023 – Jul 17, 2023

Subsystems (4)
lore
Share & tools
lore

Heiner Kallweit

author maintainer
#0 lore raw

PATCH v2 1/1 r8169: fix ASPM-related problem for chip version 42 and 43

Referenced commit missed that for chip versions 42 and 43 ASPM remained disabled in the respective rtl_hw_start_...() routines. This resulted in problems as described in the referenced bug ticket. Therefore re-instantiate the previous logic.

Fixes 5fc3f6c90cca ("r8169: consolidate disabling ASPM before EPHY access")

---
v2:
- add Closes tag

---
 drivers/net/ethernet/realtek/r8169_main.c | 7 +++++++
 1 file changed, 7 insertions(+)
drivers/net/ethernet/realtek/r8169_main.c +7 -0
index 9445f04f8..2b3aa6b45 100644
@@ -2747,6 +2747,13 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
 		return;
 
 	if (enable) {
+		/* On these chip versions ASPM can even harm
+		 * bus communication of other PCI devices.
+		 */
+		if (tp->mac_version == RTL_GIGA_MAC_VER_42 ||
+		    tp->mac_version == RTL_GIGA_MAC_VER_43)
+			return;
+
 		rtl_mod_config5(tp, 0, ASPM_en);
 		rtl_mod_config2(tp, 0, ClkReqEn);
 
Signature · 1 line
2.41.0
#1 lore raw
This patch was applied to netdev/net.git (main) by David S. Miller <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by David S. Miller <[email protected]>:

Quoted 10 lines · On Fri, 14 Jul 2023 07:39:36 +0200 you wrote:

Referenced commit missed that for chip versions 42 and 43 ASPM remained disabled in the respective rtl_hw_start_...() routines. This resulted in problems as described in the referenced bug ticket. Therefore re-instantiate the previous logic.

Fixes 5fc3f6c90cca ("r8169: consolidate disabling ASPM before EPHY access")

[...]

Here is the summary with links:
- [net,v2] r8169: fix ASPM-related problem for chip version 42 and 43

    https://git.kernel.org/netdev/net/c/162d626f3013

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html