patch-2.3.30 linux/arch/ppc/kernel/pmac_pci.c

• Lines: 39
• Date: Thu Dec 2 14:37:34 1999
• Orig file: v2.3.29/linux/arch/ppc/kernel/pmac_pci.c
• Orig date: Fri Oct 22 13:21:45 1999

diff -u --recursive --new-file v2.3.29/linux/arch/ppc/kernel/pmac_pci.c linux/arch/ppc/kernel/pmac_pci.c
@@ -21,7 +21,6 @@
 
 #include <asm/init.h>
 #include <asm/io.h>
-#include <asm/pgtable.h>
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
 #include <asm/machdep.h>
@@ -439,6 +438,30 @@
 
 		if (strcmp(dev->name, "bandit") == 0)
 			init_bandit(bp);
+	}
+}
+
+/* Recursively searches any node that is of type PCI-PCI bridge. Without
+ * this, the old code would miss children of P2P bridges and hence not
+ * fix IRQ's for cards located behind P2P bridges.
+ * - Ranjit Deshpande, 01/20/99
+ */
+void __init
+fix_intr(struct device_node *node, struct pci_dev *dev)
+{
+	unsigned int *reg, *class_code;
+
+	for (; node != 0;node = node->sibling) {
+		class_code = (unsigned int *) get_property(node, "class-code", 0);
+		if((*class_code >> 8) == PCI_CLASS_BRIDGE_PCI)
+			fix_intr(node->child, dev);
+		reg = (unsigned int *) get_property(node, "reg", 0);
+		if (reg == 0 || ((reg[0] >> 8) & 0xff) != dev->devfn)
+			continue;
+		/* this is the node, see if it has interrupts */
+		if (node->n_intrs > 0) 
+			dev->irq = node->intrs[0].line;
+		break;
 	}
 }