Skip to content

Commit 162d626

Browse files
hkallweitdavem330
authored andcommitted
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: 5fc3f6c ("r8169: consolidate disabling ASPM before EPHY access") Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217635 Signed-off-by: Heiner Kallweit <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 4bdf79d commit 162d626

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

drivers/net/ethernet/realtek/r8169_main.c

+7
Original file line numberDiff line numberDiff line change
@@ -2747,6 +2747,13 @@ static void rtl_hw_aspm_clkreq_enable(struct rtl8169_private *tp, bool enable)
27472747
return;
27482748

27492749
if (enable) {
2750+
/* On these chip versions ASPM can even harm
2751+
* bus communication of other PCI devices.
2752+
*/
2753+
if (tp->mac_version == RTL_GIGA_MAC_VER_42 ||
2754+
tp->mac_version == RTL_GIGA_MAC_VER_43)
2755+
return;
2756+
27502757
rtl_mod_config5(tp, 0, ASPM_en);
27512758
rtl_mod_config2(tp, 0, ClkReqEn);
27522759

0 commit comments

Comments
 (0)