svn commit: r214269 - in stable/7/sys/dev: dc mii

Marius Strobl marius at FreeBSD.org
Sun Oct 24 13:42:04 UTC 2010


Author: marius
Date: Sun Oct 24 13:42:03 2010
New Revision: 214269
URL: http://svn.freebsd.org/changeset/base/214269

Log:
  MFC: r213384
  
  Consistently always explicitly set IFM_HDX for half-duplex.
  
  Obtained from:	OpenBSD (mostly)

Modified:
  stable/7/sys/dev/dc/dcphy.c
  stable/7/sys/dev/dc/pnphy.c
  stable/7/sys/dev/mii/acphy.c
  stable/7/sys/dev/mii/amphy.c
  stable/7/sys/dev/mii/bmtphy.c
  stable/7/sys/dev/mii/gentbi.c
  stable/7/sys/dev/mii/inphy.c
  stable/7/sys/dev/mii/lxtphy.c
  stable/7/sys/dev/mii/nsphy.c
  stable/7/sys/dev/mii/qsphy.c
  stable/7/sys/dev/mii/rlphy.c
  stable/7/sys/dev/mii/ruephy.c
  stable/7/sys/dev/mii/tdkphy.c
  stable/7/sys/dev/mii/tlphy.c
  stable/7/sys/dev/mii/ukphy_subr.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/dc/dcphy.c
==============================================================================
--- stable/7/sys/dev/dc/dcphy.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/dc/dcphy.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -341,14 +341,14 @@ dcphy_status(struct mii_softc *sc)
 				mii->mii_media_active |= IFM_100_TX | IFM_FDX;
 			else if (anlpar & ANLPAR_T4 &&
 			    sc->mii_capabilities & BMSR_100T4)
-				mii->mii_media_active |= IFM_100_T4;
+				mii->mii_media_active |= IFM_100_T4 | IFM_HDX;
 			else if (anlpar & ANLPAR_TX &&
 			    sc->mii_capabilities & BMSR_100TXHDX)
-				mii->mii_media_active |= IFM_100_TX;
+				mii->mii_media_active |= IFM_100_TX | IFM_HDX;
 			else if (anlpar & ANLPAR_10_FD)
 				mii->mii_media_active |= IFM_10_T | IFM_FDX;
 			else if (anlpar & ANLPAR_10)
-				mii->mii_media_active |= IFM_10_T;
+				mii->mii_media_active |= IFM_10_T | IFM_HDX;
 			else
 				mii->mii_media_active |= IFM_NONE;
 			if (DC_IS_INTEL(dc_sc))
@@ -366,9 +366,9 @@ dcphy_status(struct mii_softc *sc)
 		 * change the media settings if we're wrong.
 		 */
 		if (!(reg & DC_TSTAT_LS100))
-			mii->mii_media_active |= IFM_100_TX;
+			mii->mii_media_active |= IFM_100_TX | IFM_HDX;
 		else if (!(reg & DC_TSTAT_LS10))
-			mii->mii_media_active |= IFM_10_T;
+			mii->mii_media_active |= IFM_10_T | IFM_HDX;
 		else
 			mii->mii_media_active |= IFM_NONE;
 		if (DC_IS_INTEL(dc_sc))
@@ -383,6 +383,8 @@ skip:
 		mii->mii_media_active |= IFM_100_TX;
 	if (CSR_READ_4(dc_sc, DC_NETCFG) & DC_NETCFG_FULLDUPLEX)
 		mii->mii_media_active |= IFM_FDX;
+	else
+		mii->mii_media_active |= IFM_HDX;
 }
 
 static int

Modified: stable/7/sys/dev/dc/pnphy.c
==============================================================================
--- stable/7/sys/dev/dc/pnphy.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/dc/pnphy.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -237,4 +237,6 @@ pnphy_status(struct mii_softc *sc)
 		mii->mii_media_active |= IFM_100_TX;
 	if (CSR_READ_4(dc_sc, DC_NETCFG) & DC_NETCFG_FULLDUPLEX)
 		mii->mii_media_active |= IFM_FDX;
+	else
+		mii->mii_media_active |= IFM_HDX;
 }

Modified: stable/7/sys/dev/mii/acphy.c
==============================================================================
--- stable/7/sys/dev/mii/acphy.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/mii/acphy.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -245,6 +245,8 @@ acphy_status(struct mii_softc *sc)
 
 		if (diag & AC_DIAG_DUPLEX)
 			mii->mii_media_active |= IFM_FDX;
