From 2acce7b871a8eeb9c1de4f657633158ab30522b9 Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Mon, 12 Nov 2007 21:16:17 -0800
Subject: [PATCH] --- yaml --- r: 73608 b: refs/heads/master c:
 662f38d242488cfdcda7b3684ac610d3e4d568a7 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 6 ++++++
 trunk/drivers/net/tg3.h | 6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index aca81be89504..a1068dd6f542 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e875093c9659d2a9f3923aa9ee1b89ef40cf95b9
+refs/heads/master: 662f38d242488cfdcda7b3684ac610d3e4d568a7
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 25e57d8ddb51..b5c4799003e0 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -1117,6 +1117,12 @@ static int tg3_phy_reset(struct tg3 *tp)
 			udelay(40);
 			tw32_f(TG3_CPMU_LSPD_1000MB_CLK, val);
 		}
+
+		/* Disable GPHY autopowerdown. */
+		tg3_writephy(tp, MII_TG3_MISC_SHDW,
+			     MII_TG3_MISC_SHDW_WREN |
+			     MII_TG3_MISC_SHDW_APD_SEL |
+			     MII_TG3_MISC_SHDW_APD_WKTM_84MS);
 	}
 
 out:
diff --git a/trunk/drivers/net/tg3.h b/trunk/drivers/net/tg3.h
index f715b35dfd54..5b799ff2c4d6 100644
--- a/trunk/drivers/net/tg3.h
+++ b/trunk/drivers/net/tg3.h
@@ -1715,6 +1715,12 @@
 #define MII_TG3_ISTAT			0x1a /* IRQ status register */
 #define MII_TG3_IMASK			0x1b /* IRQ mask register */
 
+#define MII_TG3_MISC_SHDW		0x1c
+#define MII_TG3_MISC_SHDW_WREN		0x8000
+#define MII_TG3_MISC_SHDW_APD_SEL	0x2800
+
+#define MII_TG3_MISC_SHDW_APD_WKTM_84MS	0x0001
+
 /* ISTAT/IMASK event bits */
 #define MII_TG3_INT_LINKCHG		0x0002
 #define MII_TG3_INT_SPEEDCHG		0x0004