diff options
| author | Heiner Kallweit <hkallweit1@gmail.com> | 2023-07-14 07:39:36 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-07-17 08:47:39 +0200 |
| commit | 162d626f3013215b82b6514ca14f20932c7ccce5 (patch) | |
| tree | 675bd9c5836c07a58171f375593ecfb37d57c431 /drivers/net | |
| parent | net: dsa: microchip: correct KSZ8795 static MAC table access (diff) | |
| download | linux-162d626f3013215b82b6514ca14f20932c7ccce5.tar.xz linux-162d626f3013215b82b6514ca14f20932c7ccce5.zip | |
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")
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217635
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169_main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 9445f04f8d48..fce4a2b908c2 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); |