+		else
+			mii->mii_media_active |= IFM_HDX;
 	} else
 		mii->mii_media_active = ife->ifm_media;
 }

Modified: stable/7/sys/dev/mii/amphy.c
==============================================================================
--- stable/7/sys/dev/mii/amphy.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/mii/amphy.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -206,13 +206,13 @@ amphy_status(struct mii_softc *sc)
 			if (anlpar & ANLPAR_TX_FD)
 				mii->mii_media_active |= IFM_100_TX|IFM_FDX;
 			else if (anlpar & ANLPAR_T4)
-				mii->mii_media_active |= IFM_100_T4;
+				mii->mii_media_active |= IFM_100_T4|IFM_HDX;
 			else if (anlpar & ANLPAR_TX)
-				mii->mii_media_active |= IFM_100_TX;
+				mii->mii_media_active |= IFM_100_TX|IFM_HDX;
 			else if (anlpar & ANLPAR_10_FD)
 				mii->mii_media_active |= IFM_10_T|IFM_FDX;
 			else if (anlpar & ANLPAR_10)
-				mii->mii_media_active |= IFM_10_T;
+				mii->mii_media_active |= IFM_10_T|IFM_HDX;
 			else
 				mii->mii_media_active |= IFM_NONE;
 			return;
@@ -225,11 +225,11 @@ amphy_status(struct mii_softc *sc)
 		if (par & DSCSR_100FDX)
 			mii->mii_media_active |= IFM_100_TX|IFM_FDX;
 		else if (par & DSCSR_100HDX)
-			mii->mii_media_active |= IFM_100_TX;
+			mii->mii_media_active |= IFM_100_TX|IFM_HDX;
 		else if (par & DSCSR_10FDX)
 			mii->mii_media_active |= IFM_10_T|IFM_HDX;
 		else if (par & DSCSR_10HDX)
-			mii->mii_media_active |= IFM_10_T;
+			mii->mii_media_active |= IFM_10_T|IFM_HDX;
 	} else
 		mii->mii_media_active = ife->ifm_media;
 }

Modified: stable/7/sys/dev/mii/bmtphy.c
==============================================================================
--- stable/7/sys/dev/mii/bmtphy.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/mii/bmtphy.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -243,6 +243,8 @@ bmtphy_status(struct mii_softc *sc)
 			mii->mii_media_active |= IFM_10_T;
 		if (aux_csr & AUX_CSR_FDX)
 			mii->mii_media_active |= IFM_FDX;
+		else
+			mii->mii_media_active |= IFM_HDX;
 	} else
 		mii->mii_media_active = ife->ifm_media;
 }

Modified: stable/7/sys/dev/mii/gentbi.c
==============================================================================
--- stable/7/sys/dev/mii/gentbi.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/mii/gentbi.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -263,11 +263,12 @@ gentbi_status(struct mii_softc *sc)
 		 * see if we're doing full-duplex.
 		 */
 		mii->mii_media_active |= IFM_1000_SX;
-
 		anlpar = PHY_READ(sc, MII_ANLPAR);
 		if ((sc->mii_extcapabilities & EXTSR_1000XFDX) != 0 &&
 		    (anlpar & ANLPAR_X_FD) != 0)
 			mii->mii_media_active |= IFM_FDX;
+		else
+			mii->mii_media_active |= IFM_HDX;
 	} else
 		mii->mii_media_active = ife->ifm_media;
 }

Modified: stable/7/sys/dev/mii/inphy.c
==============================================================================
--- stable/7/sys/dev/mii/inphy.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/mii/inphy.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -197,6 +197,8 @@ inphy_status(struct mii_softc *sc)
 			mii->mii_media_active |= IFM_10_T;
 		if (scr & SCR_FDX)
 			mii->mii_media_active |= IFM_FDX;
+		else
+			mii->mii_media_active |= IFM_HDX;
 	} else
 		mii->mii_media_active = ife->ifm_media;
 }

Modified: stable/7/sys/dev/mii/lxtphy.c
==============================================================================
--- stable/7/sys/dev/mii/lxtphy.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/mii/lxtphy.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -250,6 +250,8 @@ lxtphy_status(struct mii_softc *sc)
 			mii->mii_media_active |= IFM_10_T;
 		if (csr & CSR_DUPLEX)
 			mii->mii_media_active |= IFM_FDX;
+		else
+			mii->mii_media_active |= IFM_HDX;
 	} else
 		mii->mii_media_active = ife->ifm_media;
 }

