From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Mon, 13 Oct 2008 14:10:42 +0000 (+0000)
Subject: Add some PHY fixups before we do mii_phy_probe()
X-Git-Url: https://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/commitdiff_plain/b24ce995ca5502fe986eace12199a75bd3253f62

Add some PHY fixups before we do mii_phy_probe()

Obtained-from: Realtek BSD driver v176
---

diff --git a/sys/dev/netif/re/if_re.c b/sys/dev/netif/re/if_re.c
index c7bbb42a32..8488d15ca5 100644
--- a/sys/dev/netif/re/if_re.c
+++ b/sys/dev/netif/re/if_re.c
@@ -33,7 +33,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/re/if_re.c,v 1.25 2004/06/09 14:34:01 naddy Exp $
- * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.79 2008/10/13 13:04:41 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/re/if_re.c,v 1.80 2008/10/13 14:10:42 sephe Exp $
  */
 
 /*
@@ -209,28 +209,28 @@ static const struct re_hwrev re_hwrevs[] = {
 	  RE_C_HWCSUM | RE_C_JUMBO },
 
 	{ RE_HWREV_8169SB,	RE_MACVER_04,
-	  RE_C_HWCSUM | RE_C_JUMBO },
+	  RE_C_HWCSUM | RE_C_JUMBO | RE_C_PHYPMGT },
 
 	{ RE_HWREV_8169SC1,	RE_MACVER_05,
-	  RE_C_HWCSUM | RE_C_JUMBO },
+	  RE_C_HWCSUM | RE_C_JUMBO | RE_C_PHYPMGT },
 
 	{ RE_HWREV_8169SC2,	RE_MACVER_06,
-	  RE_C_HWCSUM | RE_C_JUMBO },
+	  RE_C_HWCSUM | RE_C_JUMBO | RE_C_PHYPMGT },
 
 	{ RE_HWREV_8168B1,	RE_MACVER_21,
-	  RE_C_HWIM | RE_C_HWCSUM | RE_C_JUMBO },
+	  RE_C_HWIM | RE_C_HWCSUM | RE_C_JUMBO | RE_C_PHYPMGT },
 
 	{ RE_HWREV_8168B2,	RE_MACVER_23,
-	  RE_C_HWIM | RE_C_HWCSUM | RE_C_JUMBO },
+	  RE_C_HWIM | RE_C_HWCSUM | RE_C_JUMBO | RE_C_PHYPMGT },
 
 	{ RE_HWREV_8168B3,	RE_MACVER_23,
-	  RE_C_HWIM | RE_C_HWCSUM | RE_C_JUMBO },
+	  RE_C_HWIM | RE_C_HWCSUM | RE_C_JUMBO | RE_C_PHYPMGT },
 
 	{ RE_HWREV_8168C,	RE_MACVER_29,
-	  RE_C_HWIM | RE_C_JUMBO | RE_C_MAC2 },
+	  RE_C_HWIM | RE_C_JUMBO | RE_C_MAC2 | RE_C_PHYPMGT },
 
 	{ RE_HWREV_8168CP,	RE_MACVER_2B,
-	  RE_C_HWIM | RE_C_JUMBO | RE_C_MAC2 },
+	  RE_C_HWIM | RE_C_JUMBO | RE_C_MAC2 | RE_C_PHYPMGT },
 
 	{ RE_HWREV_8100E,	RE_MACVER_UNKN,
 	  RE_C_HWCSUM },
@@ -248,7 +248,7 @@ static const struct re_hwrev re_hwrevs[] = {
 	  RE_C_MAC2 },
 
 	{ RE_HWREV_UNKN1,	RE_MACVER_2A,
-	  RE_C_MAC2 },
+	  RE_C_MAC2 | RE_C_PHYPMGT },
 
 	{ RE_HWREV_NULL, 0, 0 }
 };
@@ -1545,6 +1545,19 @@ re_attach(device_t dev)
 #endif
 	}
 
+	/*
+	 * Apply some PHY fixup from Realtek ...
+	 */
+	if (sc->re_hwrev == RE_HWREV_8110S) {
+		CSR_WRITE_1(sc, 0x82, 1);
+		re_miibus_writereg(dev, 1, 0xb, 0);
+	}
+	if (sc->re_caps & RE_C_PHYPMGT) {
+		/* Power up PHY */
+		re_miibus_writereg(dev, 1, 0x1f, 0);
+		re_miibus_writereg(dev, 1, 0xe, 0);
+	}
+
 	/* Do MII setup */
 	if (mii_phy_probe(dev, &sc->re_miibus,
 	    re_ifmedia_upd, re_ifmedia_sts)) {
diff --git a/sys/dev/netif/re/if_revar.h b/sys/dev/netif/re/if_revar.h
index a6bb548457..d54ea6f069 100644
--- a/sys/dev/netif/re/if_revar.h
+++ b/sys/dev/netif/re/if_revar.h
@@ -33,7 +33,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_rlreg.h,v 1.42 2004/05/24 19:39:23 jhb Exp $
- * $DragonFly: src/sys/dev/netif/re/if_revar.h,v 1.22 2008/10/13 13:04:41 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/re/if_revar.h,v 1.23 2008/10/13 14:10:42 sephe Exp $
  */
 
 #define RE_RX_DESC_CNT_DEF	256
@@ -186,6 +186,7 @@ struct re_softc {
 #define RE_C_JUMBO		0x10
 #define RE_C_8139CP		0x20	/* is 8139C+ */
 #define RE_C_MAC2		0x40	/* MAC style 2? */
+#define RE_C_PHYPMGT		0x80	/* PHY supports power mgmt */
 
 #define RE_IS_8139CP(sc)	((sc)->re_caps & RE_C_8139CP)