Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Feb 2012 00:35:32 +0000 (UTC)
From:      Marius Strobl <marius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r232136 - stable/7/sys/dev/mii
Message-ID:  <201202250035.q1P0ZW3Z090958@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marius
Date: Sat Feb 25 00:35:32 2012
New Revision: 232136
URL: http://svn.freebsd.org/changeset/base/232136

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/7/sys/dev/mii/brgphy.c
  stable/7/sys/dev/mii/miidevs
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/mii/brgphy.c
==============================================================================
--- stable/7/sys/dev/mii/brgphy.c	Sat Feb 25 00:35:28 2012	(r232135)
+++ stable/7/sys/dev/mii/brgphy.c	Sat Feb 25 00:35:32 2012	(r232136)
@@ -145,6 +145,7 @@ static const struct mii_phydesc brgphys[
 	MII_PHY_DESC(xxBROADCOM_ALT2, BCM5719C),
 	MII_PHY_DESC(xxBROADCOM_ALT2, BCM5720C),
 	MII_PHY_DESC(xxBROADCOM_ALT2, BCM57765),
+	MII_PHY_DESC(xxBROADCOM_ALT2, BCM57780),
 	MII_PHY_DESC(BROADCOM2, BCM5906),
 	MII_PHY_END
 };
@@ -242,7 +243,8 @@ brgphy_attach(device_t dev)
 				sc->mii_flags |= MIIF_HAVEFIBER;
 			}
 			break;
-		} break;
+		}
+		break;
 	case MII_OUI_xxBROADCOM_ALT1:
 		switch (bsc->mii_model) {
 		case MII_MODEL_xxBROADCOM_ALT1_BCM5708S:
@@ -964,7 +966,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/7/sys/dev/mii/miidevs
==============================================================================
--- stable/7/sys/dev/mii/miidevs	Sat Feb 25 00:35:28 2012	(r232135)
+++ stable/7/sys/dev/mii/miidevs	Sat Feb 25 00:35:32 2012	(r232136)
@@ -152,6 +152,7 @@ model xxBROADCOM_ALT1 BCM5784	0x003a BCM
 model xxBROADCOM_ALT1 BCM5709C	0x003c BCM5709C 10/100/1000baseTX PHY
 model xxBROADCOM_ALT1 BCM5761	0x003d BCM5761 10/100/1000baseTX PHY
 model xxBROADCOM_ALT1 BCM5709S	0x003f BCM5709S 1000/2500baseSX PHY
+model xxBROADCOM_ALT2 BCM57780	0x0019 BCM57780 1000BASE-T media interface
 model xxBROADCOM_ALT2 BCM5717C	0x0020 BCM5717C 10/100/1000baseTX PHY
 model xxBROADCOM_ALT2 BCM5719C	0x0022 BCM5719C 10/100/1000baseTX PHY
 model xxBROADCOM_ALT2 BCM57765	0x0024 BCM57765 10/100/1000baseTX PHY



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202250035.q1P0ZW3Z090958>