Commit d992e99b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'r8169-RTL8106e' 



Hayes Wang says:

====================
r8169: adjust the setting for RTL8106e

These patches are uesed to avoid the delay of link-up interrupt, when
enabling ASPM for RTL8106e. The patch #1 is used to enable ASPM if
it is possible. And the patch #2 is used to modify the entrance latencies
of L0 and L1.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 84103209 9c401864

drivers/net/ethernet/realtek/r8169_main.c

+4 −0
Original line number Diff line number Diff line
@@ -3502,12 +3502,16 @@ static void rtl_hw_start_8106(struct rtl8169_private *tp) 
	RTL_W8(tp, MCU, RTL_R8(tp, MCU) | EN_NDP | EN_OOB_RESET);

	RTL_W8(tp, DLLPR, RTL_R8(tp, DLLPR) & ~PFM_EN);



	/* The default value is 0x13. Change it to 0x2f */

	rtl_csi_access_enable(tp, 0x2f);



	rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x0000);



	/* disable EEE */

	rtl_eri_write(tp, 0x1b0, ERIAR_MASK_0011, 0x0000);



	rtl_pcie_state_l2l3_disable(tp);

	rtl_hw_aspm_clkreq_enable(tp, true);

}



DECLARE_RTL_COND(rtl_mac_ocp_e00e_cond)