Merge branch 'x86/core' into x86/unify-pci

10 files changed, 201 insertions, 183 deletions

diff --git a/arch/x86/pci/Makefile_32 b/arch/x86/pci/Makefile_32
index 89ec35d00efd..a34fbf557926 100644
--- a/arch/x86/pci/Makefile_32
+++ b/arch/x86/pci/Makefile_32
@@ -13,12 +13,14 @@ pci-y				:= fixup.o
 pci-$(CONFIG_ACPI)              += acpi.o
 pci-y                           += legacy.o irq.o
 
-# Careful: VISWS and NUMAQ overrule the pci-y above. The colons are
+# Careful: VISWS 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
+
+pci-$(CONFIG_X86_NUMAQ)         += numa.o
 
 # Necessary for NUMAQ as well
 pci-$(CONFIG_NUMA)              += mp_bus_to_node.o
 
 obj-y                           += $(pci-y) common.o early.o
+obj-y                           += amd_bus.o
diff --git a/arch/x86/pci/Makefile_64 b/arch/x86/pci/Makefile_64
index 8fbd19832cf6..fd47068c95de 100644
--- a/arch/x86/pci/Makefile_64
+++ b/arch/x86/pci/Makefile_64
@@ -13,5 +13,5 @@ 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
+obj-y           += amd_bus.o
 
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index d95de2f199cd..4fa52d3dc848 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,21 +207,22 @@ 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;
 static int __init pci_acpi_init(void)
 {
         struct pci_dev *dev = NULL;
diff --git a/arch/x86/pci/k8-bus_64.c b/arch/x86/pci/amd_bus.c
index 5c2799c20e47..d02c598451ec 100644
--- a/arch/x86/pci/k8-bus_64.c
+++ b/arch/x86/pci/amd_bus.c
@@ -1,5 +1,9 @@
 #include <linux/init.h>
 #include <linux/pci.h>
+#include "pci.h"
+
+#ifdef CONFIG_X86_64
+
 #include <asm/pci-direct.h>
 #include <asm/mpspec.h>
 #include <linux/cpumask.h>
@@ -384,7 +388,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 +482,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 +530,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, 1);
+        pci_probe |= PCI_HAS_IO_ECS;
+        return 0;
+}
+
+postcore_initcall(enable_pci_io_ecs);
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
-                raw_pci_ops = &pci_direct_conf2;
+                if (raw_pci_ext_ops)
+                        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/i386.c b/arch/x86/pci/i386.c
index 10fb308fded8..6ccd7a108cd4 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
diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index ca8df9c260bc..f0859de23e20 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 <asm/smp.h>
+#include <linux/io.h>
+#include <linux/smp.h>
 #include <asm/io_apic.h>
 #include <linux/irq.h>
 #include <linux/acpi.h>
