17 files changed, 487 insertions, 345 deletions
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index c5c8e485fc44..d49202e740ea 100644
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -1,5 +1,17 @@
-ifeq ($(CONFIG_X86_32),y)
+obj-y                           := i386.o init.o
-include ${srctree}/arch/x86/pci/Makefile_32
-else
+obj-$(CONFIG_PCI_BIOS)          += pcbios.o
-include ${srctree}/arch/x86/pci/Makefile_64
+obj-$(CONFIG_PCI_MMCONFIG)      += mmconfig_$(BITS).o direct.o mmconfig-shared.o
-endif
+obj-$(CONFIG_PCI_DIRECT)        += direct.o
+obj-$(CONFIG_PCI_OLPC)          += olpc.o
+obj-y                           += fixup.o
+obj-$(CONFIG_ACPI)              += acpi.o
+obj-y                           += legacy.o irq.o
+obj-$(CONFIG_X86_VISWS)         += visws.o
+obj-$(CONFIG_X86_NUMAQ)         += numaq_32.o
+obj-y                           += common.o early.o
+obj-y                           += amd_bus.o
diff --git a/arch/x86/pci/Makefile_32 b/arch/x86/pci/Makefile_32
deleted file mode 100644
index 89ec35d00efd..000000000000
--- a/arch/x86/pci/Makefile_32
+++ /dev/null
@@ -1,24 +0,0 @@
-obj-y                           := i386.o init.o
-obj-$(CONFIG_PCI_BIOS)          += pcbios.o
-obj-$(CONFIG_PCI_MMCONFIG)      += mmconfig_32.o direct.o mmconfig-shared.o
-obj-$(CONFIG_PCI_DIRECT)        += direct.o
-obj-$(CONFIG_PCI_OLPC)          += olpc.o
-pci-y                           := fixup.o
-# Do not change the ordering here. There is a nasty init function
-# ordering dependency which breaks when you move acpi.o below
-# legacy/irq.o
-pci-$(CONFIG_ACPI)              += acpi.o
-pci-y                           += legacy.o irq.o
-# Careful: VISWS and NUMAQ overrule the pci-y above. The colons are
-# therefor correct. This needs a proper fix by distangling the code.
-pci-$(CONFIG_X86_VISWS)         := visws.o fixup.o
-pci-$(CONFIG_X86_NUMAQ)         := numa.o irq.o
-# Necessary for NUMAQ as well
-pci-$(CONFIG_NUMA)              += mp_bus_to_node.o
-obj-y                           += $(pci-y) common.o early.o
diff --git a/arch/x86/pci/Makefile_64 b/arch/x86/pci/Makefile_64
deleted file mode 100644
index 8fbd19832cf6..000000000000
--- a/arch/x86/pci/Makefile_64
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Makefile for X86_64 specific PCI routines
-#
-# Reuse the i386 PCI subsystem
-#
-EXTRA_CFLAGS += -Iarch/x86/pci
-obj-y           := i386.o
-obj-$(CONFIG_PCI_DIRECT)+= direct.o
-obj-y           += fixup.o init.o
-obj-$(CONFIG_ACPI)      += acpi.o
-obj-y                   += legacy.o irq.o common.o early.o
-# mmconfig has a 64bit special
-obj-$(CONFIG_PCI_MMCONFIG) += mmconfig_64.o direct.o mmconfig-shared.o
-obj-y           += k8-bus_64.o
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index d95de2f199cd..19af06927fbc 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -171,8 +171,11 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do
        if (node != -1)
                set_mp_bus_to_node(busnum, node);
        else
-                node = get_mp_bus_to_node(busnum);
 #endif
+                node = get_mp_bus_to_node(busnum);
+        if (node != -1 && !node_online(node))
+                node = -1;
        /* Allocate per-root-bus (not per bus) arch-specific data.
         * TODO: leak; this memory is never freed.
@@ -204,22 +207,23 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int do
        if (!bus)
                kfree(sd);
+        if (bus && node != -1) {
 #ifdef CONFIG_ACPI_NUMA
-        if (bus) {
+                if (pxm >= 0)
-                if (pxm >= 0) {
                        printk(KERN_DEBUG "bus %02x -> pxm %d -> node %d\n",
-                                busnum, pxm, pxm_to_node(pxm));
+                                busnum, pxm, node);
-                }
+#else
-        }
+                printk(KERN_DEBUG "bus %02x -> node %d\n",
+                        busnum, node);
 #endif
+        }
        if (bus && (pci_probe & PCI_USE__CRS))
                get_current_resources(device, busnum, domain, bus);
        return bus;
 }
-extern int pci_routeirq;
+int __init pci_acpi_init(void)
-static int __init pci_acpi_init(void)
 {
        struct pci_dev *dev = NULL;
@@ -253,4 +257,3 @@ static int __init pci_acpi_init(void)
        return 0;
 }
-subsys_initcall(pci_acpi_init);
diff --git a/arch/x86/pci/k8-bus_64.c b/arch/x86/pci/amd_bus.c
index 5c2799c20e47..dbf532369711 100644
--- a/arch/x86/pci/k8-bus_64.c
+++ b/arch/x86/pci/amd_bus.c
@@ -1,40 +1,25 @@
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/topology.h>
+#include "pci.h"
+#ifdef CONFIG_X86_64
 #include <asm/pci-direct.h>
 #include <asm/mpspec.h>
 #include <linux/cpumask.h>
-#include <linux/topology.h>
+#endif
 /*
 * This discovers the pcibus <-> node mapping on AMD K8.
 * also get peer root bus resource for io,mmio
 */
-/*
- * sub bus (transparent) will use entres from 3 to store extra from root,
- * so need to make sure have enought slot there, increase PCI_BUS_NUM_RESOURCES?
- */
-#define RES_NUM 16
-struct pci_root_info {
-        char name[12];
-        unsigned int res_num;
-        struct resource res[RES_NUM];
-        int bus_min;
-        int bus_max;
-        int node;
-        int link;
-};
-/* 4 at this time, it may become to 32 */
-#define PCI_ROOT_NR 4
-static int pci_root_num;
-static struct pci_root_info pci_root_info[PCI_ROOT_NR];
 #ifdef CONFIG_NUMA
 #define BUS_NR 256
+#ifdef CONFIG_X86_64
 static int mp_bus_to_node[BUS_NR];
 void set_mp_bus_to_node(int busnum, int node)
@@ -61,7 +46,52 @@ int get_mp_bus_to_node(int busnum)
        return node;
 }
-#endif
+#else /* CONFIG_X86_32 */
+static unsigned char mp_bus_to_node[BUS_NR];
+void set_mp_bus_to_node(int busnum, int node)
+{
+        if (busnum >= 0 &&  busnum < BUS_NR)
+        mp_bus_to_node[busnum] = (unsigned char) node;
+}
+int get_mp_bus_to_node(int busnum)
+{
+        int node;
+        if (busnum < 0 || busnum > (BUS_NR - 1))
+                return 0;
+        node = mp_bus_to_node[busnum];
+        return node;
+}
+#endif /* CONFIG_X86_32 */
+#endif /* CONFIG_NUMA */
+#ifdef CONFIG_X86_64
+/*
+ * sub bus (transparent) will use entres from 3 to store extra from root,
+ * so need to make sure have enought slot there, increase PCI_BUS_NUM_RESOURCES?
+ */
+#define RES_NUM 16
+struct pci_root_info {
+        char name[12];
+        unsigned int res_num;
+        struct resource res[RES_NUM];
+        int bus_min;
+        int bus_max;
+        int node;
+        int link;
+};
+/* 4 at this time, it may become to 32 */
+#define PCI_ROOT_NR 4
+static int pci_root_num;
+static struct pci_root_info pci_root_info[PCI_ROOT_NR];
 void set_pci_bus_resources_arch_default(struct pci_bus *b)
 {
@@ -384,7 +414,7 @@ static int __init early_fill_mp_bus_info(void)
        /* need to take out [0, TOM) for RAM*/
        address = MSR_K8_TOP_MEM1;
        rdmsrl(address, val);
-        end = (val & 0xffffff8000000ULL);
+        end = (val & 0xffffff800000ULL);
        printk(KERN_INFO "TOM: %016lx aka %ldM\n", end, end>>20);
        if (end < (1ULL<<32))
                update_range(range, 0, end - 1);
@@ -478,7 +508,7 @@ static int __init early_fill_mp_bus_info(void)
                /* TOP_MEM2 */
                address = MSR_K8_TOP_MEM2;
                rdmsrl(address, val);
-                end = (val & 0xffffff8000000ULL);
+                end = (val & 0xffffff800000ULL);
                printk(KERN_INFO "TOM2: %016lx aka %ldM\n", end, end>>20);
                update_range(range, 1ULL<<32, end - 1);
        }