Modified: stable/7/sys/dev/mii/nsphy.c
==============================================================================
--- stable/7/sys/dev/mii/nsphy.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/mii/nsphy.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -298,13 +298,13 @@ nsphy_status(struct mii_softc *sc)
 			if (anlpar & ANLPAR_TX_FD)
 				mii->mii_media_active |= IFM_100_TX|IFM_FDX;
 			else if (anlpar & ANLPAR_T4)
-				mii->mii_media_active |= IFM_100_T4;
+				mii->mii_media_active |= IFM_100_T4|IFM_HDX;
 			else if (anlpar & ANLPAR_TX)
-				mii->mii_media_active |= IFM_100_TX;
+				mii->mii_media_active |= IFM_100_TX|IFM_HDX;
 			else if (anlpar & ANLPAR_10_FD)
 				mii->mii_media_active |= IFM_10_T|IFM_FDX;
 			else if (anlpar & ANLPAR_10)
-				mii->mii_media_active |= IFM_10_T;
+				mii->mii_media_active |= IFM_10_T|IFM_HDX;
 			else
 				mii->mii_media_active |= IFM_NONE;
 			return;
@@ -320,10 +320,7 @@ nsphy_status(struct mii_softc *sc)
 			mii->mii_media_active |= IFM_10_T;
 		else
 			mii->mii_media_active |= IFM_100_TX;
-#if 0
-		if (par & PAR_FDX)
-			mii->mii_media_active |= IFM_FDX;
-#endif
+		mii->mii_media_active |= IFM_HDX;
 	} else
 		mii->mii_media_active = ife->ifm_media;
 }

Modified: stable/7/sys/dev/mii/qsphy.c
==============================================================================
--- stable/7/sys/dev/mii/qsphy.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/mii/qsphy.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -215,19 +215,19 @@ qsphy_status(struct mii_softc *sc)
 	pctl = PHY_READ(sc, MII_QSPHY_PCTL);
 	switch (pctl & PCTL_OPMASK) {
 	case PCTL_10_T:
-		mii->mii_media_active |= IFM_10_T;
+		mii->mii_media_active |= IFM_10_T|IFM_HDX;
 		break;
 	case PCTL_10_T_FDX:
 		mii->mii_media_active |= IFM_10_T|IFM_FDX;
 		break;
 	case PCTL_100_TX:
-		mii->mii_media_active |= IFM_100_TX;
+		mii->mii_media_active |= IFM_100_TX|IFM_HDX;
 		break;
 	case PCTL_100_TX_FDX:
 		mii->mii_media_active |= IFM_100_TX|IFM_FDX;
 		break;
 	case PCTL_100_T4:
-		mii->mii_media_active |= IFM_100_T4;
+		mii->mii_media_active |= IFM_100_T4|IFM_HDX;
 		break;
 	case PCTL_AN:
 		mii->mii_media_active |= IFM_NONE;

Modified: stable/7/sys/dev/mii/rlphy.c
==============================================================================
--- stable/7/sys/dev/mii/rlphy.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/mii/rlphy.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -249,13 +249,13 @@ rlphy_status(struct mii_softc *phy)
 			if (anlpar & ANLPAR_TX_FD)
 				mii->mii_media_active |= IFM_100_TX|IFM_FDX;
 			else if (anlpar & ANLPAR_T4)
-				mii->mii_media_active |= IFM_100_T4;
+				mii->mii_media_active |= IFM_100_T4|IFM_HDX;
 			else if (anlpar & ANLPAR_TX)
-				mii->mii_media_active |= IFM_100_TX;
+				mii->mii_media_active |= IFM_100_TX|IFM_HDX;
 			else if (anlpar & ANLPAR_10_FD)
 				mii->mii_media_active |= IFM_10_T|IFM_FDX;
 			else if (anlpar & ANLPAR_10)
-				mii->mii_media_active |= IFM_10_T;
+				mii->mii_media_active |= IFM_10_T|IFM_HDX;
 			else
 				mii->mii_media_active |= IFM_NONE;
 			return;
@@ -299,6 +299,7 @@ rlphy_status(struct mii_softc *phy)
 			else
 				mii->mii_media_active |= IFM_100_TX;
 		}
+		mii->mii_media_active |= IFM_HDX;
 	} else
 		mii->mii_media_active = ife->ifm_media;
 }

