Author: yongari
Date: Mon Oct 20 07:27:34 2014
New Revision: 273306
URL: https://svnweb.freebsd.org/changeset/base/273306
Log:
MFC r271073:
Do not blindly announce 1000baseT half-duplex capability in
autonegotiation. Some controllers like cgem(4) do not support
half-duplex at gigabit speeds.
Modified:
stable/9/sys/dev/mii/e1000phy.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/mii/e1000phy.c
==============================================================================
--- stable/9/sys/dev/mii/e1000phy.c Mon Oct 20 07:25:57 2014
(r273305)
+++ stable/9/sys/dev/mii/e1000phy.c Mon Oct 20 07:27:34 2014
(r273306)
@@ -167,8 +167,12 @@ e1000phy_attach(device_t dev)
PHY_RESET(sc);
sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & sc->mii_capmask;
- if (sc->mii_capabilities & BMSR_EXTSTAT)
+ if (sc->mii_capabilities & BMSR_EXTSTAT) {
sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR);
+ if ((sc->mii_extcapabilities &
+ (EXTSR_1000TFDX | EXTSR_1000THDX)) != 0)
+ sc->mii_flags |= MIIF_HAVE_GTCR;
+ }
device_printf(dev, " ");
mii_phy_add_media(sc);
printf("\n");
@@ -319,8 +323,7 @@ e1000phy_service(struct mii_softc *sc, s
speed = 0;
switch (IFM_SUBTYPE(ife->ifm_media)) {
case IFM_1000_T:
- if ((sc->mii_extcapabilities &
- (EXTSR_1000TFDX | EXTSR_1000THDX)) == 0)
+ if ((sc->mii_flags & MIIF_HAVE_GTCR) == 0)
return (EINVAL);
speed = E1000_CR_SPEED_1000;
break;
@@ -357,10 +360,9 @@ e1000phy_service(struct mii_softc *sc, s
if (IFM_SUBTYPE(ife->ifm_media) == IFM_1000_T) {
gig |= E1000_1GCR_MS_ENABLE;
- if ((ife->ifm_media & IFM_ETH_MASTER) != 0)
+ if ((ife->ifm_media & IFM_ETH_MASTER) != 0)
gig |= E1000_1GCR_MS_VALUE;
- } else if ((sc->mii_extcapabilities &
- (EXTSR_1000TFDX | EXTSR_1000THDX)) != 0)
+ } else if ((sc->mii_flags & MIIF_HAVE_GTCR) != 0)
gig = 0;
PHY_WRITE(sc, E1000_1GCR, gig);
PHY_WRITE(sc, E1000_AR, E1000_AR_SELECTOR_FIELD);
@@ -491,9 +493,14 @@ e1000phy_mii_phy_auto(struct mii_softc *
PHY_WRITE(sc, E1000_AR, reg | E1000_AR_SELECTOR_FIELD);
} else
PHY_WRITE(sc, E1000_AR, E1000_FA_1000X_FD | E1000_FA_1000X);
- if ((sc->mii_extcapabilities & (EXTSR_1000TFDX | EXTSR_1000THDX)) != 0)
- PHY_WRITE(sc, E1000_1GCR,
- E1000_1GCR_1000T_FD | E1000_1GCR_1000T);
+ if ((sc->mii_flags & MIIF_HAVE_GTCR) != 0) {
+ reg = 0;
+ if ((sc->mii_extcapabilities & EXTSR_1000TFDX) != 0)
+ reg |= E1000_1GCR_1000T_FD;
+ if ((sc->mii_extcapabilities & EXTSR_1000THDX) != 0)
+ reg |= E1000_1GCR_1000T;
+ PHY_WRITE(sc, E1000_1GCR, reg);
+ }
PHY_WRITE(sc, E1000_CR,
E1000_CR_AUTO_NEG_ENABLE | E1000_CR_RESTART_AUTO_NEG);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