@@ -526,3 +556,31 @@ static int __init early_fill_mp_bus_info(void)
 }
 postcore_initcall(early_fill_mp_bus_info);
+#endif
+/* common 32/64 bit code */
+#define ENABLE_CF8_EXT_CFG      (1ULL << 46)
+static void enable_pci_io_ecs_per_cpu(void *unused)
+{
+        u64 reg;
+        rdmsrl(MSR_AMD64_NB_CFG, reg);
+        if (!(reg & ENABLE_CF8_EXT_CFG)) {
+                reg |= ENABLE_CF8_EXT_CFG;
+                wrmsrl(MSR_AMD64_NB_CFG, reg);
+        }
+}
+static int __init enable_pci_io_ecs(void)
+{
+        /* assume all cpus from fam10h have IO ECS */
+        if (boot_cpu_data.x86 < 0x10)
+                return 0;
+        on_each_cpu(enable_pci_io_ecs_per_cpu, NULL, 1);
+        pci_probe |= PCI_HAS_IO_ECS;
+        return 0;
+}
+postcore_initcall(enable_pci_io_ecs);
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 940185ecaeda..b67732bbb85a 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -20,6 +20,7 @@
 unsigned int pci_probe = PCI_PROBE_BIOS | PCI_PROBE_CONF1 | PCI_PROBE_CONF2 |
                                PCI_PROBE_MMCONF;
+unsigned int pci_early_dump_regs;
 static int pci_bf_sort;
 int pci_routeirq;
 int pcibios_last_bus = -1;