@@ -61,7 +61,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,7 +74,7 @@ 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);
@@ -100,7 +100,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 +122,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;
@@ -285,7 +285,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 +314,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 +350,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 +370,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
@@ -487,9 +487,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 +495,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 +545,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)
-        {
-                case PCI_DEVICE_ID_INTEL_82371FB_0:
-                case PCI_DEVICE_ID_INTEL_82371SB_0:
-                case PCI_DEVICE_ID_INTEL_82371AB_0:
-                case PCI_DEVICE_ID_INTEL_82371MX:
-                case PCI_DEVICE_ID_INTEL_82443MX_0:
-                case PCI_DEVICE_ID_INTEL_82801AA_0:
-                case PCI_DEVICE_ID_INTEL_82801AB_0:
-                case PCI_DEVICE_ID_INTEL_82801BA_0:
-                case PCI_DEVICE_ID_INTEL_82801BA_10:
-                case PCI_DEVICE_ID_INTEL_82801CA_0:
-                case PCI_DEVICE_ID_INTEL_82801CA_12:
-                case PCI_DEVICE_ID_INTEL_82801DB_0:
-                case PCI_DEVICE_ID_INTEL_82801E_0:
-                case PCI_DEVICE_ID_INTEL_82801EB_0:
-                case PCI_DEVICE_ID_INTEL_ESB_1:
-                case PCI_DEVICE_ID_INTEL_ICH6_0:
-                case PCI_DEVICE_ID_INTEL_ICH6_1:
-                case PCI_DEVICE_ID_INTEL_ICH7_0:
-                case PCI_DEVICE_ID_INTEL_ICH7_1:
-                case PCI_DEVICE_ID_INTEL_ICH7_30:
-                case PCI_DEVICE_ID_INTEL_ICH7_31:
-                case PCI_DEVICE_ID_INTEL_ESB2_0:
-                case PCI_DEVICE_ID_INTEL_ICH8_0:
-                case PCI_DEVICE_ID_INTEL_ICH8_1:
-                case PCI_DEVICE_ID_INTEL_ICH8_2:
-                case PCI_DEVICE_ID_INTEL_ICH8_3:
-                case PCI_DEVICE_ID_INTEL_ICH8_4:
-                case PCI_DEVICE_ID_INTEL_ICH9_0:
-                case PCI_DEVICE_ID_INTEL_ICH9_1:
-                case PCI_DEVICE_ID_INTEL_ICH9_2:
-                case PCI_DEVICE_ID_INTEL_ICH9_3:
-                case PCI_DEVICE_ID_INTEL_ICH9_4:
-                case PCI_DEVICE_ID_INTEL_ICH9_5:
-                case PCI_DEVICE_ID_INTEL_TOLAPAI_0:
-                case PCI_DEVICE_ID_INTEL_ICH10_0:
-                case PCI_DEVICE_ID_INTEL_ICH10_1:
-                case PCI_DEVICE_ID_INTEL_ICH10_2:
-                case PCI_DEVICE_ID_INTEL_ICH10_3:
-                        r->name = "PIIX/ICH";
-                        r->get = pirq_piix_get;
-                        r->set = pirq_piix_set;
-                        return 1;
+        switch (device) {
+        case PCI_DEVICE_ID_INTEL_82371FB_0:
+        case PCI_DEVICE_ID_INTEL_82371SB_0:
+        case PCI_DEVICE_ID_INTEL_82371AB_0:
+        case PCI_DEVICE_ID_INTEL_82371MX:
+        case PCI_DEVICE_ID_INTEL_82443MX_0:
+        case PCI_DEVICE_ID_INTEL_82801AA_0:
+        case PCI_DEVICE_ID_INTEL_82801AB_0:
+        case PCI_DEVICE_ID_INTEL_82801BA_0:
+        case PCI_DEVICE_ID_INTEL_82801BA_10:
+        case PCI_DEVICE_ID_INTEL_82801CA_0:
+        case PCI_DEVICE_ID_INTEL_82801CA_12:
+        case PCI_DEVICE_ID_INTEL_82801DB_0:
+        case PCI_DEVICE_ID_INTEL_82801E_0:
+        case PCI_DEVICE_ID_INTEL_82801EB_0:
+        case PCI_DEVICE_ID_INTEL_ESB_1:
+        case PCI_DEVICE_ID_INTEL_ICH6_0:
+        case PCI_DEVICE_ID_INTEL_ICH6_1:
+        case PCI_DEVICE_ID_INTEL_ICH7_0:
+        case PCI_DEVICE_ID_INTEL_ICH7_1:
+        case PCI_DEVICE_ID_INTEL_ICH7_30:
+        case PCI_DEVICE_ID_INTEL_ICH7_31:
+        case PCI_DEVICE_ID_INTEL_ESB2_0:
+        case PCI_DEVICE_ID_INTEL_ICH8_0:
+        case PCI_DEVICE_ID_INTEL_ICH8_1:
+        case PCI_DEVICE_ID_INTEL_ICH8_2:
+        case PCI_DEVICE_ID_INTEL_ICH8_3:
+        case PCI_DEVICE_ID_INTEL_ICH8_4:
+        case PCI_DEVICE_ID_INTEL_ICH9_0:
+        case PCI_DEVICE_ID_INTEL_ICH9_1:
+        case PCI_DEVICE_ID_INTEL_ICH9_2:
+        case PCI_DEVICE_ID_INTEL_ICH9_3:
+        case PCI_DEVICE_ID_INTEL_ICH9_4:
+        case PCI_DEVICE_ID_INTEL_ICH9_5:
+        case PCI_DEVICE_ID_INTEL_TOLAPAI_0:
+        case PCI_DEVICE_ID_INTEL_ICH10_0:
+        case PCI_DEVICE_ID_INTEL_ICH10_1:
+        case PCI_DEVICE_ID_INTEL_ICH10_2:
+        case PCI_DEVICE_ID_INTEL_ICH10_3:
+                r->name = "PIIX/ICH";
+                r->get = pirq_piix_get;
+                r->set = pirq_piix_set;
+                return 1;
         }
         return 0;
 }
@@ -606,7 +601,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 +626,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,13 +649,12 @@ 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)
-        {
-                case PCI_DEVICE_ID_VLSI_82C534:
-                        r->name = "VLSI 82C534";
-                        r->get = pirq_vlsi_get;
-                        r->set = pirq_vlsi_set;
-                        return 1;
+        switch (device) {
+        case PCI_DEVICE_ID_VLSI_82C534:
+                r->name = "VLSI 82C534";
+                r->get = pirq_vlsi_get;
+                r->set = pirq_vlsi_set;
+                return 1;
         }
         return 0;
 }
