From owner-p4-projects@FreeBSD.ORG  Sun Nov 16 22:59:58 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6CC5A106567F; Sun, 16 Nov 2008 22:59:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1414C1065675
	for <perforce@freebsd.org>; Sun, 16 Nov 2008 22:59:58 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0419D8FC0A
	for <perforce@freebsd.org>; Sun, 16 Nov 2008 22:59:58 +0000 (UTC)
	(envelope-from nwhitehorn@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAGMxvPF026233
	for <perforce@freebsd.org>; Sun, 16 Nov 2008 22:59:57 GMT
	(envelope-from nwhitehorn@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAGMxvlw026231
	for perforce@freebsd.org; Sun, 16 Nov 2008 22:59:57 GMT
	(envelope-from nwhitehorn@freebsd.org)
Date: Sun, 16 Nov 2008 22:59:57 GMT
Message-Id: <200811162259.mAGMxvlw026231@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	nwhitehorn@freebsd.org using -f
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 153060 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Nov 2008 22:59:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=153060

Change 153060 by nwhitehorn@nwhitehorn_trantor on 2008/11/16 22:59:28

	Fix interrupt-cells detection on Grackle.

Affected files ...

.. //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#7 edit

Differences ...

==== //depot/projects/ppc-g5/sys/powerpc/powermac/grackle.c#7 (text+ko) ====

@@ -255,10 +255,12 @@
 	ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(cell_t));
 
 	/* We need the number of interrupt cells to read the imap */
-	sc->sc_icells = 2;
-	if (OF_getprop(node, "interrupt-parent", &iparent,sizeof(iparent)) > 0)
-		OF_getprop(iparent,"#interrupt-cells",&sc->sc_icells, 
-		    sizeof(sc->sc_icells));
+	if (OF_getprop(node, "interrupt-parent", &iparent,sizeof(iparent)) <= 0)
+		iparent = node;
+
+	if (OF_getprop(iparent,"#interrupt-cells",&sc->sc_icells, 
+	    sizeof(sc->sc_icells)) <= 0);
+		sc->sc_icells = 1;
 
 	device_add_child(dev, "pci", device_get_unit(dev));
 	return (bus_generic_attach(dev));