| Message ID | f605d9cd-220d-5fa2-142e-746afa9e1665@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 162d626f3013215b82b6514ca14f20932c7ccce5 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v2] r8169: fix ASPM-related problem for chip version 42 and 43 | expand |
Hello: This patch was applied to netdev/net.git (main) by David S. Miller <davem@davemloft.net>: 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") > Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217635 > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > > [...] 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!
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 9445f04f8..2b3aa6b45 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -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);
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") Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217635 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- v2: - add Closes tag --- drivers/net/ethernet/realtek/r8169_main.c | 7 +++++++ 1 file changed, 7 insertions(+)