@@ -668,14 +662,13 @@ static __init int vlsi_router_probe(struct irq_router *r, struct pci_dev *router
 
 static __init int serverworks_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
 {
-        switch(device)
-        {
-                case PCI_DEVICE_ID_SERVERWORKS_OSB4:
-                case PCI_DEVICE_ID_SERVERWORKS_CSB5:
-                        r->name = "ServerWorks";
-                        r->get = pirq_serverworks_get;
-                        r->set = pirq_serverworks_set;
-                        return 1;
+        switch (device) {
+        case PCI_DEVICE_ID_SERVERWORKS_OSB4:
+        case PCI_DEVICE_ID_SERVERWORKS_CSB5:
+                r->name = "ServerWorks";
+                r->get = pirq_serverworks_get;
+                r->set = pirq_serverworks_set;
+                return 1;
         }
         return 0;
 }
@@ -684,7 +677,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 +686,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)
-        {
-                case PCI_DEVICE_ID_CYRIX_5520:
-                        r->name = "NatSemi";
-                        r->get = pirq_cyrix_get;
-                        r->set = pirq_cyrix_set;
-                        return 1;
+        switch (device) {
+        case PCI_DEVICE_ID_CYRIX_5520:
+                r->name = "NatSemi";
+                r->get = pirq_cyrix_get;
+                r->set = pirq_cyrix_set;
+                return 1;
         }
         return 0;
 }
 
 static __init int opti_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
 {
-        switch(device)
-        {
-                case PCI_DEVICE_ID_OPTI_82C700:
-                        r->name = "OPTI";
-                        r->get = pirq_opti_get;
-                        r->set = pirq_opti_set;
-                        return 1;
+        switch (device) {
+        case PCI_DEVICE_ID_OPTI_82C700:
+                r->name = "OPTI";
+                r->get = pirq_opti_get;
+                r->set = pirq_opti_set;
+                return 1;
         }
         return 0;
 }
 
 static __init int ite_router_probe(struct irq_router *r, struct pci_dev *router, u16 device)
 {
-        switch(device)
-        {
-                case PCI_DEVICE_ID_ITE_IT8330G_0:
-                        r->name = "ITE";
-                        r->get = pirq_ite_get;
-                        r->set = pirq_ite_set;
-                        return 1;
+        switch (device) {
+        case PCI_DEVICE_ID_ITE_IT8330G_0:
+                r->name = "ITE";
+                r->get = pirq_ite_get;
+                r->set = pirq_ite_set;
+                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 +736,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)
-        {
-                case PCI_DEVICE_ID_AMD_VIPER_740B:
-                        r->name = "AMD756";
-                        break;
-                case PCI_DEVICE_ID_AMD_VIPER_7413:
-                        r->name = "AMD766";
-                        break;
-                case PCI_DEVICE_ID_AMD_VIPER_7443:
-                        r->name = "AMD768";
-                        break;
-                default:
-                        return 0;
+        switch (device) {
+        case PCI_DEVICE_ID_AMD_VIPER_740B:
+                r->name = "AMD756";
+                break;
+        case PCI_DEVICE_ID_AMD_VIPER_7413:
+                r->name = "AMD766";
+                break;
+        case PCI_DEVICE_ID_AMD_VIPER_7443:
+                r->name = "AMD768";
+                break;
+        default:
+                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 +795,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 +814,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,7 +825,7 @@ 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))
                         break;
@@ -889,7 +877,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) {
@@ -928,8 +916,10 @@ 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;
-                else printk("\n" KERN_WARNING
+                if (pci_probe & PCI_USE_PIRQ_MASK)
+                        newirq = 0;
+                else
+                        printk("\n" KERN_WARNING
                         "PCI: IRQ %i for device %s doesn't match PIRQ mask "
                         "- try pci=usepirqmask\n" KERN_DEBUG, newirq,
                         pci_name(dev));
@@ -949,8 +939,8 @@ 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)) && \
-        ((!(pci_probe & PCI_USE_PIRQ_MASK)) || ((1 << irq) & mask)) ) {
+        } else if (r->get && (irq = r->get(pirq_router_dev, dev, pirq)) && \
+        ((!(pci_probe & PCI_USE_PIRQ_MASK)) || ((1 << irq) & mask))) {
                 DBG(" -> got IRQ %d\n", irq);
                 msg = "Found";
                 eisa_set_level_irq(irq);
@@ -985,15 +975,15 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
                         continue;
                 if (info->irq[pin].link == pirq) {
                         /* We refuse to override the dev->irq information. Give a warning! */
-                        if ( dev2->irq && dev2->irq != irq && \
+                        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)
@@ -1031,8 +1021,7 @@ 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) {
@@ -1045,10 +1034,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",
@@ -1138,7 +1127,7 @@ 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;
                 }
@@ -1203,10 +1192,10 @@ 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",
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/numa.c b/arch/x86/pci/numa.c
index d9afbae5092b..99f1ecd485b5 100644
--- a/arch/x86/pci/numa.c
+++ b/arch/x86/pci/numa.c
@@ -6,45 +6,21 @@
 #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)
 
@@ -179,6 +155,9 @@ static int __init pci_numa_init(void)
 {
         int quad;
 
+        if (!found_numaq)
+                return 0;
+
         raw_pci_ops = &pci_direct_conf1_mq;
 
         if (pcibios_scanned++)
diff --git a/arch/x86/pci/pci.h b/arch/x86/pci/pci.h
index 720c4c554534..ba263e626a68 100644
--- a/arch/x86/pci/pci.h
+++ b/arch/x86/pci/pci.h
@@ -27,6 +27,7 @@
 #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
 
 extern unsigned int pci_probe;
 extern unsigned long pirq_table_addr;