From: Sepherosa Ziehau <sephe@dragonflybsd.org>
Date: Fri, 19 Sep 2008 11:36:40 +0000 (+0000)
Subject: Add workaround for JMC250A2 under 10/100 hdx mode.
X-Git-Url: https://gitweb.dragonflybsd.org/~lentferj/dragonfly.git/commitdiff_plain/3b3da11007a6e53c09cc57d0f15937cd4332cf67

Add workaround for JMC250A2 under 10/100 hdx mode.

Information provided by Ethen <ethanhsiao@jmicron.com>
---

diff --git a/sys/dev/netif/jme/if_jme.c b/sys/dev/netif/jme/if_jme.c
index 64dc816f13..1687cebca0 100644
--- a/sys/dev/netif/jme/if_jme.c
+++ b/sys/dev/netif/jme/if_jme.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/jme/if_jme.c,v 1.2 2008/07/18 04:20:48 yongari Exp $
- * $DragonFly: src/sys/dev/netif/jme/if_jme.c,v 1.9 2008/09/19 11:12:33 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/jme/if_jme.c,v 1.10 2008/09/19 11:36:40 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -427,8 +427,10 @@ jme_probe(device_t dev)
 
 			sc->jme_caps = sp->jme_caps;
 			if (did == PCI_PRODUCT_JMICRON_JMC250 &&
-			    pci_get_revid(dev) == JME_REV_JMC250_A2)
-				sc->jme_workaround |= JME_WA_EXTFIFO;
+			    pci_get_revid(dev) == JME_REV_JMC250_A2) {
+				sc->jme_workaround |= JME_WA_EXTFIFO |
+						      JME_WA_HDX;
+			}
 
 			device_set_desc(dev, sp->jme_name);
 			return (0);
@@ -1831,8 +1833,8 @@ static void
 jme_mac_config(struct jme_softc *sc)
 {
 	struct mii_data *mii;
-	uint32_t ghc, rxmac, txmac, txpause;
-	int phyconf = JMPHY_CONF_DEFFIFO;
+	uint32_t ghc, rxmac, txmac, txpause, gp1;
+	int phyconf = JMPHY_CONF_DEFFIFO, hdx = 0;
 
 	mii = device_get_softc(sc->jme_miibus);
 
@@ -1869,14 +1871,26 @@ jme_mac_config(struct jme_softc *sc)
 		    TXTRHD_RT_PERIOD_ENB | TXTRHD_RT_LIMIT_ENB);
 	}
 
-	/* Reprogram Tx/Rx MACs with resolved speed/duplex. */
+	/*
+	 * Reprogram Tx/Rx MACs with resolved speed/duplex.
+	 */
+	gp1 = CSR_READ_4(sc, JME_GPREG1);
+	gp1 &= ~GPREG1_WA_HDX;
+
+	if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) == 0)
+		hdx = 1;
+
 	switch (IFM_SUBTYPE(mii->mii_media_active)) {
 	case IFM_10_T:
 		ghc |= GHC_SPEED_10;
+		if (hdx)
+			gp1 |= GPREG1_WA_HDX;
 		break;
 
 	case IFM_100_TX:
 		ghc |= GHC_SPEED_100;
+		if (hdx)
+			gp1 |= GPREG1_WA_HDX;
 
 		/*
 		 * Use extended FIFO depth to workaround CRC errors
@@ -1890,7 +1904,7 @@ jme_mac_config(struct jme_softc *sc)
 			break;
 
 		ghc |= GHC_SPEED_1000;
-		if ((IFM_OPTIONS(mii->mii_media_active) & IFM_FDX) == 0)
+		if (hdx)
 			txmac |= TXMAC_CARRIER_EXT | TXMAC_FRAME_BURST;
 		break;
 
@@ -1906,6 +1920,8 @@ jme_mac_config(struct jme_softc *sc)
 		jme_miibus_writereg(sc->jme_dev, sc->jme_phyaddr,
 				    JMPHY_CONF, phyconf);
 	}
+	if (sc->jme_workaround & JME_WA_HDX)
+		CSR_WRITE_4(sc, JME_GPREG1, gp1);
 }
 
 static void
diff --git a/sys/dev/netif/jme/if_jmereg.h b/sys/dev/netif/jme/if_jmereg.h
index 4a3d5b3cf7..e89b0bf0f9 100644
--- a/sys/dev/netif/jme/if_jmereg.h
+++ b/sys/dev/netif/jme/if_jmereg.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/jme/if_jmereg.h,v 1.1 2008/05/27 01:42:01 yongari Exp $
- * $DragonFly: src/sys/dev/netif/jme/if_jmereg.h,v 1.3 2008/09/13 02:47:03 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/jme/if_jmereg.h,v 1.4 2008/09/19 11:36:40 sephe Exp $
  */
 
 #ifndef	_IF_JMEREG_H
@@ -554,8 +554,10 @@
 #define	GPREG0_PHY_ADDR_SHIFT	0
 #define	GPREG0_PHY_ADDR		1
 
-/* General purpose register 1. reserved for future use. */
+/* General purpose register 1. */
 #define	JME_GPREG1		0x080C
+#define GPREG1_WA_HDX		0x00000020 /* 250A2 only, for 10/100 mode */
+#define GPREG1_WA_IP6RSS	0x00000040 /* 250A2 only, for 10/100 mode */
 
 /* MSIX entry number of interrupt source. */
 #define	JME_MSINUM_BASE		0x0810
diff --git a/sys/dev/netif/jme/if_jmevar.h b/sys/dev/netif/jme/if_jmevar.h
index 84934125ee..113f83292e 100644
--- a/sys/dev/netif/jme/if_jmevar.h
+++ b/sys/dev/netif/jme/if_jmevar.h
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/jme/if_jmevar.h,v 1.1 2008/05/27 01:42:01 yongari Exp $
- * $DragonFly: src/sys/dev/netif/jme/if_jmevar.h,v 1.5 2008/09/19 11:12:33 sephe Exp $
+ * $DragonFly: src/sys/dev/netif/jme/if_jmevar.h,v 1.6 2008/09/19 11:36:40 sephe Exp $
  */
 
 #ifndef	_IF_JMEVAR_H
@@ -191,6 +191,7 @@ struct jme_softc {
 
 	uint32_t		jme_workaround;
 #define JME_WA_EXTFIFO		0x0001
+#define JME_WA_HDX		0x0002
 
 	uint32_t		jme_flags;
 #define	JME_FLAG_MSI		0x0001