[POWERPC] Make pci_read_irq_line the default

This patch reworks the way IRQs are fixed up on PCI for arch powerpc.

It makes pci_read_irq_line() called by default in the PCI code for
devices that are probed, and add an optional per-device fixup in
ppc_md for platforms that really need to correct what they obtain
from pci_read_irq_line().

It also removes ppc_md.irq_bus_setup which was only used by pSeries
and should not be needed anymore.

I've also removed the pSeries s7a workaround as it can't work with
the current interrupt code anyway. I'm trying to get one of these
machines working so I can test a proper fix for that problem.

I also haven't updated the old-style fixup code from 85xx_cds.c
because it's actually buggy :) It assigns pci_dev->irq hard coded
numbers which is no good with the new IRQ mapping code. It should
at least use irq_create_mapping(NULL, hard_coded_number); and possibly
also set_irq_type() to set them as level low.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

3 files changed, 21 insertions, 30 deletions

diff --git a/arch/powerpc/platforms/maple/maple.h b/arch/powerpc/platforms/maple/maple.h
index 0657c579b840..c6911ddc479f 100644
--- a/arch/powerpc/platforms/maple/maple.h
+++ b/arch/powerpc/platforms/maple/maple.h
@@ -8,5 +8,5 @@ extern void maple_get_rtc_time(struct rtc_time *tm);
 extern unsigned long maple_get_boot_time(void);
 extern void maple_calibrate_decr(void);
 extern void maple_pci_init(void);
-extern void maple_pcibios_fixup(void);
+extern void maple_pci_irq_fixup(struct pci_dev *dev);
 extern int maple_pci_get_legacy_ide_irq(struct pci_dev *dev, int channel);
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 63b4d1bff359..3a32deda765d 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -502,38 +502,29 @@ static int __init add_bridge(struct device_node *dev)
 }
 
 
-void __init maple_pcibios_fixup(void)
+void __devinit maple_pci_irq_fixup(struct pci_dev *dev)
 {
-        struct pci_dev *dev = NULL;
-
-        DBG(" -> maple_pcibios_fixup\n");
-
-        for_each_pci_dev(dev) {
-                /* Fixup IRQ for PCIe host */
-                if (u4_pcie != NULL && dev->bus->number == 0 &&
-                    pci_bus_to_host(dev->bus) == u4_pcie) {
-                        printk(KERN_DEBUG "Fixup U4 PCIe IRQ\n");
-                        dev->irq = irq_create_mapping(NULL, 1);
-                        if (dev->irq != NO_IRQ)
-                                set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
-                        continue;
-                }
-
-                /* Hide AMD8111 IDE interrupt when in legacy mode so
-                 * the driver calls pci_get_legacy_ide_irq()
-                 */
-                if (dev->vendor == PCI_VENDOR_ID_AMD &&
-                    dev->device == PCI_DEVICE_ID_AMD_8111_IDE &&
-                    (dev->class & 5) != 5) {
-                        dev->irq = NO_IRQ;
-                        continue;
-                }
+        DBG(" -> maple_pci_irq_fixup\n");
+
+        /* Fixup IRQ for PCIe host */
+        if (u4_pcie != NULL && dev->bus->number == 0 &&
+            pci_bus_to_host(dev->bus) == u4_pcie) {
+                printk(KERN_DEBUG "Fixup U4 PCIe IRQ\n");
+                dev->irq = irq_create_mapping(NULL, 1);
+                if (dev->irq != NO_IRQ)
+                        set_irq_type(dev->irq, IRQ_TYPE_LEVEL_LOW);
+        }
 
-                /* For all others, map the interrupt from the device-tree */
-                pci_read_irq_line(dev);
+        /* Hide AMD8111 IDE interrupt when in legacy mode so
+         * the driver calls pci_get_legacy_ide_irq()
+         */
+        if (dev->vendor == PCI_VENDOR_ID_AMD &&
+            dev->device == PCI_DEVICE_ID_AMD_8111_IDE &&
+            (dev->class & 5) != 5) {
+                dev->irq = NO_IRQ;
         }
 
-        DBG(" <- maple_pcibios_fixup\n");
+        DBG(" <- maple_pci_irq_fixup\n");
 }
 
 static void __init maple_fixup_phb_resources(void)
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index fe6b9bff61b9..094989d50bab 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -312,7 +312,7 @@ define_machine(maple_md) {
         .setup_arch             = maple_setup_arch,
         .init_early             = maple_init_early,
         .init_IRQ               = maple_init_IRQ,
-        .pcibios_fixup          = maple_pcibios_fixup,
+        .pci_irq_fixup          = maple_pci_irq_fixup,
         .pci_get_legacy_ide_irq = maple_pci_get_legacy_ide_irq,
         .restart                = maple_restart,
         .power_off              = maple_power_off,