From: Hayes Wang <hayeswang@realtek.com>
Date: Tue, 6 Sep 2011 08:55:16 +0000 (+0800)
Subject: r8169: fix the reset setting for 8111evl
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~50
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=99694490982f4f2d1989c22a6d8cb9c545d56903;p=users%2Fjedix%2Flinux-maple.git

r8169: fix the reset setting for 8111evl

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>
---

diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index a0c2910f19c2..5b4a7bca9ceb 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -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 {