From owner-svn-src-stable@FreeBSD.ORG  Mon Mar 15 19:13:37 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4E3DB1065672;
	Mon, 15 Mar 2010 19:13:37 +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 3D1538FC16;
	Mon, 15 Mar 2010 19:13:37 +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 o2FJDbFt051710;
	Mon, 15 Mar 2010 19:13:37 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2FJDbZD051708;
	Mon, 15 Mar 2010 19:13:37 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201003151913.o2FJDbZD051708@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Mon, 15 Mar 2010 19:13:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205189 - stable/8/sys/dev/gem
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Mar 2010 19:13:37 -0000

Author: marius
Date: Mon Mar 15 19:13:36 2010
New Revision: 205189
URL: http://svn.freebsd.org/changeset/base/205189

Log:
  MFC: r204222
  
  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

Modified:
  stable/8/sys/dev/gem/if_gem.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/gem/if_gem.c
==============================================================================
--- stable/8/sys/dev/gem/if_gem.c	Mon Mar 15 19:04:56 2010	(r205188)
+++ stable/8/sys/dev/gem/if_gem.c	Mon Mar 15 19:13:36 2010	(r205189)
@@ -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) {