Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 2 Nov 2010 23:56:35 +0000 (UTC)
From:      Pyun YongHyeon <yongari@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: r214713 - stable/7/sys/dev/bge
Message-ID:  <201011022356.oA2NuZso099487@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: yongari
Date: Tue Nov  2 23:56:35 2010
New Revision: 214713
URL: http://svn.freebsd.org/changeset/base/214713

Log:
  MFC r213747,213808,214216:
  r213747:
    Protect bge(4) from accessing invalid NIC internal memory regions
    on BCM5906.
  
    Tested by:	Buganini < buganini <> gmail dot com >
  
  r213808:
    Add more checks for resolved link speed in bge_miibus_statchg().
    Link UP state could be reported first before actual completion of
    auto-negotiation. This change makes bge(4) reprogram BGE_MAC_MODE,
    BGE_TX_MODE and BGE_RX_MODE register only after controller got a
    valid link.
  
  r214216:
    Enable TX MAC state machine lockup fix for both BCM5755 or higher
    and BCM5906. Publicly available data sheet just says it may happen
    due to corrupted TxMbuf.

Modified:
  stable/7/sys/dev/bge/if_bge.c
  stable/7/sys/dev/bge/if_bgereg.h
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/bge/if_bge.c
==============================================================================
--- stable/7/sys/dev/bge/if_bge.c	Tue Nov  2 23:54:59 2010	(r214712)
+++ stable/7/sys/dev/bge/if_bge.c	Tue Nov  2 23:56:35 2010	(r214713)
@@ -550,6 +550,10 @@ bge_readmem_ind(struct bge_softc *sc, in
 	device_t dev;
 	uint32_t val;
 
+	if (sc->bge_asicrev == BGE_ASICREV_BCM5906 &&
+	    off >= BGE_STATS_BLOCK && off < BGE_SEND_RING_1_TO_4)
+		return (0);
+
 	dev = sc->bge_dev;
 
 	pci_write_config(dev, BGE_PCI_MEMWIN_BASEADDR, off, 4);
@@ -563,6 +567,10 @@ bge_writemem_ind(struct bge_softc *sc, i
 {
 	device_t dev;
 
+	if (sc->bge_asicrev == BGE_ASICREV_BCM5906 &&
+	    off >= BGE_STATS_BLOCK && off < BGE_SEND_RING_1_TO_4)
+		return;
+
 	dev = sc->bge_dev;
 
 	pci_write_config(dev, BGE_PCI_MEMWIN_BASEADDR, off, 4);
@@ -870,6 +878,29 @@ bge_miibus_statchg(device_t dev)
 	sc = device_get_softc(dev);
 	mii = device_get_softc(sc->bge_miibus);
 
+	if ((mii->mii_media_status & (IFM_ACTIVE | IFM_AVALID)) ==
+	    (IFM_ACTIVE | IFM_AVALID)) {
+		switch (IFM_SUBTYPE(mii->mii_media_active)) {
+		case IFM_10_T:
+		case IFM_100_TX:
+			sc->bge_link = 1;
+			break;
+		case IFM_1000_T:
+		case IFM_1000_SX:
+		case IFM_2500_SX:
+			if (sc->bge_asicrev != BGE_ASICREV_BCM5906)
+				sc->bge_link = 1;
+			else
+				sc->bge_link = 0;
+			break;
+		default:
+			sc->bge_link = 0;
+			break;
+		}
+	} else
+		sc->bge_link = 0;
+	if (sc->bge_link == 0)
+		return;
 	BGE_CLRBIT(sc, BGE_MAC_MODE, BGE_MACMODE_PORTMODE);
 	if (IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_T ||
 	    IFM_SUBTYPE(mii->mii_media_active) == IFM_1000_SX)
@@ -4335,6 +4366,7 @@ bge_init_locked(struct bge_softc *sc)
 {
 	struct ifnet *ifp;
 	uint16_t *m;
+	uint32_t mode;
 
 	BGE_LOCK_ASSERT(sc);
 
@@ -4440,8 +4472,12 @@ bge_init_locked(struct bge_softc *sc)
 	/* Init TX ring. */
 	bge_init_tx_ring(sc);
 
+	/* Enable TX MAC state machine lockup fix. */
+	mode = CSR_READ_4(sc, BGE_TX_MODE);
+	if (BGE_IS_5755_PLUS(sc) || sc->bge_asicrev == BGE_ASICREV_BCM5906)
+		mode |= BGE_TXMODE_MBUF_LOCKUP_FIX;
 	/* Turn on transmitter. */
-	BGE_SETBIT(sc, BGE_TX_MODE, BGE_TXMODE_ENABLE);
+	CSR_WRITE_4(sc, BGE_TX_MODE, mode | BGE_TXMODE_ENABLE);
 
 	/* Turn on receiver. */
 	BGE_SETBIT(sc, BGE_RX_MODE, BGE_RXMODE_ENABLE);
@@ -5062,12 +5098,7 @@ bge_link_upd(struct bge_softc *sc)
 		 */
 		mii = device_get_softc(sc->bge_miibus);
 		mii_pollstat(mii);
-		if (!sc->bge_link && mii->mii_media_status & IFM_ACTIVE &&
-		    IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) {
-			bge_miibus_statchg(sc->bge_dev);
-			sc->bge_link = 1;
-		} else
-			sc->bge_link = 0;
+		bge_miibus_statchg(sc->bge_dev);
 	}
 
 	/* Clear the attention. */

Modified: stable/7/sys/dev/bge/if_bgereg.h
==============================================================================
--- stable/7/sys/dev/bge/if_bgereg.h	Tue Nov  2 23:54:59 2010	(r214712)
+++ stable/7/sys/dev/bge/if_bgereg.h	Tue Nov  2 23:56:35 2010	(r214713)
@@ -765,6 +765,7 @@
 #define	BGE_TXMODE_FLOWCTL_ENABLE	0x00000010
 #define	BGE_TXMODE_BIGBACKOFF_ENABLE	0x00000020
 #define	BGE_TXMODE_LONGPAUSE_ENABLE	0x00000040
+#define	BGE_TXMODE_MBUF_LOCKUP_FIX	0x00000100
 
 /* Transmit MAC status register */
 #define	BGE_TXSTAT_RX_XOFFED		0x00000001

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