svn commit: r245861 - stable/9/sys/dev/mii

[Pyun YongHyeon]

Author: yongari
Date: Thu Jan 24 01:31:22 2013
New Revision: 245861
URL: http://svnweb.freebsd.org/changeset/base/245861

Log:
  MFC r244481:
    For fiber PHYs, BRGPHY_MII_1000CTL register is not defined at all
    so do not touch it.

Modified:
  stable/9/sys/dev/mii/brgphy.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/mii/brgphy.c
==============================================================================
--- stable/9/sys/dev/mii/brgphy.c	Thu Jan 24 01:13:13 2013	(r245860)
+++ stable/9/sys/dev/mii/brgphy.c	Thu Jan 24 01:31:22 2013	(r245861)
@@ -608,6 +608,11 @@ brgphy_mii_phy_auto(struct mii_softc *sc
 		    (sc->mii_flags & MIIF_FORCEPAUSE) != 0)
 			anar |= BRGPHY_ANAR_PC | BRGPHY_ANAR_ASP;
 		PHY_WRITE(sc, BRGPHY_MII_ANAR, anar);
+		ktcr = BRGPHY_1000CTL_AFD | BRGPHY_1000CTL_AHD;
+		if (sc->mii_mpd_model == MII_MODEL_BROADCOM_BCM5701)
+			ktcr |= BRGPHY_1000CTL_MSE | BRGPHY_1000CTL_MSC;
+		PHY_WRITE(sc, BRGPHY_MII_1000CTL, ktcr);
+		PHY_READ(sc, BRGPHY_MII_1000CTL);
 	} else {
 		anar = BRGPHY_SERDES_ANAR_FDX | BRGPHY_SERDES_ANAR_HDX;
 		if ((media & IFM_FLOW) != 0 ||
@@ -616,12 +621,6 @@ brgphy_mii_phy_auto(struct mii_softc *sc
 		PHY_WRITE(sc, BRGPHY_SERDES_ANAR, anar);
 	}
 
-	ktcr = BRGPHY_1000CTL_AFD | BRGPHY_1000CTL_AHD;
-	if (sc->mii_mpd_model == MII_MODEL_BROADCOM_BCM5701)
-		ktcr |= BRGPHY_1000CTL_MSE | BRGPHY_1000CTL_MSC;
-	PHY_WRITE(sc, BRGPHY_MII_1000CTL, ktcr);
-	ktcr = PHY_READ(sc, BRGPHY_MII_1000CTL);
-
 	PHY_WRITE(sc, BRGPHY_MII_BMCR, BRGPHY_BMCR_AUTOEN |
 	    BRGPHY_BMCR_STARTNEG);
 	PHY_WRITE(sc, BRGPHY_MII_IMR, 0xFF00);