Modified: stable/7/sys/dev/mii/ruephy.c
==============================================================================
--- stable/7/sys/dev/mii/ruephy.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/mii/ruephy.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -244,6 +244,8 @@ ruephy_status(struct mii_softc *phy)
 
 		if (msr & RUEPHY_MSR_DUPLEX)
 			mii->mii_media_active |= IFM_FDX;
+		else
+			mii->mii_media_active |= IFM_HDX;
 	} else
 		mii->mii_media_active = ife->ifm_media;
 }

Modified: stable/7/sys/dev/mii/tdkphy.c
==============================================================================
--- stable/7/sys/dev/mii/tdkphy.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/mii/tdkphy.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -217,13 +217,13 @@ tdkphy_status(struct mii_softc *phy)
 		if (anlpar & ANLPAR_TX_FD)
 			mii->mii_media_active |= IFM_100_TX|IFM_FDX;
 		else if (anlpar & ANLPAR_T4)
-			mii->mii_media_active |= IFM_100_T4;
+			mii->mii_media_active |= IFM_100_T4|IFM_HDX;
 		else if (anlpar & ANLPAR_TX)
-			mii->mii_media_active |= IFM_100_TX;
+			mii->mii_media_active |= IFM_100_TX|IFM_HDX;
 		else if (anlpar & ANLPAR_10_FD)
 			mii->mii_media_active |= IFM_10_T|IFM_FDX;
 		else if (anlpar & ANLPAR_10)
-			mii->mii_media_active |= IFM_10_T;
+			mii->mii_media_active |= IFM_10_T|IFM_HDX;
 		else {
 			/*
 			 * ANLPAR isn't set, which leaves two possibilities:
@@ -234,10 +234,12 @@ tdkphy_status(struct mii_softc *phy)
 			 */
 			diag = PHY_READ(phy, MII_DIAG);
 			if (diag & DIAG_NEGFAIL) /* assume 10baseT if no neg */
-				mii->mii_media_active |= IFM_10_T;
+				mii->mii_media_active |= IFM_10_T|IFM_HDX;
 			else {
 				if (diag & DIAG_DUPLEX)
 					mii->mii_media_active |= IFM_FDX;
+				else
+					mii->mii_media_active |= IFM_HDX;
 				if (diag & DIAG_RATE_100)
 					mii->mii_media_active |= IFM_100_TX;
 				else

Modified: stable/7/sys/dev/mii/tlphy.c
==============================================================================
--- stable/7/sys/dev/mii/tlphy.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/mii/tlphy.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -333,6 +333,8 @@ tlphy_status(struct tlphy_softc *sc)
 	 */
 	if (bmcr & BMCR_FDX)
 		mii->mii_media_active |= IFM_FDX;
+	else
+		mii->mii_media_active |= IFM_HDX;
 	mii->mii_media_active |= IFM_10_T;
 }
 

Modified: stable/7/sys/dev/mii/ukphy_subr.c
==============================================================================
--- stable/7/sys/dev/mii/ukphy_subr.c	Sun Oct 24 13:41:38 2010	(r214268)
+++ stable/7/sys/dev/mii/ukphy_subr.c	Sun Oct 24 13:42:03 2010	(r214269)
@@ -104,17 +104,17 @@ ukphy_status(struct mii_softc *phy)
 			mii->mii_media_active |= IFM_1000_T|IFM_FDX;
 		else if ((gtcr & GTCR_ADV_1000THDX) &&
 		    (gtsr & GTSR_LP_1000THDX))
-			mii->mii_media_active |= IFM_1000_T;
+			mii->mii_media_active |= IFM_1000_T|IFM_HDX;
 		else if (anlpar & ANLPAR_TX_FD)
 			mii->mii_media_active |= IFM_100_TX|IFM_FDX;
 		else if (anlpar & ANLPAR_T4)
-			mii->mii_media_active |= IFM_100_T4;
+			mii->mii_media_active |= IFM_100_T4|IFM_HDX;
 		else if (anlpar & ANLPAR_TX)
-			mii->mii_media_active |= IFM_100_TX;
+			mii->mii_media_active |= IFM_100_TX|IFM_HDX;
 		else if (anlpar & ANLPAR_10_FD)
 			mii->mii_media_active |= IFM_10_T|IFM_FDX;
 		else if (anlpar & ANLPAR_10)
-			mii->mii_media_active |= IFM_10_T;
+			mii->mii_media_active |= IFM_10_T|IFM_HDX;
 		else
 			mii->mii_media_active |= IFM_NONE;
 	} else


More information about the svn-src-stable-7 mailing list