lkml.org 
[lkml]   [2018]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 08/22] r8169: fix RTL8168EP take too long to complete driver initialization.
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Chunhao Lin <hau@realtek.com>


    [ 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: Chunhao Lin <hau@realtek.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/realtek/r8169.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/drivers/net/ethernet/realtek/r8169.c
    +++ b/drivers/net/ethernet/realtek/r8169.c
    @@ -1388,7 +1388,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)
    @@ -1396,7 +1396,7 @@ static void rtl8168ep_stop_cmac(struct r
    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);
    }

    \
     
     \ /
      Last update: 2018-02-09 14:54    [W:4.169 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site