[Midnightbsd-cvs] src [8664] trunk/sys/dev/mii/brgphy.c: For fiber PHYs, BRGPHY_MII_1000CTL register is not defined so do not touch it.

[laffer1 at midnightbsd.org]

Revision: 8664
          http://svnweb.midnightbsd.org/src/?rev=8664
Author:   laffer1
Date:     2016-09-25 16:30:53 -0400 (Sun, 25 Sep 2016)
Log Message:
-----------
For fiber PHYs, BRGPHY_MII_1000CTL register is not defined so do not touch it.

Modified Paths:
--------------
    trunk/sys/dev/mii/brgphy.c

Modified: trunk/sys/dev/mii/brgphy.c
===================================================================
--- trunk/sys/dev/mii/brgphy.c	2016-09-25 20:30:18 UTC (rev 8663)
+++ trunk/sys/dev/mii/brgphy.c	2016-09-25 20:30:53 UTC (rev 8664)
@@ -608,6 +608,11 @@
 		    (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 @@
 		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);