]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
r8169: fix the reset setting for 8111evl
authorHayes Wang <hayeswang@realtek.com>
Tue, 6 Sep 2011 08:55:16 +0000 (16:55 +0800)
committerJoe Jin <joe.jin@oracle.com>
Fri, 18 May 2012 02:15:49 +0000 (10:15 +0800)
rtl8111evl should stop any TLP requirement before resetting by
enabling register 0x37 bit 7.

Signed-off-by: Hayes Wang <hayeswang@realtek.com>
(cherry picked from commit c2b0c1e7fb69b54e704cb2dae5a80cc78a8cb0b2)

Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/r8169.c

index a0c2910f19c29257c44e39a5097280a50e7cc026..5b4a7bca9ceb19aaf6742f00a9d4f574f6c4a201 100644 (file)
@@ -3871,6 +3871,7 @@ static void rtl8169_hw_reset(struct rtl8169_private *tp)
                while (RTL_R8(TxPoll) & NPQ)
                        udelay(20);
        } else if (tp->mac_version == RTL_GIGA_MAC_VER_34) {
+               RTL_W8(ChipCmd, RTL_R8(ChipCmd) | StopReq);
                while (!(RTL_R32(TxConfig) & TXCFG_EMPTY))
                        udelay(100);
        } else {