Tweak the xmphy driver a little bit based on something I learned about

the built-in 1000baseX interface in the Level 1 LXT1001 chip. The Level 1
PHY comes up with the isolate bit in the control register set by default,
but it also has the autonegotiate bit set. When you tell the xmphy driver
to select IFM_AUTO mode, it sees that the autoneg bit is already on, and
thus doesn't bother updating the control register. However this means that
the isolate bit is never turned off (unless you manually select 1000baseSX
full or half duplex mode, which does result in the control register being
modified and the ISO bit being turned off).

This subtle and unusual behavioral difference stopped me from being able
to receive packets on the SMC9462TX card for several days, since isolating
the PHY disconnects it from the MAC's data interface. The fix is to omit
the 'is the autoneg big set?' test, since it doesn't really provide much
of an optimization anyway.

This commit also updates the xmphy driver to support the Jato/Level 1
internal PHY. (I'm not sure how Jato Technologies is related to Level 1:
all I know is the OUI from the PHY ID registers maps to Jato in the OUI
database.) This will be used once I add the if_lge driver to support
the LXT10010 chip.

1 files changed, 18 insertions, 8 deletions

diff --git a/sys/dev/mii/xmphy.c b/sys/dev/mii/xmphy.c
index d312ac2146ee..c147da045f27 100644
--- a/sys/dev/mii/xmphy.c
+++ b/sys/dev/mii/xmphy.c
@@ -98,13 +98,19 @@ static int xmphy_probe(dev)
 
 	ma = device_get_ivars(dev);
 
-	if (MII_OUI(ma->mii_id1, ma->mii_id2) != MII_OUI_xxXAQTI ||
-	    MII_MODEL(ma->mii_id2) != MII_MODEL_XAQTI_XMACII)
-		return(ENXIO);
+	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxXAQTI &&
+	    MII_MODEL(ma->mii_id2) == MII_MODEL_XAQTI_XMACII) {
+		device_set_desc(dev, MII_STR_XAQTI_XMACII);
+		return(0);
+	}
 
-	device_set_desc(dev, MII_STR_XAQTI_XMACII);
+	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_JATO &&
+	    MII_MODEL(ma->mii_id2) == MII_MODEL_JATO_BASEX) {
+		device_set_desc(dev, MII_STR_JATO_BASEX);
+		return(0);
+	}
 
-	return(0);
+	return(ENXIO);
 }
 
 static int xmphy_attach(dev)
@@ -210,11 +216,13 @@ xmphy_service(sc, mii, cmd)
 
 		switch (IFM_SUBTYPE(ife->ifm_media)) {
 		case IFM_AUTO:
+#ifdef foo
 			/*
 			 * If we're already in auto mode, just return.
 			 */
 			if (PHY_READ(sc, XMPHY_MII_BMCR) & XMPHY_BMCR_AUTOEN)
 				return (0);
+#endif
 			(void) xmphy_mii_phy_auto(sc, 1);
 			break;
 		case IFM_1000_SX:
@@ -349,11 +357,13 @@ xmphy_mii_phy_auto(mii, waitfor)
 	struct mii_softc *mii;
 	int waitfor;
 {
-	int bmsr, i;
+	int bmsr, anar = 0, i;
 
 	if ((mii->mii_flags & MIIF_DOINGAUTO) == 0) {
-		PHY_WRITE(mii, XMPHY_MII_ANAR,
-		    XMPHY_ANAR_FDX|XMPHY_ANAR_HDX);
+		anar = PHY_READ(mii, XMPHY_MII_ANAR);
+		anar |= XMPHY_ANAR_FDX|XMPHY_ANAR_HDX;
+		PHY_WRITE(mii, XMPHY_MII_ANAR, anar);
+		DELAY(1000);
 		PHY_WRITE(mii, XMPHY_MII_BMCR,
 		    XMPHY_BMCR_AUTOEN | XMPHY_BMCR_STARTNEG);
 	}