From owner-svn-src-all@FreeBSD.ORG  Fri Nov 26 21:41:42 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B29BD1065696;
	Fri, 26 Nov 2010 21:41:42 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A169C8FC13;
	Fri, 26 Nov 2010 21:41:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAQLfgtc083242;
	Fri, 26 Nov 2010 21:41:42 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAQLfgGj083240;
	Fri, 26 Nov 2010 21:41:42 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201011262141.oAQLfgGj083240@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Fri, 26 Nov 2010 21:41:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r215905 - head/sys/dev/mii
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Nov 2010 21:41:42 -0000

Author: marius
Date: Fri Nov 26 21:41:42 2010
New Revision: 215905
URL: http://svn.freebsd.org/changeset/base/215905

Log:
  Ensure Bay flow control is disabled as we're going to use IEEE 802.3 annex
  31B full duplex flow control instead.

Modified:
  head/sys/dev/mii/inphy.c

Modified: head/sys/dev/mii/inphy.c
==============================================================================
--- head/sys/dev/mii/inphy.c	Fri Nov 26 21:39:11 2010	(r215904)
+++ head/sys/dev/mii/inphy.c	Fri Nov 26 21:41:42 2010	(r215905)
@@ -77,6 +77,7 @@ DRIVER_MODULE(inphy, miibus, inphy_drive
 
 static int	inphy_service(struct mii_softc *, struct mii_data *, int);
 static void	inphy_status(struct mii_softc *);
+static void	inphy_reset(struct mii_softc *);
 
 static const struct mii_phydesc inphys[] = {
 	MII_PHY_DESC(INTEL, I82553C),
@@ -119,7 +120,7 @@ inphy_attach(device_t dev)
 	    IFM_MAKEWORD(IFM_ETHER, IFM_100_TX, IFM_LOOP, sc->mii_inst),
 	    MII_MEDIA_100_TX, NULL);
 
-	mii_phy_reset(sc);
+	inphy_reset(sc);
 
 	sc->mii_capabilities = PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
 	device_printf(dev, " ");
@@ -206,3 +207,14 @@ inphy_status(struct mii_softc *sc)
 	} else
 		mii->mii_media_active = ife->ifm_media;
 }
+
+static void
+inphy_reset(struct mii_softc *sc)
+{
+
+	mii_phy_reset(sc);
+
+	/* Ensure Bay flow control is disabled. */
+	PHY_WRITE(sc, MII_INPHY_SCR,
+	    PHY_READ(sc, MII_INPHY_SCR) & ~SCR_FLOWCTL);
+}