From af8132ccfb7af1fc17e47d2724f70f017e3a03fa Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Tue, 13 Feb 2007 12:17:57 -0800
Subject: [PATCH] --- yaml --- r: 48273 b: refs/heads/master c:
 5129724aa5de3a71fc70e71ca49d542ca1a5aa1e h: refs/heads/master i:   48271:
 f347c026f2106d0d21a3d8a995c7f5bd2f8a8951 v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/net/tg3.c | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cfbcbbe4c40c..c4011464aea5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7b0a8573c9ac8923bf6f205f4ce60dd2ac811d5
+refs/heads/master: 5129724aa5de3a71fc70e71ca49d542ca1a5aa1e
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index b6615f112eaa..604f3085d12a 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -1175,8 +1175,18 @@ static void tg3_nvram_unlock(struct tg3 *);
 
 static void tg3_power_down_phy(struct tg3 *tp)
 {
-	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)
+	if (tp->tg3_flags2 & TG3_FLG2_PHY_SERDES) {
+		if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) {
+			u32 sg_dig_ctrl = tr32(SG_DIG_CTRL);
+			u32 serdes_cfg = tr32(MAC_SERDES_CFG);
+
+			sg_dig_ctrl |=
+				SG_DIG_USING_HW_AUTONEG | SG_DIG_SOFT_RESET;
+			tw32(SG_DIG_CTRL, sg_dig_ctrl);
+			tw32(MAC_SERDES_CFG, serdes_cfg | (1 << 15));
+		}
 		return;
+	}
 
 	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
 		u32 val;