Commit 162d626f authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

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: 5fc3f6c9 ("r8169: consolidate disabling ASPM before EPHY access")
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217635


Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4bdf79d6

drivers/net/ethernet/realtek/r8169_main.c

+7 −0
Original line number Diff line number Diff line
@@ -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);