svn commit: r232134 - in stable/9/sys: dev/mii i386/conf

Marius Strobl marius at FreeBSD.org
Sat Feb 25 00:35:19 UTC 2012


Author: marius
Date: Sat Feb 25 00:35:19 2012
New Revision: 232134
URL: http://svn.freebsd.org/changeset/base/232134

Log:
  MFC: r231913
  
  - Probe BCM57780.
  - In case the parent is bge(4), don't set the Jumbo frame settings unless
    the MAC actually is Jumbo capable as otherwise the PHY might not have the
    corresponding registers implemented. This is also in line with what the
    Linux tg3 driver does.
  
  PR:		165032
  Submitted by:	Alexander Milanov
  Obtained from:	OpenBSD

Modified:
  stable/9/sys/dev/mii/brgphy.c
  stable/9/sys/dev/mii/miidevs
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)

Modified: stable/9/sys/dev/mii/brgphy.c
==============================================================================
--- stable/9/sys/dev/mii/brgphy.c	Sat Feb 25 00:16:00 2012	(r232133)
+++ stable/9/sys/dev/mii/brgphy.c	Sat Feb 25 00:35:19 2012	(r232134)
@@ -146,6 +146,7 @@ static const struct mii_phydesc brgphys[
 	MII_PHY_DESC(BROADCOM3, BCM5719C),
 	MII_PHY_DESC(BROADCOM3, BCM5720C),
 	MII_PHY_DESC(BROADCOM3, BCM57765),
+	MII_PHY_DESC(BROADCOM3, BCM57780),
 	MII_PHY_DESC(xxBROADCOM_ALT1, BCM5906),
 	MII_PHY_END
 };
@@ -225,7 +226,8 @@ brgphy_attach(device_t dev)
 				sc->mii_flags |= MIIF_HAVEFIBER;
 			}
 			break;
-		} break;
+		}
+		break;
 	case MII_OUI_BROADCOM2:
 		switch (sc->mii_mpd_model) {
 		case MII_MODEL_BROADCOM2_BCM5708S:
@@ -942,7 +944,8 @@ brgphy_reset(struct mii_softc *sc)
 		if (bge_sc->bge_phy_flags & BGE_PHY_JITTER_BUG)
 			brgphy_fixup_jitter_bug(sc);
 
-		brgphy_jumbo_settings(sc, ifp->if_mtu);
+		if (bge_sc->bge_flags & BGE_FLAG_JUMBO)
+			brgphy_jumbo_settings(sc, ifp->if_mtu);
 
 		if ((bge_sc->bge_phy_flags & BGE_PHY_NO_WIRESPEED) == 0)
 			brgphy_ethernet_wirespeed(sc);

Modified: stable/9/sys/dev/mii/miidevs
==============================================================================
--- stable/9/sys/dev/mii/miidevs	Sat Feb 25 00:16:00 2012	(r232133)
+++ stable/9/sys/dev/mii/miidevs	Sat Feb 25 00:35:19 2012	(r232134)
@@ -179,6 +179,7 @@ model BROADCOM2 BCM5784		0x003a BCM5784 
 model BROADCOM2 BCM5709C	0x003c BCM5709 10/100/1000baseT PHY
 model BROADCOM2 BCM5761		0x003d BCM5761 10/100/1000baseT PHY
 model BROADCOM2 BCM5709S	0x003f BCM5709S 1000/2500baseSX PHY
+model BROADCOM3 BCM57780	0x0019 BCM57780 1000BASE-T media interface
 model BROADCOM3 BCM5717C	0x0020 BCM5717C 1000BASE-T media interface
 model BROADCOM3 BCM5719C	0x0022 BCM5719C 1000BASE-T media interface
 model BROADCOM3 BCM57765	0x0024 BCM57765 1000BASE-T media interface


More information about the svn-src-stable mailing list