From owner-svn-src-all@FreeBSD.ORG  Fri May 22 14:25:24 2015
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:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 959F0A48;
 Fri, 22 May 2015 14:25:24 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 849131C4F;
 Fri, 22 May 2015 14:25:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4MEPOFe056919;
 Fri, 22 May 2015 14:25:24 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4MEPOme056918;
 Fri, 22 May 2015 14:25:24 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201505221425.t4MEPOme056918@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Fri, 22 May 2015 14:25:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r283287 - head/sys/arm/ti/cpsw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
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/options/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, 22 May 2015 14:25:24 -0000

Author: andrew
Date: Fri May 22 14:25:23 2015
New Revision: 283287
URL: https://svnweb.freebsd.org/changeset/base/283287

Log:
  Add a miibus_statchg and use it to enable Gigabit mode when appropriate.
  
  MFC after:	1 week

Modified:
  head/sys/arm/ti/cpsw/if_cpsw.c

Modified: head/sys/arm/ti/cpsw/if_cpsw.c
==============================================================================
--- head/sys/arm/ti/cpsw/if_cpsw.c	Fri May 22 12:01:29 2015	(r283286)
+++ head/sys/arm/ti/cpsw/if_cpsw.c	Fri May 22 14:25:23 2015	(r283287)
@@ -113,6 +113,7 @@ static int cpsw_ioctl(struct ifnet *, u_
 
 static int cpsw_miibus_readreg(device_t, int phy, int reg);
 static int cpsw_miibus_writereg(device_t, int phy, int reg, int value);
+static void cpsw_miibus_statchg(device_t);
 
 /* Send/Receive packets. */
 static void cpsw_intr_rx(void *arg);
@@ -179,6 +180,7 @@ static device_method_t cpsw_methods[] = 
 	/* MII interface */
 	DEVMETHOD(miibus_readreg,	cpsw_miibus_readreg),
 	DEVMETHOD(miibus_writereg,	cpsw_miibus_writereg),
+	DEVMETHOD(miibus_statchg,	cpsw_miibus_statchg),
 	{ 0, 0 }
 };
 
@@ -1265,6 +1267,36 @@ cpsw_miibus_writereg(device_t dev, int p
 	return 0;
 }
 
+static void
+cpsw_miibus_statchg(device_t dev)
+{
+	struct cpsw_softc *sc = device_get_softc(dev);
+	uint32_t mac_control;
+	int i;
+
+	CPSW_DEBUGF((""));
+
+	for (i = 0; i < 2; i++) {
+		mac_control = cpsw_read_4(sc, CPSW_SL_MACCONTROL(i));
+		mac_control &= ~(1 << 15 | 1 << 7);
+
+		switch(IFM_SUBTYPE(sc->mii->mii_media_active)) {
+		case IFM_1000_SX:
+		case IFM_1000_LX:
+		case IFM_1000_CX:
+		case IFM_1000_T:
+			mac_control |= 1 << 7;
+			break;
+
+		default:
+			mac_control |= 1 << 15;
+			break;
+		}
+
+		cpsw_write_4(sc, CPSW_SL_MACCONTROL(i), mac_control);
+	}
+}
+
 /*
  *
  * Transmit/Receive Packets.