From owner-p4-projects@FreeBSD.ORG  Tue Apr 13 15:17:54 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 919CD106566C; Tue, 13 Apr 2010 15:17:54 +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 56507106564A
	for <perforce@freebsd.org>; Tue, 13 Apr 2010 15:17:54 +0000 (UTC)
	(envelope-from raj@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 44FB68FC16
	for <perforce@freebsd.org>; Tue, 13 Apr 2010 15:17:54 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o3DFHs0B051042
	for <perforce@freebsd.org>; Tue, 13 Apr 2010 15:17:54 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3DFHsHO051040
	for perforce@freebsd.org; Tue, 13 Apr 2010 15:17:54 GMT
	(envelope-from raj@freebsd.org)
Date: Tue, 13 Apr 2010 15:17:54 GMT
Message-Id: <201004131517.o3DFHsHO051040@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	raj@freebsd.org using -f
From: Rafal Jaworowski <raj@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 176864 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 13 Apr 2010 15:17:54 -0000

http://p4web.freebsd.org/@@176864?ac=10

Change 176864 by raj@raj_fdt on 2010/04/13 15:17:08

	Retrieve interrupt routing info from the DT on MPC85XX PCI(E).
	
	This lets PCI(E) fully work off the device tree blob on these
	platforms as well.

Affected files ...

.. //depot/projects/fdt/sys/powerpc/mpc85xx/pci_fdt.c#2 edit

Differences ...

==== //depot/projects/fdt/sys/powerpc/mpc85xx/pci_fdt.c#2 (text+ko) ====

@@ -282,7 +282,7 @@
 #define PCI_INTRS 12
 	/* Configure PCI interrupt pins */
 	for (int i = 0; i < PCI_INTRS; i++)
-		powerpc_config_intr(i, INTR_TRIGGER_LEVEL, INTR_POLARITY_LOW);
+		powerpc_config_intr(PIC_IRQ_EXT(i), INTR_TRIGGER_LEVEL, INTR_POLARITY_LOW);
 
 	node = ofw_bus_get_node(dev);
 	/*
@@ -568,9 +568,11 @@
 fsl_pcib_route_int(struct fsl_pcib_softc *sc, u_int bus, u_int slot, u_int func,
     u_int intpin)
 {
-	int unit = device_get_unit(sc->sc_dev);
+	int err, unit;
 	u_int devfn, intline;
 
+	unit = device_get_unit(sc->sc_dev);
+
 	devfn = DEVFN(bus, slot, func);
 	if (devfn == sc->sc_devfn_via_ide)
 		intline = 14;
@@ -585,9 +587,12 @@
 			intline += (bus != sc->sc_busnr) ? slot : 0;
 			intline = PIC_IRQ_EXT(intline & 3);
 #endif
-			intline = intpin - 1;
-			intline += (4 * unit);
-			intline = PIC_IRQ_EXT(intline & 0x0f);
+			err = fdt_pci_route_intr(bus, slot, func, intpin,
+			    &sc->sc_intr_info, &intline);
+			if (err == 0)
+				intline = PIC_IRQ_EXT(intline & 0x0f);
+			else
+				intline = 0xff;
 		} else
 			intline = 0xff;
 	}