vserver 1.9.5.x5

[linux-2.6.git] / arch / i386 / pci / acpi.c

diff --git a/arch/i386/pci/acpi.c b/arch/i386/pci/acpi.c
index d0a5b79..0c0a169 100644 (file)
--- a/arch/i386/pci/acpi.c
+++ b/arch/i386/pci/acpi.c
@@ -1,6 +1,8 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/init.h>
+#include <linux/irq.h>
+#include <asm/hw_irq.h>
 #include "pci.h"
 
 struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
@@ -13,20 +15,47 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do
        return pcibios_scan_root(busnum);
 }
 
+extern int pci_routeirq;
 static int __init pci_acpi_init(void)
 {
+       struct pci_dev *dev = NULL;
+
        if (pcibios_scanned)
                return 0;
 
-       if (!acpi_noirq) {
-               if (!acpi_pci_irq_init()) {
-                       printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
-                       pcibios_scanned++;
-                       pcibios_enable_irq = acpi_pci_irq_enable;
-               } else
-                       printk(KERN_WARNING "PCI: Invalid ACPI-PCI IRQ routing table\n");
+       if (acpi_noirq)
+               return 0;
+
+       printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");
+       acpi_irq_penalty_init();
+       pcibios_scanned++;
+       pcibios_enable_irq = acpi_pci_irq_enable;
 
+       if (pci_routeirq) {
+               /*
+                * PCI IRQ routing is set up by pci_enable_device(), but we
+                * also do it here in case there are still broken drivers that
+                * don't use pci_enable_device().
+                */
+               printk(KERN_INFO "** Routing PCI interrupts for all devices because \"pci=routeirq\"\n");
+               printk(KERN_INFO "** was specified.  If this was required to make a driver work,\n");
+               printk(KERN_INFO "** please email the output of \"lspci\" to bjorn.helgaas@hp.com\n");
+               printk(KERN_INFO "** so I can fix the driver.\n");
+               while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL)
+                       acpi_pci_irq_enable(dev);
+       } else {
+               printk(KERN_INFO "** PCI interrupts are no longer routed automatically.  If this\n");
+               printk(KERN_INFO "** causes a device to stop working, it is probably because the\n");
+               printk(KERN_INFO "** driver failed to call pci_enable_device().  As a temporary\n");
+               printk(KERN_INFO "** workaround, the \"pci=routeirq\" argument restores the old\n");
+               printk(KERN_INFO "** behavior.  If this argument makes the device work again,\n");
+               printk(KERN_INFO "** please email the output of \"lspci\" to bjorn.helgaas@hp.com\n");
+               printk(KERN_INFO "** so I can fix the driver.\n");
        }
+#ifdef CONFIG_X86_IO_APIC
+       if (acpi_ioapic)
+               print_IO_APIC();
+#endif
 
        return 0;
 }