Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'r8169-RTL8168H-PHY-fixes' 



Chunhao Lin says:

====================
r8169: Update RTL8168H PHY parameters

Fix typo in setting PHY parameter and update the way of reading PHY register
"rg_saw_cnt".
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 032c5e82 58493333

drivers/net/ethernet/realtek/r8169.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3947,7 +3947,7 @@ static void rtl8168h_2_hw_phy_config(struct rtl8169_private *tp) 
	data = (ioffset_p3<<12)|(ioffset_p2<<8)|(ioffset_p1<<4)|(ioffset_p0);

	data = (ioffset_p3<<12)|(ioffset_p2<<8)|(ioffset_p1<<4)|(ioffset_p0);





	if ((ioffset_p3 != 0x0f) || (ioffset_p2 != 0x0f) ||

	if ((ioffset_p3 != 0x0f) || (ioffset_p2 != 0x0f) ||

	    (ioffset_p1 != 0x0f) || (ioffset_p0 == 0x0f)) {

	    (ioffset_p1 != 0x0f) || (ioffset_p0 != 0x0f)) {

		rtl_writephy(tp, 0x1f, 0x0bcf);

		rtl_writephy(tp, 0x1f, 0x0bcf);

		rtl_writephy(tp, 0x16, data);

		rtl_writephy(tp, 0x16, data);

		rtl_writephy(tp, 0x1f, 0x0000);

		rtl_writephy(tp, 0x1f, 0x0000);
@@ -6136,7 +6136,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp) 
	rtl_pcie_state_l2l3_enable(tp, false);

	rtl_pcie_state_l2l3_enable(tp, false);





	rtl_writephy(tp, 0x1f, 0x0c42);

	rtl_writephy(tp, 0x1f, 0x0c42);

	rg_saw_cnt = rtl_readphy(tp, 0x13);

	rg_saw_cnt = (rtl_readphy(tp, 0x13) & 0x3fff);

	rtl_writephy(tp, 0x1f, 0x0000);

	rtl_writephy(tp, 0x1f, 0x0000);

	if (rg_saw_cnt > 0) {

	if (rg_saw_cnt > 0) {

		u16 sw_cnt_1ms_ini;

		u16 sw_cnt_1ms_ini;