Patch "r8169: fix RTL8168EP take too long to complete driver initialization." has been added to the 4.4-stable tree
This is a note to let you know that I've just added the patch titled
r8169: fix RTL8168EP take too long to complete driver initialization.
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
r8169-fix-rtl8168ep-take-too-long-to-complete-driver-initialization.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Wed Feb 7 11:22:35 PST 2018
From: Chunhao Lin <[email protected]>
Date: Wed, 31 Jan 2018 01:32:36 +0800
Subject: r8169: fix RTL8168EP take too long to complete driver initialization.
From: Chunhao Lin <[email protected]>
[ 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.
--- drivers/net/ethernet/realtek/r8169.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/realtek/r8169.c +2 -2
@@ -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 rvoid __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 ); }
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/r8169-fix-rtl8168ep-take-too-long-to-complete-driver-initialization.patch