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

Commit 5db5cabb authored by Chunhao Lin's avatar Chunhao Lin Committed by Greg Kroah-Hartman
Browse files

r8169: fix RTL8168EP take too long to complete driver initialization. 




[ Upstream commit 086ca23d03c0d2f4088f472386778d293e15c5f6 ]

Driver check the wrong register bit in rtl_ocp_tx_cond() that keep driver
waiting until timeout.

Fix this by waiting for the right register bit.

Signed-off-by: default avatarChunhao Lin <hau@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9f2f873d

drivers/net/ethernet/realtek/r8169.c

+2 −2
Original line number Diff line number Diff line
@@ -1387,7 +1387,7 @@ DECLARE_RTL_COND(rtl_ocp_tx_cond) 
{

	void __iomem *ioaddr = tp->mmio_addr;



	return RTL_R8(IBISR0) & 0x02;

	return RTL_R8(IBISR0) & 0x20;

}



static void rtl8168ep_stop_cmac(struct rtl8169_private *tp)
@@ -1395,7 +1395,7 @@ static void rtl8168ep_stop_cmac(struct rtl8169_private *tp) 
	void __iomem *ioaddr = tp->mmio_addr;



	RTL_W8(IBCR2, RTL_R8(IBCR2) & ~0x01);

	rtl_msleep_loop_wait_low(tp, &rtl_ocp_tx_cond, 50, 2000);

	rtl_msleep_loop_wait_high(tp, &rtl_ocp_tx_cond, 50, 2000);

	RTL_W8(IBISR0, RTL_R8(IBISR0) | 0x20);

	RTL_W8(IBCR0, RTL_R8(IBCR0) & ~0x01);

}