From owner-p4-projects@FreeBSD.ORG  Tue Apr 13 20:47:25 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B0D3C1065676; Tue, 13 Apr 2010 20:47:25 +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 75601106566B
	for <perforce@freebsd.org>; Tue, 13 Apr 2010 20:47:25 +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 638958FC14
	for <perforce@freebsd.org>; Tue, 13 Apr 2010 20:47:25 +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 o3DKlPYb001843
	for <perforce@freebsd.org>; Tue, 13 Apr 2010 20:47:25 GMT
	(envelope-from raj@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o3DKlP9r001841
	for perforce@freebsd.org; Tue, 13 Apr 2010 20:47:25 GMT
	(envelope-from raj@freebsd.org)
Date: Tue, 13 Apr 2010 20:47:25 GMT
Message-Id: <201004132047.o3DKlP9r001841@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 176876 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 20:47:25 -0000

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

Change 176876 by raj@raj_fdt on 2010/04/13 20:47:13

	Move MPC85XX PCI interrupt config to a better place. Clean up.

Affected files ...

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

Differences ...

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

@@ -275,15 +275,6 @@
 		capptr = (cfgreg >> 8) & 0xff;
 	}
 
-	/*
-	 * XXX initializing PCI interrrupts should go elsewhere, platform_if
-	 * maybe?
-	 */
-#define PCI_INTRS 12
-	/* Configure PCI interrupt pins */
-	for (int i = 0; i < PCI_INTRS; i++)
-		powerpc_config_intr(PIC_IRQ_EXT(i), INTR_TRIGGER_LEVEL, INTR_POLARITY_LOW);
-
 	node = ofw_bus_get_node(dev);
 	/*
 	 * Get PCI interrupt info.
@@ -582,11 +573,6 @@
 		intline = 10;
 	else {
 		if (intpin != 0) {
-#if 0
-			intline = intpin - 1;
-			intline += (bus != sc->sc_busnr) ? slot : 0;
-			intline = PIC_IRQ_EXT(intline & 3);
-#endif
 			err = fdt_pci_route_intr(bus, slot, func, intpin,
 			    &sc->sc_intr_info, &intline);
 			if (err == 0)
@@ -601,6 +587,10 @@
 		printf("PCI %u:%u:%u:%u: intpin %u: intline=%u\n",
 		    unit, bus, slot, func, intpin, intline);
 
+	if (intline != 0xff)
+		powerpc_config_intr(intline, INTR_TRIGGER_LEVEL,
+		    INTR_POLARITY_LOW);
+
 	return (intline);
 }
 
@@ -832,12 +822,6 @@
 	bus_addr_t *vap, *allocp;
 	int error;
 
-#if 0
-	error = bus_get_resource(sc->sc_dev, type, 1, &start, &size);
-	if (error)
-		return (error);
-#endif
-
 	end = start + size - 1;
 
 	switch (type) {