@@ -31,7 +32,7 @@ struct pci_raw_ops *raw_pci_ext_ops;
 int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
                                                int reg, int len, u32 *val)
 {
-        if (reg < 256 && raw_pci_ops)
+        if (domain == 0 && reg < 256 && raw_pci_ops)
                return raw_pci_ops->read(domain, bus, devfn, reg, len, val);
        if (raw_pci_ext_ops)
                return raw_pci_ext_ops->read(domain, bus, devfn, reg, len, val);
@@ -41,7 +42,7 @@ int raw_pci_read(unsigned int domain, unsigned int bus, unsigned int devfn,
 int raw_pci_write(unsigned int domain, unsigned int bus, unsigned int devfn,
                                                int reg, int len, u32 val)
 {
-        if (reg < 256 && raw_pci_ops)
+        if (domain == 0 && reg < 256 && raw_pci_ops)
                return raw_pci_ops->write(domain, bus, devfn, reg, len, val);
        if (raw_pci_ext_ops)
                return raw_pci_ext_ops->write(domain, bus, devfn, reg, len, val);
@@ -121,6 +122,21 @@ void __init dmi_check_skip_isa_align(void)
        dmi_check_system(can_skip_pciprobe_dmi_table);
 }
+static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev)
+{
+        struct resource *rom_r = &dev->resource[PCI_ROM_RESOURCE];
+        if (pci_probe & PCI_NOASSIGN_ROMS) {
+                if (rom_r->parent)
+                        return;
+                if (rom_r->start) {
+                        /* we deal with BIOS assigned ROM later */
+                        return;
+                }
+                rom_r->start = rom_r->end = rom_r->flags = 0;
+        }
+}
 /*
 *  Called after each bus is probed, but before its children
 *  are examined.
@@ -128,7 +144,11 @@ void __init dmi_check_skip_isa_align(void)
 void __devinit  pcibios_fixup_bus(struct pci_bus *b)
 {
+        struct pci_dev *dev;
        pci_read_bridge_bases(b);
+        list_for_each_entry(dev, &b->devices, bus_list)
+                pcibios_fixup_device_resources(dev);
 }
 /*
@@ -328,18 +348,18 @@ static struct dmi_system_id __devinitdata pciprobe_dmi_table[] = {
 #endif
        {
                .callback = set_bf_sort,
-                .ident = "HP ProLiant DL360",
+                .ident = "HP ProLiant DL385 G2",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "HP"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL360"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL385 G2"),
                },
        },
        {
                .callback = set_bf_sort,
-                .ident = "HP ProLiant DL380",
+                .ident = "HP ProLiant DL585 G2",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "HP"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL380"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"),
                },
        },
        {}
@@ -384,7 +404,7 @@ struct pci_bus * __devinit pcibios_scan_root(int busnum)
 extern u8 pci_cache_line_size;
-static int __init pcibios_init(void)
+int __init pcibios_init(void)
 {
        struct cpuinfo_x86 *c = &boot_cpu_data;
@@ -411,8 +431,6 @@ static int __init pcibios_init(void)
        return 0;
 }
-subsys_initcall(pcibios_init);
 char * __devinit  pcibios_setup(char *str)
 {
        if (!strcmp(str, "off")) {
@@ -483,12 +501,18 @@ char * __devinit  pcibios_setup(char *str)
        else if (!strcmp(str, "rom")) {
                pci_probe |= PCI_ASSIGN_ROMS;
                return NULL;
+        } else if (!strcmp(str, "norom")) {
+                pci_probe |= PCI_NOASSIGN_ROMS;
+                return NULL;
        } else if (!strcmp(str, "assign-busses")) {
                pci_probe |= PCI_ASSIGN_ALL_BUSSES;
                return NULL;
        } else if (!strcmp(str, "use_crs")) {
                pci_probe |= PCI_USE__CRS;
                return NULL;
+        } else if (!strcmp(str, "earlydump")) {
+                pci_early_dump_regs = 1;
+                return NULL;
        } else if (!strcmp(str, "routeirq")) {
                pci_routeirq = 1;
                return NULL;
diff --git a/arch/x86/pci/direct.c b/arch/x86/pci/direct.c
index 21d1e0e0d535..9915293500fb 100644
--- a/arch/x86/pci/direct.c
+++ b/arch/x86/pci/direct.c
@@ -8,18 +8,21 @@
 #include "pci.h"
 /*
- * Functions for accessing PCI configuration space with type 1 accesses
+ * Functions for accessing PCI base (first 256 bytes) and extended
+ * (4096 bytes per PCI function) configuration space with type 1
+ * accesses.
 */
 #define PCI_CONF1_ADDRESS(bus, devfn, reg) \
-        (0x80000000 | (bus << 16) | (devfn << 8) | (reg & ~3))
+        (0x80000000 | ((reg & 0xF00) << 16) | (bus << 16) \
+        | (devfn << 8) | (reg & 0xFC))
 static int pci_conf1_read(unsigned int seg, unsigned int bus,
                          unsigned int devfn, int reg, int len, u32 *value)
 {
        unsigned long flags;
-        if ((bus > 255) || (devfn > 255) || (reg > 255)) {
+        if ((bus > 255) || (devfn > 255) || (reg > 4095)) {
                *value = -1;
                return -EINVAL;
        }
@@ -50,7 +53,7 @@ static int pci_conf1_write(unsigned int seg, unsigned int bus,
 {
        unsigned long flags;
-        if ((bus > 255) || (devfn > 255) || (reg > 255)) 
+        if ((bus > 255) || (devfn > 255) || (reg > 4095))
                return -EINVAL;
        spin_lock_irqsave(&pci_config_lock, flags);
@@ -260,10 +263,18 @@ void __init pci_direct_init(int type)
                return;
        printk(KERN_INFO "PCI: Using configuration type %d for base access\n",
                 type);
-        if (type == 1)
+        if (type == 1) {
                raw_pci_ops = &pci_direct_conf1;
-        else
+                if (raw_pci_ext_ops)
-                raw_pci_ops = &pci_direct_conf2;
+                        return;
+                if (!(pci_probe & PCI_HAS_IO_ECS))
+                        return;
+                printk(KERN_INFO "PCI: Using configuration type 1 "
+                       "for extended access\n");
+                raw_pci_ext_ops = &pci_direct_conf1;
+                return;
+        }
+        raw_pci_ops = &pci_direct_conf2;
 }
 int __init pci_direct_probe(void)
diff --git a/arch/x86/pci/early.c b/arch/x86/pci/early.c
index 42df4b6606df..858dbe3399f9 100644
--- a/arch/x86/pci/early.c
+++ b/arch/x86/pci/early.c
@@ -49,7 +49,14 @@ void write_pci_config_byte(u8 bus, u8 slot, u8 func, u8 offset, u8 val)
 {
        PDprintk("%x writing to %x: %x\n", slot, offset, val);
        outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8);
-        outb(val, 0xcfc);
+        outb(val, 0xcfc + (offset&3));
+}
+void write_pci_config_16(u8 bus, u8 slot, u8 func, u8 offset, u16 val)
+{
+        PDprintk("%x writing to %x: %x\n", slot, offset, val);
+        outl(0x80000000 | (bus<<16) | (slot<<11) | (func<<8) | offset, 0xcf8);
+        outw(val, 0xcfc + (offset&2));
 }
 int early_pci_allowed(void)
@@ -57,3 +64,54 @@ int early_pci_allowed(void)
        return (pci_probe & (PCI_PROBE_CONF1|PCI_PROBE_NOEARLY)) ==
                        PCI_PROBE_CONF1;
 }
+void early_dump_pci_device(u8 bus, u8 slot, u8 func)
+{
+        int i;
+        int j;
+        u32 val;
+        printk("PCI: %02x:%02x:%02x", bus, slot, func);
+        for (i = 0; i < 256; i += 4) {
+                if (!(i & 0x0f))
+                        printk("\n%04x:",i);
+                val = read_pci_config(bus, slot, func, i);
+                for (j = 0; j < 4; j++) {
+                        printk(" %02x", val & 0xff);
+                        val >>= 8;
+                }
+        }
+        printk("\n");
+}
+void early_dump_pci_devices(void)
+{
+        unsigned bus, slot, func;
+        if (!early_pci_allowed())
+                return;
+        for (bus = 0; bus < 256; bus++) {
+                for (slot = 0; slot < 32; slot++) {
+                        for (func = 0; func < 8; func++) {
+                                u32 class;
+                                u8 type;
+                                class = read_pci_config(bus, slot, func,
+                                                        PCI_CLASS_REVISION);
+                                if (class == 0xffffffff)
+                                        break;
+                                early_dump_pci_device(bus, slot, func);
+                                /* No multi-function device? */
+                                type = read_pci_config_byte(bus, slot, func,
+                                                               PCI_HEADER_TYPE);
+                                if (!(type & 0x80))
+                                        break;
+                        }
+                }
+        }
+}
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 10fb308fded8..2aafb67dc5f1 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -299,9 +299,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                return -EINVAL;
        prot = pgprot_val(vma->vm_page_prot);
-        if (pat_wc_enabled && write_combine)
+        if (pat_enabled && write_combine)
                prot |= _PAGE_CACHE_WC;
-        else if (pat_wc_enabled || boot_cpu_data.x86 > 3)
+        else if (pat_enabled || boot_cpu_data.x86 > 3)
                /*
                 * ioremap() and ioremap_nocache() defaults to UC MINUS for now.
                 * To avoid attribute conflicts, request UC MINUS here
@@ -334,7 +334,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                flags = new_flags;
        }
-        if (vma->vm_pgoff <= max_pfn_mapped &&
+        if (((vma->vm_pgoff < max_low_pfn_mapped) ||
+             (vma->vm_pgoff >= (1UL<<(32 - PAGE_SHIFT)) &&
+              vma->vm_pgoff < max_pfn_mapped)) &&
            ioremap_change_attr((unsigned long)__va(addr), len, flags)) {
                free_memtype(addr, addr + len);
                return -EINVAL;
diff --git a/arch/x86/pci/init.c b/arch/x86/pci/init.c
index b821f4462d99..d6c950f81858 100644
--- a/arch/x86/pci/init.c
+++ b/arch/x86/pci/init.c
@@ -4,7 +4,7 @@
 /* arch_initcall has too random ordering, so call the initializers
   in the right sequence from here. */
-static __init int pci_access_init(void)
+static __init int pci_arch_init(void)
 {
 #ifdef CONFIG_PCI_DIRECT
        int type = 0;
@@ -40,4 +40,4 @@ static __init int pci_access_init(void)
        return 0;
 }
-arch_initcall(pci_access_init);
+arch_initcall(pci_arch_init);
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index ca8df9c260bc..6a06a2eb0597 100644
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -11,8 +11,8 @@
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/dmi.h>
-#include <asm/io.h>
+#include <linux/io.h>
-#include <asm/smp.h>
+#include <linux/smp.h>
 #include <asm/io_apic.h>
 #include <linux/irq.h>
 #include <linux/acpi.h>
@@ -45,7 +45,8 @@ struct irq_router {
        char *name;
        u16 vendor, device;
        int (*get)(struct pci_dev *router, struct pci_dev *dev, int pirq);
-        int (*set)(struct pci_dev *router, struct pci_dev *dev, int pirq, int new);
+        int (*set)(struct pci_dev *router, struct pci_dev *dev, int pirq,
+                int new);
 };
 struct irq_router_handler {
@@ -61,7 +62,7 @@ void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;
 *  and perform checksum verification.
 */
-static inline struct irq_routing_table * pirq_check_routing_table(u8 *addr)
+static inline struct irq_routing_table *pirq_check_routing_table(u8 *addr)
 {
        struct irq_routing_table *rt;
        int i;
@@ -74,10 +75,11 @@ static inline struct irq_routing_table * pirq_check_routing_table(u8 *addr)
            rt->size < sizeof(struct irq_routing_table))
                return NULL;
        sum = 0;
-        for (i=0; i < rt->size; i++)
+        for (i = 0; i < rt->size; i++)
                sum += addr[i];
        if (!sum) {
-                DBG(KERN_DEBUG "PCI: Interrupt Routing Table found at 0x%p\n", rt);
+                DBG(KERN_DEBUG "PCI: Interrupt Routing Table found at 0x%p\n",
+                        rt);
                return rt;
        }
        return NULL;
@@ -100,7 +102,7 @@ static struct irq_routing_table * __init pirq_find_routing_table(void)
                        return rt;
                printk(KERN_WARNING "PCI: PIRQ table NOT found at pirqaddr\n");
        }
-        for(addr = (u8 *) __va(0xf0000); addr < (u8 *) __va(0x100000); addr += 16) {
+        for (addr = (u8 *) __va(0xf0000); addr < (u8 *) __va(0x100000); addr += 16) {
                rt = pirq_check_routing_table(addr);
                if (rt)
                        return rt;
@@ -122,20 +124,20 @@ static void __init pirq_peer_trick(void)
        struct irq_info *e;
        memset(busmap, 0, sizeof(busmap));
-        for(i=0; i < (rt->size - sizeof(struct irq_routing_table)) / sizeof(struct irq_info); i++) {
+        for (i = 0; i < (rt->size - sizeof(struct irq_routing_table)) / sizeof(struct irq_info); i++) {
                e = &rt->slots[i];
 #ifdef DEBUG
                {
                        int j;
                        DBG(KERN_DEBUG "%02x:%02x slot=%02x", e->bus, e->devfn/8, e->slot);
-                        for(j=0; j<4; j++)
+                        for (j = 0; j < 4; j++)
                                DBG(" %d:%02x/%04x", j, e->irq[j].link, e->irq[j].bitmap);
                        DBG("\n");
                }
 #endif
                busmap[e->bus] = 1;
        }
-        for(i = 1; i < 256; i++) {
+        for (i = 1; i < 256; i++) {
                int node;
                if (!busmap[i] || pci_find_bus(0, i))
                        continue;
@@ -183,7 +185,8 @@ static unsigned int read_config_nybble(struct pci_dev *router, unsigned offset,
        return (nr & 1) ? (x >> 4) : (x & 0xf);
 }
-static void write_config_nybble(struct pci_dev *router, unsigned offset, unsigned nr, unsigned int val)
+static void write_config_nybble(struct pci_dev *router, unsigned offset,
+        unsigned nr, unsigned int val)
 {
        u8 x;
        unsigned reg = offset + (nr >> 1);
@@ -285,7 +288,7 @@ static int pirq_ite_get(struct pci_dev *router, struct pci_dev *dev, int pirq)
        static const unsigned char pirqmap[4] = { 1, 0, 2, 3 };
        WARN_ON_ONCE(pirq > 4);
-        return read_config_nybble(router,0x43, pirqmap[pirq-1]);
+        return read_config_nybble(router, 0x43, pirqmap[pirq-1]);
 }
 static int pirq_ite_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)
@@ -314,7 +317,7 @@ static int pirq_opti_set(struct pci_dev *router, struct pci_dev *dev, int pirq,
 /*
 * Cyrix: nibble offset 0x5C
- * 0x5C bits 7:4 is INTB bits 3:0 is INTA 
+ * 0x5C bits 7:4 is INTB bits 3:0 is INTA
 * 0x5D bits 7:4 is INTD bits 3:0 is INTC
 */
 static int pirq_cyrix_get(struct pci_dev *router, struct pci_dev *dev, int pirq)
@@ -350,7 +353,7 @@ static int pirq_cyrix_set(struct pci_dev *router, struct pci_dev *dev, int pirq,
 *      Apparently there are systems implementing PCI routing table using
 *      link values 0x01-0x04 and others using 0x41-0x44 for PCI INTA..D.
 *      We try our best to handle both link mappings.
- *      
+ *
 *      Currently (2003-05-21) it appears most SiS chipsets follow the
 *      definition of routing registers from the SiS-5595 southbridge.
 *      According to the SiS 5595 datasheets the revision id's of the
@@ -370,7 +373,7 @@ static int pirq_cyrix_set(struct pci_dev *router, struct pci_dev *dev, int pirq,
 *
 *      0x62:   USBIRQ:
 *              bit 6 OHCI function disabled (0), enabled (1)
- *      
+ *
 *      0x6a:   ACPI/SCI IRQ: bits 4-6 reserved
 *
 *      0x7e:   Data Acq. Module IRQ - bits 4-6 reserved
@@ -467,7 +470,8 @@ static int pirq_serverworks_get(struct pci_dev *router, struct pci_dev *dev, int
        return inb(0xc01) & 0xf;
 }
-static int pirq_serverworks_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)
+static int pirq_serverworks_set(struct pci_dev *router, struct pci_dev *dev,
+        int pirq, int irq)
 {
        outb(pirq, 0xc00);
        outb(irq, 0xc01);
@@ -487,9 +491,7 @@ static int pirq_amd756_get(struct pci_dev *router, struct pci_dev *dev, int pirq
        u8 irq;
        irq = 0;
        if (pirq <= 4)
-        {
                irq = read_config_nybble(router, 0x56, pirq - 1);
-        }
        printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d get irq : %2d\n",
                dev->vendor, dev->device, pirq, irq);
        return irq;
@@ -497,12 +499,10 @@ static int pirq_amd756_get(struct pci_dev *router, struct pci_dev *dev, int pirq
 static int pirq_amd756_set(struct pci_dev *router, struct pci_dev *dev, int pirq, int irq)
 {
-        printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d SET irq : %2d\n", 
+        printk(KERN_INFO "AMD756: dev %04x:%04x, router pirq : %d SET irq : %2d\n",
                dev->vendor, dev->device, pirq, irq);
        if (pirq <= 4)
-        {
                write_config_nybble(router, 0x56, pirq - 1, irq);
-        }
        return 1;
 }
@@ -549,50 +549,49 @@ static __init int intel_router_probe(struct irq_router *r, struct pci_dev *route
        if (pci_dev_present(pirq_440gx))
                return 0;
-        switch(device)
+        switch (device) {
-        {
+        case PCI_DEVICE_ID_INTEL_82371FB_0:
-                case PCI_DEVICE_ID_INTEL_82371FB_0:
+        case PCI_DEVICE_ID_INTEL_82371SB_0:
-                case PCI_DEVICE_ID_INTEL_82371SB_0:
+        case PCI_DEVICE_ID_INTEL_82371AB_0:
-                case PCI_DEVICE_ID_INTEL_82371AB_0:
+        case PCI_DEVICE_ID_INTEL_82371MX:
-                case PCI_DEVICE_ID_INTEL_82371MX:
+        case PCI_DEVICE_ID_INTEL_82443MX_0:
-                case PCI_DEVICE_ID_INTEL_82443MX_0:
+        case PCI_DEVICE_ID_INTEL_82801AA_0:
-                case PCI_DEVICE_ID_INTEL_82801AA_0:
+        case PCI_DEVICE_ID_INTEL_82801AB_0:
-                case PCI_DEVICE_ID_INTEL_82801AB_0:
+        case PCI_DEVICE_ID_INTEL_82801BA_0:
-                case PCI_DEVICE_ID_INTEL_82801BA_0:
+        case PCI_DEVICE_ID_INTEL_82801BA_10:
-                case PCI_DEVICE_ID_INTEL_82801BA_10:
+        case PCI_DEVICE_ID_INTEL_82801CA_0:
-                case PCI_DEVICE_ID_INTEL_82801CA_0:
+        case PCI_DEVICE_ID_INTEL_82801CA_12:
-                case PCI_DEVICE_ID_INTEL_82801CA_12:
+        case PCI_DEVICE_ID_INTEL_82801DB_0:
-                case PCI_DEVICE_ID_INTEL_82801DB_0:
+        case PCI_DEVICE_ID_INTEL_82801E_0:
-                case PCI_DEVICE_ID_INTEL_82801E_0:
+        case PCI_DEVICE_ID_INTEL_82801EB_0:
-                case PCI_DEVICE_ID_INTEL_82801EB_0:
+        case PCI_DEVICE_ID_INTEL_ESB_1:
-                case PCI_DEVICE_ID_INTEL_ESB_1:
+        case PCI_DEVICE_ID_INTEL_ICH6_0:
-                case PCI_DEVICE_ID_INTEL_ICH6_0:
+        case PCI_DEVICE_ID_INTEL_ICH6_1:
-                case PCI_DEVICE_ID_INTEL_ICH6_1:
+        case PCI_DEVICE_ID_INTEL_ICH7_0:
-                case PCI_DEVICE_ID_INTEL_ICH7_0:
+        case PCI_DEVICE_ID_INTEL_ICH7_1:
-                case PCI_DEVICE_ID_INTEL_ICH7_1:
+        case PCI_DEVICE_ID_INTEL_ICH7_30:
-                case PCI_DEVICE_ID_INTEL_ICH7_30:
+        case PCI_DEVICE_ID_INTEL_ICH7_31:
-                case PCI_DEVICE_ID_INTEL_ICH7_31:
+        case PCI_DEVICE_ID_INTEL_ESB2_0:
-                case PCI_DEVICE_ID_INTEL_ESB2_0:
+        case PCI_DEVICE_ID_INTEL_ICH8_0:
-                case PCI_DEVICE_ID_INTEL_ICH8_0:
+        case PCI_DEVICE_ID_INTEL_ICH8_1:
-                case PCI_DEVICE_ID_INTEL_ICH8_1:
+        case PCI_DEVICE_ID_INTEL_ICH8_2:
-                case PCI_DEVICE_ID_INTEL_ICH8_2:
+        case PCI_DEVICE_ID_INTEL_ICH8_3:
-                case PCI_DEVICE_ID_INTEL_ICH8_3:
+        case PCI_DEVICE_ID_INTEL_ICH8_4:
-                case PCI_DEVICE_ID_INTEL_ICH8_4:
+        case PCI_DEVICE_ID_INTEL_ICH9_0:
-                case PCI_DEVICE_ID_INTEL_ICH9_0:
+        case PCI_DEVICE_ID_INTEL_ICH9_1:
-                case PCI_DEVICE_ID_INTEL_ICH9_1:
+        case PCI_DEVICE_ID_INTEL_ICH9_2:
-                case PCI_DEVICE_ID_INTEL_ICH9_2:
+        case PCI_DEVICE_ID_INTEL_ICH9_3:
-                case PCI_DEVICE_ID_INTEL_ICH9_3:
+        case PCI_DEVICE_ID_INTEL_ICH9_4:
-                case PCI_DEVICE_ID_INTEL_ICH9_4:
+        case PCI_DEVICE_ID_INTEL_ICH9_5:
-                case PCI_DEVICE_ID_INTEL_ICH9_5:
+        case PCI_DEVICE_ID_INTEL_TOLAPAI_0:
-                case PCI_DEVICE_ID_INTEL_TOLAPAI_0:
+        case PCI_DEVICE_ID_INTEL_ICH10_0:
-                case PCI_DEVICE_ID_INTEL_ICH10_0:
+        case PCI_DEVICE_ID_INTEL_ICH10_1:
-                case PCI_DEVICE_ID_INTEL_ICH10_1:
+        case PCI_DEVICE_ID_INTEL_ICH10_2:
-                case PCI_DEVICE_ID_INTEL_ICH10_2:
+        case PCI_DEVICE_ID_INTEL_ICH10_3:
-                case PCI_DEVICE_ID_INTEL_ICH10_3:
+                r->name = "PIIX/ICH";
-                        r->name = "PIIX/ICH";
+                r->get = pirq_piix_get;
-                        r->get = pirq_piix_get;
+                r->set = pirq_piix_set;
-                        r->set = pirq_piix_set;
+                return 1;
-                        return 1;
        }
        return 0;
 }
@@ -606,7 +605,7 @@ static __init int via_router_probe(struct irq_router *r,
         * workarounds for some buggy BIOSes
         */
        if (device == PCI_DEVICE_ID_VIA_82C586_0) {
-                switch(router->device) {
+                switch (router->device) {
                case PCI_DEVICE_ID_VIA_82C686:
                        /*
                         * Asus k7m bios wrongly reports 82C686A
@@ -631,7 +630,7 @@ static __init int via_router_probe(struct irq_router *r,
                }
        }
-        switch(device) {
+        switch (device) {
        case PCI_DEVICE_ID_VIA_82C586_0:
                r->name = "VIA";
                r->get = pirq_via586_get;
@@ -654,28 +653,27 @@ static __init int via_router_probe(struct irq_router *r,
 static __init int vlsi_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
 {
-        switch(device)
+        switch (device) {
-        {
+        case PCI_DEVICE_ID_VLSI_82C534:
-                case PCI_DEVICE_ID_VLSI_82C534:
+                r->name = "VLSI 82C534";
-                        r->name = "VLSI 82C534";
+                r->get = pirq_vlsi_get;
-                        r->get = pirq_vlsi_get;
+                r->set = pirq_vlsi_set;
-                        r->set = pirq_vlsi_set;
+                return 1;
-                        return 1;
        }
        return 0;
 }
-static __init int serverworks_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
+static __init int serverworks_router_probe(struct irq_router *r,
+                struct pci_dev *router, u16 device)
 {
-        switch(device)
+        switch (device) {
-        {
+        case PCI_DEVICE_ID_SERVERWORKS_OSB4:
-                case PCI_DEVICE_ID_SERVERWORKS_OSB4:
+        case PCI_DEVICE_ID_SERVERWORKS_CSB5:
-                case PCI_DEVICE_ID_SERVERWORKS_CSB5:
+                r->name = "ServerWorks";
-                        r->name = "ServerWorks";
+                r->get = pirq_serverworks_get;
-                        r->get = pirq_serverworks_get;
+                r->set = pirq_serverworks_set;
-                        r->set = pirq_serverworks_set;
+                return 1;
-                        return 1;
        }
        return 0;
 }
@@ -684,7 +682,7 @@ static __init int sis_router_probe(struct irq_router *r, struct pci_dev *router,
 {
        if (device != PCI_DEVICE_ID_SI_503)
                return 0;
-                
        r->name = "SIS";
        r->get = pirq_sis_get;
        r->set = pirq_sis_set;
@@ -693,47 +691,43 @@ static __init int sis_router_probe(struct irq_router *r, struct pci_dev *router,
 static __init int cyrix_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
 {
-        switch(device)
+        switch (device) {
-        {
+        case PCI_DEVICE_ID_CYRIX_5520:
-                case PCI_DEVICE_ID_CYRIX_5520:
+                r->name = "NatSemi";
-                        r->name = "NatSemi";
+                r->get = pirq_cyrix_get;
-                        r->get = pirq_cyrix_get;
+                r->set = pirq_cyrix_set;
-                        r->set = pirq_cyrix_set;
+                return 1;
-                        return 1;
        }
        return 0;
 }
 static __init int opti_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
 {
-        switch(device)
+        switch (device) {
-        {
+        case PCI_DEVICE_ID_OPTI_82C700:
-                case PCI_DEVICE_ID_OPTI_82C700:
+                r->name = "OPTI";
-                        r->name = "OPTI";
+                r->get = pirq_opti_get;
-                        r->get = pirq_opti_get;
+                r->set = pirq_opti_set;
-                        r->set = pirq_opti_set;
+                return 1;
-                        return 1;
        }
        return 0;
 }
 static __init int ite_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
 {
-        switch(device)
+        switch (device) {
-        {
+        case PCI_DEVICE_ID_ITE_IT8330G_0:
-                case PCI_DEVICE_ID_ITE_IT8330G_0:
+                r->name = "ITE";
-                        r->name = "ITE";
+                r->get = pirq_ite_get;
-                        r->get = pirq_ite_get;
+                r->set = pirq_ite_set;
-                        r->set = pirq_ite_set;
+                return 1;
-                        return 1;
        }
        return 0;
 }
 static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
 {
-        switch(device)
+        switch (device) {
-        {
        case PCI_DEVICE_ID_AL_M1533:
        case PCI_DEVICE_ID_AL_M1563:
                printk(KERN_DEBUG "PCI: Using ALI IRQ Router\n");
@@ -747,25 +741,24 @@ static __init int ali_router_probe(struct irq_router *r, struct pci_dev *router,
 static __init int amd_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
 {
-        switch(device)
+        switch (device) {
-        {
+        case PCI_DEVICE_ID_AMD_VIPER_740B:
-                case PCI_DEVICE_ID_AMD_VIPER_740B:
+                r->name = "AMD756";
-                        r->name = "AMD756";
+                break;
-                        break;
+        case PCI_DEVICE_ID_AMD_VIPER_7413:
-                case PCI_DEVICE_ID_AMD_VIPER_7413:
+                r->name = "AMD766";
-                        r->name = "AMD766";
+                break;
-                        break;
+        case PCI_DEVICE_ID_AMD_VIPER_7443:
-                case PCI_DEVICE_ID_AMD_VIPER_7443:
+                r->name = "AMD768";
-                        r->name = "AMD768";
+                break;
-                        break;
+        default:
-                default:
+                return 0;
-                        return 0;
        }
        r->get = pirq_amd756_get;
        r->set = pirq_amd756_set;
        return 1;
 }
-                
 static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
 {
        switch (device) {
@@ -807,7 +800,7 @@ static struct pci_dev *pirq_router_dev;
 *      FIXME: should we have an option to say "generic for
 *      chipset" ?
 */
- 
 static void __init pirq_find_router(struct irq_router *r)
 {
        struct irq_routing_table *rt = pirq_table;
@@ -826,7 +819,7 @@ static void __init pirq_find_router(struct irq_router *r)
        r->name = "default";
        r->get = NULL;
        r->set = NULL;
-        
        DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n",
            rt->rtr_vendor, rt->rtr_device);
@@ -837,12 +830,14 @@ static void __init pirq_find_router(struct irq_router *r)
                return;
        }
-        for( h = pirq_routers; h->vendor; h++) {
+        for (h = pirq_routers; h->vendor; h++) {
                /* First look for a router match */
-                if (rt->rtr_vendor == h->vendor && h->probe(r, pirq_router_dev, rt->rtr_device))
+                if (rt->rtr_vendor == h->vendor &&
+                        h->probe(r, pirq_router_dev, rt->rtr_device))
                        break;
                /* Fall back to a device match */
-                if (pirq_router_dev->vendor == h->vendor && h->probe(r, pirq_router_dev, pirq_router_dev->device))
+                if (pirq_router_dev->vendor == h->vendor &&
+                        h->probe(r, pirq_router_dev, pirq_router_dev->device))
                        break;
        }
        printk(KERN_INFO "PCI: Using IRQ router %s [%04x/%04x] at %s\n",
@@ -857,11 +852,13 @@ static void __init pirq_find_router(struct irq_router *r)
 static struct irq_info *pirq_get_info(struct pci_dev *dev)
 {
        struct irq_routing_table *rt = pirq_table;
-        int entries = (rt->size - sizeof(struct irq_routing_table)) / sizeof(struct irq_info);
+        int entries = (rt->size - sizeof(struct irq_routing_table)) /
+                sizeof(struct irq_info);
        struct irq_info *info;
        for (info = rt->slots; entries--; info++)
-                if (info->bus == dev->bus->number && PCI_SLOT(info->devfn) == PCI_SLOT(dev->devfn))
+                if (info->bus == dev->bus->number &&
+                        PCI_SLOT(info->devfn) == PCI_SLOT(dev->devfn))
                        return info;
        return NULL;
 }
@@ -889,7 +886,7 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
        if (!pirq_table)
                return 0;
-        
        DBG(KERN_DEBUG "IRQ for %s[%c]", pci_name(dev), 'A' + pin);
        info = pirq_get_info(dev);
        if (!info) {
@@ -902,7 +899,8 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
                DBG(" -> not routed\n" KERN_DEBUG);
                return 0;
        }
-        DBG(" -> PIRQ %02x, mask %04x, excl %04x", pirq, mask, pirq_table->exclusive_irqs);
+        DBG(" -> PIRQ %02x, mask %04x, excl %04x", pirq, mask,
+                pirq_table->exclusive_irqs);
        mask &= pcibios_irq_mask;
        /* Work around broken HP Pavilion Notebooks which assign USB to
@@ -915,7 +913,8 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
        }
        /* same for Acer Travelmate 360, but with CB and irq 11 -> 10 */
-        if (acer_tm360_irqrouting && dev->irq == 11 && dev->vendor == PCI_VENDOR_ID_O2) {
+        if (acer_tm360_irqrouting && dev->irq == 11 &&
+                dev->vendor == PCI_VENDOR_ID_O2) {
                pirq = 0x68;
                mask = 0x400;
                dev->irq = r->get(pirq_router_dev, dev, pirq);
@@ -928,17 +927,20 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
         */
        newirq = dev->irq;
        if (newirq && !((1 << newirq) & mask)) {
-                if ( pci_probe & PCI_USE_PIRQ_MASK) newirq = 0;
+                if (pci_probe & PCI_USE_PIRQ_MASK)
-                else printk("\n" KERN_WARNING
+                        newirq = 0;
-                        "PCI: IRQ %i for device %s doesn't match PIRQ mask "
+                else
-                        "- try pci=usepirqmask\n" KERN_DEBUG, newirq,
+                        printk("\n" KERN_WARNING
-                        pci_name(dev));
+                                "PCI: IRQ %i for device %s doesn't match PIRQ mask - try pci=usepirqmask\n"
+                                KERN_DEBUG, newirq,
+                                pci_name(dev));
        }
        if (!newirq && assign) {
                for (i = 0; i < 16; i++) {
                        if (!(mask & (1 << i)))
                                continue;
-                        if (pirq_penalty[i] < pirq_penalty[newirq] && can_request_irq(i, IRQF_SHARED))
+                        if (pirq_penalty[i] < pirq_penalty[newirq] &&
+                                can_request_irq(i, IRQF_SHARED))
                                newirq = i;
                }
        }
@@ -949,12 +951,13 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
                irq = pirq & 0xf;
                DBG(" -> hardcoded IRQ %d\n", irq);
                msg = "Hardcoded";
-        } else if ( r->get && (irq = r->get(pirq_router_dev, dev, pirq)) && \
+        } else if (r->get && (irq = r->get(pirq_router_dev, dev, pirq)) && \
-        ((!(pci_probe & PCI_USE_PIRQ_MASK)) || ((1 << irq) & mask)) ) {
+        ((!(pci_probe & PCI_USE_PIRQ_MASK)) || ((1 << irq) & mask))) {
                DBG(" -> got IRQ %d\n", irq);
                msg = "Found";
                eisa_set_level_irq(irq);
-        } else if (newirq && r->set && (dev->class >> 8) != PCI_CLASS_DISPLAY_VGA) {
+        } else if (newirq && r->set &&
+                (dev->class >> 8) != PCI_CLASS_DISPLAY_VGA) {
                DBG(" -> assigning IRQ %d", newirq);
                if (r->set(pirq_router_dev, dev, pirq, newirq)) {
                        eisa_set_level_irq(newirq);
@@ -972,7 +975,8 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
                } else
                        return 0;
        }
-        printk(KERN_INFO "PCI: %s IRQ %d for device %s\n", msg, irq, pci_name(dev));
+        printk(KERN_INFO "PCI: %s IRQ %d for device %s\n", msg, irq,
+                pci_name(dev));
        /* Update IRQ for all devices with the same pirq value */
        while ((dev2 = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev2)) != NULL) {
@@ -984,20 +988,25 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
                if (!info)
                        continue;
                if (info->irq[pin].link == pirq) {
-                        /* We refuse to override the dev->irq information. Give a warning! */
+                        /*
-                        if ( dev2->irq && dev2->irq != irq && \
+                         * We refuse to override the dev->irq
+                         * information. Give a warning!
+                         */
+                        if (dev2->irq && dev2->irq != irq && \
                        (!(pci_probe & PCI_USE_PIRQ_MASK) || \
-                        ((1 << dev2->irq) & mask)) ) {
+                        ((1 << dev2->irq) & mask))) {
 #ifndef CONFIG_PCI_MSI
-                                printk(KERN_INFO "IRQ routing conflict for %s, have irq %d, want irq %d\n",
+                                printk(KERN_INFO "IRQ routing conflict for %s, have irq %d, want irq %d\n",
                                       pci_name(dev2), dev2->irq, irq);
 #endif
-                                continue;
+                                continue;
-                        }
+                        }
                        dev2->irq = irq;
                        pirq_penalty[irq]++;
                        if (dev != dev2)
-                                printk(KERN_INFO "PCI: Sharing IRQ %d with %s\n", irq, pci_name(dev2));
+                                printk(KERN_INFO
+                                        "PCI: Sharing IRQ %d with %s\n",
+                                        irq, pci_name(dev2));
                }
        }
        return 1;
@@ -1011,15 +1020,21 @@ static void __init pcibios_fixup_irqs(void)
        DBG(KERN_DEBUG "PCI: IRQ fixup\n");
        while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
                /*
-                 * If the BIOS has set an out of range IRQ number, just ignore it.
+                 * If the BIOS has set an out of range IRQ number, just
-                 * Also keep track of which IRQ's are already in use.
+                 * ignore it.  Also keep track of which IRQ's are
+                 * already in use.
                 */
                if (dev->irq >= 16) {
-                        DBG(KERN_DEBUG "%s: ignoring bogus IRQ %d\n", pci_name(dev), dev->irq);
+                        DBG(KERN_DEBUG "%s: ignoring bogus IRQ %d\n",
+                                pci_name(dev), dev->irq);
                        dev->irq = 0;
                }
-                /* If the IRQ is already assigned to a PCI device, ignore its ISA use penalty */
+                /*
-                if (pirq_penalty[dev->irq] >= 100 && pirq_penalty[dev->irq] < 100000)
+                 * If the IRQ is already assigned to a PCI device,
+                 * ignore its ISA use penalty
+                 */
+                if (pirq_penalty[dev->irq] >= 100 &&
+                                pirq_penalty[dev->irq] < 100000)
                        pirq_penalty[dev->irq] = 0;
                pirq_penalty[dev->irq]++;
        }
@@ -1031,13 +1046,17 @@ static void __init pcibios_fixup_irqs(void)
                /*
                 * Recalculate IRQ numbers if we use the I/O APIC.
                 */
-                if (io_apic_assign_pci_irqs)
+                if (io_apic_assign_pci_irqs) {
-                {
                        int irq;
                        if (pin) {
-                                pin--;          /* interrupt pins are numbered starting from 1 */
+                                /*
-                                irq = IO_APIC_get_PCI_irq_vector(dev->bus->number, PCI_SLOT(dev->devfn), pin);
+                                 * interrupt pins are numbered starting
+                                 * from 1
+                                 */
+                                pin--;
+                                irq = IO_APIC_get_PCI_irq_vector(dev->bus->number,
+                                        PCI_SLOT(dev->devfn), pin);
        /*
         * Busses behind bridges are typically not listed in the MP-table.
         * In this case we have to look up the IRQ based on the parent bus,
@@ -1045,10 +1064,10 @@ static void __init pcibios_fixup_irqs(void)
         * busses itself so we should get into this branch reliably.
         */
                                if (irq < 0 && dev->bus->parent) { /* go back to the bridge */
-                                        struct pci_dev * bridge = dev->bus->self;
+                                        struct pci_dev *bridge = dev->bus->self;
                                        pin = (pin + PCI_SLOT(dev->devfn)) % 4;
-                                        irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, 
+                                        irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number,
                                                        PCI_SLOT(bridge->devfn), pin);
                                        if (irq >= 0)
                                                printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n",
@@ -1078,7 +1097,8 @@ static int __init fix_broken_hp_bios_irq9(const struct dmi_system_id *d)
 {
        if (!broken_hp_bios_irq9) {
                broken_hp_bios_irq9 = 1;
-                printk(KERN_INFO "%s detected - fixing broken IRQ routing\n", d->ident);
+                printk(KERN_INFO "%s detected - fixing broken IRQ routing\n",
+                        d->ident);
        }
        return 0;
 }
@@ -1091,7 +1111,8 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
 {
        if (!acer_tm360_irqrouting) {
                acer_tm360_irqrouting = 1;
-                printk(KERN_INFO "%s detected - fixing broken IRQ routing\n", d->ident);
+                printk(KERN_INFO "%s detected - fixing broken IRQ routing\n",
+                        d->ident);
        }
        return 0;
 }
@@ -1103,7 +1124,8 @@ static struct dmi_system_id __initdata pciirq_dmi_table[] = {
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
                        DMI_MATCH(DMI_BIOS_VERSION, "GE.M1.03"),
-                        DMI_MATCH(DMI_PRODUCT_VERSION, "HP Pavilion Notebook Model GE"),
+                        DMI_MATCH(DMI_PRODUCT_VERSION,
+                                "HP Pavilion Notebook Model GE"),
                        DMI_MATCH(DMI_BOARD_VERSION, "OmniBook N32N-736"),
                },
        },
@@ -1118,7 +1140,7 @@ static struct dmi_system_id __initdata pciirq_dmi_table[] = {
        { }
 };
-static int __init pcibios_irq_init(void)
+int __init pcibios_irq_init(void)
 {
        DBG(KERN_DEBUG "PCI: IRQ init\n");
@@ -1138,11 +1160,14 @@ static int __init pcibios_irq_init(void)
                pirq_find_router(&pirq_router);
                if (pirq_table->exclusive_irqs) {
                        int i;
-                        for (i=0; i<16; i++)
+                        for (i = 0; i < 16; i++)
                                if (!(pirq_table->exclusive_irqs & (1 << i)))
                                        pirq_penalty[i] += 100;
                }
-                /* If we're using the I/O APIC, avoid using the PCI IRQ routing table */
+                /*
+                 * If we're using the I/O APIC, avoid using the PCI IRQ
+                 * routing table
+                 */
                if (io_apic_assign_pci_irqs)
                        pirq_table = NULL;
        }
@@ -1153,9 +1178,6 @@ static int __init pcibios_irq_init(void)
        return 0;
 }
-subsys_initcall(pcibios_irq_init);
 static void pirq_penalize_isa_irq(int irq, int active)
 {
        /*
@@ -1189,7 +1211,7 @@ static int pirq_enable_irq(struct pci_dev *dev)
        if (pin && !pcibios_lookup_irq(dev, 1) && !dev->irq) {
                char *msg = "";
-                pin--;          /* interrupt pins are numbered starting from 1 */
+                pin--; /* interrupt pins are numbered starting from 1 */
                if (io_apic_assign_pci_irqs) {
                        int irq;
@@ -1203,19 +1225,22 @@ static int pirq_enable_irq(struct pci_dev *dev)
                         */
                        temp_dev = dev;
                        while (irq < 0 && dev->bus->parent) { /* go back to the bridge */
-                                struct pci_dev * bridge = dev->bus->self;
+                                struct pci_dev *bridge = dev->bus->self;
                                pin = (pin + PCI_SLOT(dev->devfn)) % 4;
-                                irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, 
+                                irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number,
                                                PCI_SLOT(bridge->devfn), pin);
                                if (irq >= 0)
-                                        printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n",
+                                        printk(KERN_WARNING
-                                                pci_name(bridge), 'A' + pin, irq);
+                                                "PCI: using PPB %s[%c] to get irq %d\n",
+                                                pci_name(bridge),
+                                                'A' + pin, irq);
                                dev = bridge;
                        }
                        dev = temp_dev;
                        if (irq >= 0) {
-                                printk(KERN_INFO "PCI->APIC IRQ transform: %s[%c] -> IRQ %d\n",
+                                printk(KERN_INFO
+                                        "PCI->APIC IRQ transform: %s[%c] -> IRQ %d\n",
                                        pci_name(dev), 'A' + pin, irq);
                                dev->irq = irq;
                                return 0;
@@ -1226,12 +1251,17 @@ static int pirq_enable_irq(struct pci_dev *dev)
                else
                        msg = " Please try using pci=biosirq.";
-                /* With IDE legacy devices the IRQ lookup failure is not a problem.. */
+                /*
-                if (dev->class >> 8 == PCI_CLASS_STORAGE_IDE && !(dev->class & 0x5))
+                 * With IDE legacy devices the IRQ lookup failure is not
+                 * a problem..
+                 */
+                if (dev->class >> 8 == PCI_CLASS_STORAGE_IDE &&
+                                !(dev->class & 0x5))
                        return 0;
-                printk(KERN_WARNING "PCI: No IRQ known for interrupt pin %c of device %s.%s\n",
+                printk(KERN_WARNING
-                       'A' + pin, pci_name(dev), msg);
+                        "PCI: No IRQ known for interrupt pin %c of device %s.%s\n",
+                        'A' + pin, pci_name(dev), msg);
        }
        return 0;
 }
diff --git a/arch/x86/pci/legacy.c b/arch/x86/pci/legacy.c
index a67921ce60af..ec9ce35e44d6 100644
--- a/arch/x86/pci/legacy.c
+++ b/arch/x86/pci/legacy.c
@@ -55,4 +55,21 @@ static int __init pci_legacy_init(void)
        return 0;
 }
-subsys_initcall(pci_legacy_init);
+int __init pci_subsys_init(void)
+{
+#ifdef CONFIG_X86_NUMAQ
+        pci_numaq_init();
+#endif
+#ifdef CONFIG_ACPI
+        pci_acpi_init();
+#endif
+#ifdef CONFIG_X86_VISWS
+        pci_visws_init();
+#endif
+        pci_legacy_init();
+        pcibios_irq_init();
+        pcibios_init();
+        return 0;
+}
+subsys_initcall(pci_subsys_init);
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 0cfebecf2a8f..23faaa890ffc 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -374,7 +374,7 @@ reject:
 static int __initdata known_bridge;
-void __init __pci_mmcfg_init(int early)
+static void __init __pci_mmcfg_init(int early)
 {
        /* MMCONFIG disabled */
        if ((pci_probe & PCI_PROBE_MMCONF) == 0)
diff --git a/arch/x86/pci/mp_bus_to_node.c b/arch/x86/pci/mp_bus_to_node.c
deleted file mode 100644
index 022943999b84..000000000000
--- a/arch/x86/pci/mp_bus_to_node.c
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <linux/pci.h>
-#include <linux/init.h>
-#include <linux/topology.h>
-#define BUS_NR 256
-static unsigned char mp_bus_to_node[BUS_NR];
-void set_mp_bus_to_node(int busnum, int node)
-{
-        if (busnum >= 0 &&  busnum < BUS_NR)
-        mp_bus_to_node[busnum] = (unsigned char) node;
-}
-int get_mp_bus_to_node(int busnum)
-{
-        int node;
-        if (busnum < 0 || busnum > (BUS_NR - 1))
-                return 0;
-        node = mp_bus_to_node[busnum];
-        return node;
-}
diff --git a/arch/x86/pci/numa.c b/arch/x86/pci/numaq_32.c
index d9afbae5092b..f4b16dc11dad 100644
--- a/arch/x86/pci/numa.c
+++ b/arch/x86/pci/numaq_32.c
@@ -1,50 +1,26 @@
 /*
- * numa.c - Low-level PCI access for NUMA-Q machines
+ * numaq_32.c - Low-level PCI access for NUMA-Q machines
 */
 #include <linux/pci.h>
 #include <linux/init.h>
 #include <linux/nodemask.h>
 #include <mach_apic.h>
+#include <asm/mpspec.h>
 #include "pci.h"
 #define XQUAD_PORTIO_BASE 0xfe400000
 #define XQUAD_PORTIO_QUAD 0x40000  /* 256k per quad. */
-int mp_bus_id_to_node[MAX_MP_BUSSES];
 #define BUS2QUAD(global) (mp_bus_id_to_node[global])
-int mp_bus_id_to_local[MAX_MP_BUSSES];
 #define BUS2LOCAL(global) (mp_bus_id_to_local[global])
-void mpc_oem_bus_info(struct mpc_config_bus *m, char *name,
-        struct mpc_config_translation *translation)
-{
-        int quad = translation->trans_quad;
-        int local = translation->trans_local;
-        mp_bus_id_to_node[m->mpc_busid] = quad;
-        mp_bus_id_to_local[m->mpc_busid] = local;
-        printk(KERN_INFO "Bus #%d is %s (node %d)\n",
-               m->mpc_busid, name, quad);
-}
-int quad_local_to_mp_bus_id [NR_CPUS/4][4];
 #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local])
-void mpc_oem_pci_bus(struct mpc_config_bus *m,
-        struct mpc_config_translation *translation)
-{
-        int quad = translation->trans_quad;
-        int local = translation->trans_local;
-        quad_local_to_mp_bus_id[quad][local] = m->mpc_busid;
-}
 /* Where the IO area was mapped on multiquad, always 0 otherwise */
 void *xquad_portio;
-#ifdef CONFIG_X86_NUMAQ
 EXPORT_SYMBOL(xquad_portio);
-#endif
 #define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port)
@@ -175,10 +151,13 @@ static void __devinit pci_fixup_i450nx(struct pci_dev *d)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82451NX, pci_fixup_i450nx);
-static int __init pci_numa_init(void)
+int __init pci_numaq_init(void)
 {
        int quad;
+        if (!found_numaq)
+                return 0;
        raw_pci_ops = &pci_direct_conf1_mq;
        if (pcibios_scanned++)
@@ -197,5 +176,3 @@ static int __init pci_numa_init(void)
                }
        return 0;
 }
-subsys_initcall(pci_numa_init);
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h
index 720c4c554534..15b9cf6be729 100644
--- a/arch/x86/pci/pci.h
+++ b/arch/x86/pci/pci.h
@@ -27,6 +27,8 @@
 #define PCI_CAN_SKIP_ISA_ALIGN  0x8000
 #define PCI_USE__CRS            0x10000
 #define PCI_CHECK_ENABLE_AMD_MMCONF     0x20000
+#define PCI_HAS_IO_ECS          0x40000
+#define PCI_NOASSIGN_ROMS       0x80000
 extern unsigned int pci_probe;
 extern unsigned long pirq_table_addr;
@@ -38,9 +40,6 @@ enum pci_bf_sort_state {
        pci_dmi_bf,
 };
-extern void __init dmi_check_pciprobe(void);
-extern void __init dmi_check_skip_isa_align(void);
 /* pci-i386.c */
 extern unsigned int pcibios_max_latency;
@@ -98,10 +97,20 @@ extern struct pci_raw_ops *raw_pci_ext_ops;
 extern struct pci_raw_ops pci_direct_conf1;
+/* arch_initcall level */
 extern int pci_direct_probe(void);
 extern void pci_direct_init(int type);
 extern void pci_pcbios_init(void);
 extern int pci_olpc_init(void);
+extern void __init dmi_check_pciprobe(void);
+extern void __init dmi_check_skip_isa_align(void);
+/* some common used subsys_initcalls */
+extern int __init pci_acpi_init(void);
+extern int __init pcibios_irq_init(void);
+extern int __init pci_visws_init(void);
+extern int __init pci_numaq_init(void);
+extern int __init pcibios_init(void);
 /* pci-mmconfig.c */
diff --git a/arch/x86/pci/visws.c b/arch/x86/pci/visws.c
index c2df4e97eed6..42f4cb19faca 100644
--- a/arch/x86/pci/visws.c
+++ b/arch/x86/pci/visws.c
@@ -8,18 +8,19 @@
 #include <linux/pci.h>
 #include <linux/init.h>
-#include "cobalt.h"
+#include <asm/setup.h>
-#include "lithium.h"
+#include <asm/visws/cobalt.h>
+#include <asm/visws/lithium.h>
 #include "pci.h"
 static int pci_visws_enable_irq(struct pci_dev *dev) { return 0; }
 static void pci_visws_disable_irq(struct pci_dev *dev) { }
-int (*pcibios_enable_irq)(struct pci_dev *dev) = &pci_visws_enable_irq;
+/* int (*pcibios_enable_irq)(struct pci_dev *dev) = &pci_visws_enable_irq; */
-void (*pcibios_disable_irq)(struct pci_dev *dev) = &pci_visws_disable_irq;
+/* void (*pcibios_disable_irq)(struct pci_dev *dev) = &pci_visws_disable_irq; */
-void __init pcibios_penalize_isa_irq(int irq, int active) {}
+/* void __init pcibios_penalize_isa_irq(int irq, int active) {} */
 unsigned int pci_bus0, pci_bus1;
@@ -85,8 +86,14 @@ void __init pcibios_update_irq(struct pci_dev *dev, int irq)
        pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
 }
-static int __init pcibios_init(void)
+int __init pci_visws_init(void)
 {
+        if (!is_visws_box())
+                return -1;
+        pcibios_enable_irq = &pci_visws_enable_irq;
+        pcibios_disable_irq = &pci_visws_disable_irq;
        /* The VISWS supports configuration access type 1 only */
        pci_probe = (pci_probe | PCI_PROBE_CONF1) &
                    ~(PCI_PROBE_BIOS | PCI_PROBE_CONF2);
@@ -104,5 +111,3 @@ static int __init pcibios_init(void)
        pcibios_resource_survey();
        return 0;
 }
-subsys_initcall(pcibios_init);