From owner-svn-src-all@FreeBSD.ORG  Mon Feb 22 21:01:08 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 C34DB106566B;
	Mon, 22 Feb 2010 21:01:08 +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 B34BE8FC17;
	Mon, 22 Feb 2010 21:01:08 +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 o1ML18Gv057419;
	Mon, 22 Feb 2010 21:01:08 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1ML1844057417;
	Mon, 22 Feb 2010 21:01:08 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201002222101.o1ML1844057417@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 22 Feb 2010 21:01:08 +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: r204222 - head/sys/dev/gem
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: Mon, 22 Feb 2010 21:01:08 -0000

Author: marius
Date: Mon Feb 22 21:01:08 2010
New Revision: 204222
URL: http://svn.freebsd.org/changeset/base/204222

Log:
  According to the Linux sungem driver, in case of Apple (K2) GMACs
  GEM_MIF_CONFIG_MDI0 cannot be trusted when the firmware has powered
  down the chip so the internal transceiver has to be hardcoded. This
  is also in line with the AppleGMACEthernet driver, which just doesn't
  distinguish between internal/external transceiver and MDIO/MDI1
  respectively in the first place. Tested by: Andreas Tobler
  
  MFC after:	1 week

Modified:
  head/sys/dev/gem/if_gem.c

Modified: head/sys/dev/gem/if_gem.c
==============================================================================
--- head/sys/dev/gem/if_gem.c	Mon Feb 22 20:42:30 2010	(r204221)
+++ head/sys/dev/gem/if_gem.c	Mon Feb 22 21:01:08 2010	(r204222)
@@ -297,8 +297,11 @@ gem_attach(struct gem_softc *sc)
 
 	/*
 	 * Fall back on an internal PHY if no external PHY was found.
+	 * Note that with Apple (K2) GMACs GEM_MIF_CONFIG_MDI0 can't be
+	 * trusted when the firmware has powered down the chip.
 	 */
-	if (error != 0 && (v & GEM_MIF_CONFIG_MDI0) != 0) {
+	if (error != 0 &&
+	    ((v & GEM_MIF_CONFIG_MDI0) != 0 || GEM_IS_APPLE(sc))) {
 		v &= ~GEM_MIF_CONFIG_PHY_SEL;
 		GEM_BANK1_WRITE_4(sc, GEM_MIF_CONFIG, v);
 		switch (sc->sc_variant) {