From owner-svn-src-stable-9@FreeBSD.ORG  Tue Nov  6 21:54:45 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 78ECAA56;
 Tue,  6 Nov 2012 21:54:45 +0000 (UTC)
 (envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5CE018FC14;
 Tue,  6 Nov 2012 21:54:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA6Lsjbq061658;
 Tue, 6 Nov 2012 21:54:45 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA6LsjlM061656;
 Tue, 6 Nov 2012 21:54:45 GMT
 (envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201211062154.qA6LsjlM061656@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 6 Nov 2012 21:54:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r242678 - stable/9/sys/powerpc/powermac
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
 <svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
 <mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Nov 2012 21:54:45 -0000

Author: nwhitehorn
Date: Tue Nov  6 21:54:45 2012
New Revision: 242678
URL: http://svnweb.freebsd.org/changeset/base/242678

Log:
  MFC r242315:
  Work around broken device tree on last-generation PowerPC iMacs
  (PowerMac12,1), which have a mac-io MPIC cell that indifies itself
  as the root PIC despite the actual root PIC being on the northbridge.
  No CPC945 systems have a mac-io PIC that does anything so just don't
  attach on CPC945 (U4) systems.

Modified:
  stable/9/sys/powerpc/powermac/openpic_macio.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/powerpc/powermac/openpic_macio.c
==============================================================================
--- stable/9/sys/powerpc/powermac/openpic_macio.c	Tue Nov  6 21:53:17 2012	(r242677)
+++ stable/9/sys/powerpc/powermac/openpic_macio.c	Tue Nov  6 21:54:45 2012	(r242678)
@@ -94,6 +94,10 @@ openpic_macio_probe(device_t dev)
 	if (strcmp(type, "open-pic") != 0)
                 return (ENXIO);
 
+	/* On some U4 systems, there is a phantom MPIC in the mac-io cell */
+	if (OF_finddevice("/u4") != (phandle_t)-1)
+		return (ENXIO);
+
 	device_set_desc(dev, OPENPIC_DEVSTR);
 	return (0);
 }