Pull test into release branch

6 files changed, 463 insertions, 206 deletions

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 29f05d4b68cd..9197d7b361b3 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -55,7 +55,7 @@
 
 #define BAD_MADT_ENTRY(entry, end) (                                        \
                 (!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
-                ((acpi_table_entry_header *)entry)->length < sizeof(*entry))
+                ((struct acpi_subtable_header *)entry)->length < sizeof(*entry))
 
 #define PREFIX                  "ACPI: "
 
@@ -67,16 +67,11 @@ EXPORT_SYMBOL(pm_power_off);
 unsigned int acpi_cpei_override;
 unsigned int acpi_cpei_phys_cpuid;
 
-#define MAX_SAPICS 256
-u16 ia64_acpiid_to_sapicid[MAX_SAPICS] = {[0 ... MAX_SAPICS - 1] = -1 };
-
-EXPORT_SYMBOL(ia64_acpiid_to_sapicid);
-
 const char *acpi_get_sysname(void)
 {
 #ifdef CONFIG_IA64_GENERIC
         unsigned long rsdp_phys;
-        struct acpi20_table_rsdp *rsdp;
+        struct acpi_table_rsdp *rsdp;
         struct acpi_table_xsdt *xsdt;
         struct acpi_table_header *hdr;
 
@@ -87,16 +82,16 @@ const char *acpi_get_sysname(void)
                 return "dig";
         }
 
-        rsdp = (struct acpi20_table_rsdp *)__va(rsdp_phys);
-        if (strncmp(rsdp->signature, RSDP_SIG, sizeof(RSDP_SIG) - 1)) {
+        rsdp = (struct acpi_table_rsdp *)__va(rsdp_phys);
+        if (strncmp(rsdp->signature, ACPI_SIG_RSDP, sizeof(ACPI_SIG_RSDP) - 1)) {
                 printk(KERN_ERR
                        "ACPI 2.0 RSDP signature incorrect, default to \"dig\"\n");
                 return "dig";
         }
 
-        xsdt = (struct acpi_table_xsdt *)__va(rsdp->xsdt_address);
+        xsdt = (struct acpi_table_xsdt *)__va(rsdp->xsdt_physical_address);
         hdr = &xsdt->header;
-        if (strncmp(hdr->signature, XSDT_SIG, sizeof(XSDT_SIG) - 1)) {
+        if (strncmp(hdr->signature, ACPI_SIG_XSDT, sizeof(ACPI_SIG_XSDT) - 1)) {
                 printk(KERN_ERR
                        "ACPI 2.0 XSDT signature incorrect, default to \"dig\"\n");
                 return "dig";
@@ -169,12 +164,12 @@ struct acpi_table_madt *acpi_madt __initdata;
 static u8 has_8259;
 
 static int __init
-acpi_parse_lapic_addr_ovr(acpi_table_entry_header * header,
+acpi_parse_lapic_addr_ovr(struct acpi_subtable_header * header,
                           const unsigned long end)
 {
-        struct acpi_table_lapic_addr_ovr *lapic;
+        struct acpi_madt_local_apic_override *lapic;
 
-        lapic = (struct acpi_table_lapic_addr_ovr *)header;
+        lapic = (struct acpi_madt_local_apic_override *)header;
 
         if (BAD_MADT_ENTRY(lapic, end))
                 return -EINVAL;
@@ -187,22 +182,19 @@ acpi_parse_lapic_addr_ovr(acpi_table_entry_header * header,
 }
 
 static int __init
-acpi_parse_lsapic(acpi_table_entry_header * header, const unsigned long end)
+acpi_parse_lsapic(struct acpi_subtable_header * header, const unsigned long end)
 {
-        struct acpi_table_lsapic *lsapic;
+        struct acpi_madt_local_sapic *lsapic;
 
-        lsapic = (struct acpi_table_lsapic *)header;
+        lsapic = (struct acpi_madt_local_sapic *)header;
 
-        if (BAD_MADT_ENTRY(lsapic, end))
-                return -EINVAL;
+        /*Skip BAD_MADT_ENTRY check, as lsapic size could vary */
 
-        if (lsapic->flags.enabled) {
+        if (lsapic->lapic_flags & ACPI_MADT_ENABLED) {
 #ifdef CONFIG_SMP
                 smp_boot_data.cpu_phys_id[available_cpus] =
                     (lsapic->id << 8) | lsapic->eid;
 #endif
-                ia64_acpiid_to_sapicid[lsapic->acpi_id] =
-                    (lsapic->id << 8) | lsapic->eid;
                 ++available_cpus;
         }
 
@@ -211,11 +203,11 @@ acpi_parse_lsapic(acpi_table_entry_header * header, const unsigned long end)
 }
 
 static int __init
-acpi_parse_lapic_nmi(acpi_table_entry_header * header, const unsigned long end)
+acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long end)
 {
-        struct acpi_table_lapic_nmi *lacpi_nmi;
+        struct acpi_madt_local_apic_nmi *lacpi_nmi;
 
-        lacpi_nmi = (struct acpi_table_lapic_nmi *)header;
+        lacpi_nmi = (struct acpi_madt_local_apic_nmi *)header;
 
         if (BAD_MADT_ENTRY(lacpi_nmi, end))
                 return -EINVAL;
@@ -225,11 +217,11 @@ acpi_parse_lapic_nmi(acpi_table_entry_header * header, const unsigned long end)
 }
 
 static int __init
-acpi_parse_iosapic(acpi_table_entry_header * header, const unsigned long end)
+acpi_parse_iosapic(struct acpi_subtable_header * header, const unsigned long end)
 {
-        struct acpi_table_iosapic *iosapic;
+        struct acpi_madt_io_sapic *iosapic;
 
-        iosapic = (struct acpi_table_iosapic *)header;
+        iosapic = (struct acpi_madt_io_sapic *)header;
 
         if (BAD_MADT_ENTRY(iosapic, end))
                 return -EINVAL;
@@ -240,13 +232,13 @@ acpi_parse_iosapic(acpi_table_entry_header * header, const unsigned long end)
 static unsigned int __initdata acpi_madt_rev;
 
 static int __init
-acpi_parse_plat_int_src(acpi_table_entry_header * header,
+acpi_parse_plat_int_src(struct acpi_subtable_header * header,
                         const unsigned long end)
 {
-        struct acpi_table_plat_int_src *plintsrc;
+        struct acpi_madt_interrupt_source *plintsrc;
         int vector;
 
-        plintsrc = (struct acpi_table_plat_int_src *)header;
+        plintsrc = (struct acpi_madt_interrupt_source *)header;
 
         if (BAD_MADT_ENTRY(plintsrc, end))
                 return -EINVAL;
@@ -257,19 +249,19 @@ acpi_parse_plat_int_src(acpi_table_entry_header * header,
          */
         vector = iosapic_register_platform_intr(plintsrc->type,
                                                 plintsrc->global_irq,
-                                                plintsrc->iosapic_vector,
+                                                plintsrc->io_sapic_vector,
                                                 plintsrc->eid,
                                                 plintsrc->id,
-                                                (plintsrc->flags.polarity ==
-                                                 1) ? IOSAPIC_POL_HIGH :
-                                                IOSAPIC_POL_LOW,
-                                                (plintsrc->flags.trigger ==
-                                                 1) ? IOSAPIC_EDGE :
-                                                IOSAPIC_LEVEL);
+                                                ((plintsrc->inti_flags & ACPI_MADT_POLARITY_MASK) ==
+                                                 ACPI_MADT_POLARITY_ACTIVE_HIGH) ?
+                                                IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,
+                                                ((plintsrc->inti_flags & ACPI_MADT_TRIGGER_MASK) ==
+                                                 ACPI_MADT_TRIGGER_EDGE) ?
+                                                IOSAPIC_EDGE : IOSAPIC_LEVEL);
 
         platform_intr_list[plintsrc->type] = vector;
         if (acpi_madt_rev > 1) {
-                acpi_cpei_override = plintsrc->plint_flags.cpei_override_flag;
+                acpi_cpei_override = plintsrc->flags & ACPI_MADT_CPEI_OVERRIDE;
         }
 
         /*
@@ -324,30 +316,32 @@ unsigned int get_cpei_target_cpu(void)
 }
 
 static int __init
-acpi_parse_int_src_ovr(acpi_table_entry_header * header,
+acpi_parse_int_src_ovr(struct acpi_subtable_header * header,
                        const unsigned long end)
 {
-        struct acpi_table_int_src_ovr *p;
+        struct acpi_madt_interrupt_override *p;
 
-        p = (struct acpi_table_int_src_ovr *)header;
+        p = (struct acpi_madt_interrupt_override *)header;
 
         if (BAD_MADT_ENTRY(p, end))
                 return -EINVAL;
 
-        iosapic_override_isa_irq(p->bus_irq, p->global_irq,
-                                 (p->flags.polarity ==
-                                  1) ? IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,
-                                 (p->flags.trigger ==
-                                  1) ? IOSAPIC_EDGE : IOSAPIC_LEVEL);
+        iosapic_override_isa_irq(p->source_irq, p->global_irq,
+                                 ((p->inti_flags & ACPI_MADT_POLARITY_MASK) ==
+                                  ACPI_MADT_POLARITY_ACTIVE_HIGH) ?
+                                 IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,
+                                 ((p->inti_flags & ACPI_MADT_TRIGGER_MASK) ==
+                                 ACPI_MADT_TRIGGER_EDGE) ?
+                                 IOSAPIC_EDGE : IOSAPIC_LEVEL);
         return 0;
 }
 
 static int __init
-acpi_parse_nmi_src(acpi_table_entry_header * header, const unsigned long end)
+acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end)
 {
-        struct acpi_table_nmi_src *nmi_src;
+        struct acpi_madt_nmi_source *nmi_src;
 
-        nmi_src = (struct acpi_table_nmi_src *)header;
+        nmi_src = (struct acpi_madt_nmi_source *)header;
 
         if (BAD_MADT_ENTRY(nmi_src, end))
                 return -EINVAL;
@@ -371,12 +365,12 @@ static void __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
         }
 }
 
-static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size)
+static int __init acpi_parse_madt(struct acpi_table_header *table)
 {
-        if (!phys_addr || !size)
+        if (!table)
                 return -EINVAL;
 
-        acpi_madt = (struct acpi_table_madt *)__va(phys_addr);
+        acpi_madt = (struct acpi_table_madt *)table;
 
         acpi_madt_rev = acpi_madt->header.revision;
 
@@ -384,14 +378,14 @@ static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size)
 #ifdef CONFIG_ITANIUM
         has_8259 = 1;           /* Firmware on old Itanium systems is broken */
 #else
-        has_8259 = acpi_madt->flags.pcat_compat;
+        has_8259 = acpi_madt->flags & ACPI_MADT_PCAT_COMPAT;
 #endif
         iosapic_system_init(has_8259);
 
         /* Get base address of IPI Message Block */
 
-        if (acpi_madt->lapic_address)
-                ipi_base_addr = ioremap(acpi_madt->lapic_address, 0);
+        if (acpi_madt->address)
+                ipi_base_addr = ioremap(acpi_madt->address, 0);
 
         printk(KERN_INFO PREFIX "Local APIC address %p\n", ipi_base_addr);
 
@@ -413,23 +407,24 @@ static u32 __devinitdata pxm_flag[PXM_FLAG_LEN];
 #define pxm_bit_test(bit)       (test_bit(bit,(void *)pxm_flag))
 static struct acpi_table_slit __initdata *slit_table;
 
-static int get_processor_proximity_domain(struct acpi_table_processor_affinity *pa)
+static int get_processor_proximity_domain(struct acpi_srat_cpu_affinity *pa)
 {
         int pxm;
 
-        pxm = pa->proximity_domain;
+        pxm = pa->proximity_domain_lo;
         if (ia64_platform_is("sn2"))
-                pxm += pa->reserved[0] << 8;
+                pxm += pa->proximity_domain_hi[0] << 8;
         return pxm;
 }
 
-static int get_memory_proximity_domain(struct acpi_table_memory_affinity *ma)
+static int get_memory_proximity_domain(struct acpi_srat_mem_affinity *ma)
 {
         int pxm;
 
         pxm = ma->proximity_domain;
-        if (ia64_platform_is("sn2"))
-                pxm += ma->reserved1[0] << 8;
+        if (!ia64_platform_is("sn2"))
+                pxm &= 0xff;
+
         return pxm;
 }
 
@@ -442,7 +437,7 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
         u32 len;
 
         len = sizeof(struct acpi_table_header) + 8
-            + slit->localities * slit->localities;
+            + slit->locality_count * slit->locality_count;
         if (slit->header.length != len) {
                 printk(KERN_ERR
                        "ACPI 2.0 SLIT: size mismatch: %d expected, %d actual\n",
@@ -454,11 +449,11 @@ void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
 }
 
 void __init
-acpi_numa_processor_affinity_init(struct acpi_table_processor_affinity *pa)
+acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
 {
         int pxm;
 
-        if (!pa->flags.enabled)
+        if (!(pa->flags & ACPI_SRAT_CPU_ENABLED))
                 return;
 
         pxm = get_processor_proximity_domain(pa);
@@ -467,14 +462,14 @@ acpi_numa_processor_affinity_init(struct acpi_table_processor_affinity *pa)
         pxm_bit_set(pxm);
 
         node_cpuid[srat_num_cpus].phys_id =
-            (pa->apic_id << 8) | (pa->lsapic_eid);
+            (pa->apic_id << 8) | (pa->local_sapic_eid);
         /* nid should be overridden as logical node id later */
         node_cpuid[srat_num_cpus].nid = pxm;
         srat_num_cpus++;
 }
 
 void __init
-acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
+acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
 {
         unsigned long paddr, size;
         int pxm;
@@ -483,13 +478,11 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
         pxm = get_memory_proximity_domain(ma);
 
         /* fill node memory chunk structure */
-        paddr = ma->base_addr_hi;
-        paddr = (paddr << 32) | ma->base_addr_lo;
-        size = ma->length_hi;
-        size = (size << 32) | ma->length_lo;
+        paddr = ma->base_address;
+        size = ma->length;
 
         /* Ignore disabled entries */
-        if (!ma->flags.enabled)
+        if (!(ma->flags & ACPI_SRAT_MEM_ENABLED))
                 return;
 
         /* record this node in proximity bitmap */
@@ -560,16 +553,16 @@ void __init acpi_numa_arch_fixup(void)
         if (!slit_table)
                 return;
         memset(numa_slit, -1, sizeof(numa_slit));
-        for (i = 0; i < slit_table->localities; i++) {
+        for (i = 0; i < slit_table->locality_count; i++) {
                 if (!pxm_bit_test(i))
                         continue;
                 node_from = pxm_to_node(i);
-                for (j = 0; j < slit_table->localities; j++) {
+                for (j = 0; j < slit_table->locality_count; j++) {
                         if (!pxm_bit_test(j))
                                 continue;
                         node_to = pxm_to_node(j);
                         node_distance(node_from, node_to) =
-                            slit_table->entry[i * slit_table->localities + j];
+                            slit_table->entry[i * slit_table->locality_count + j];
                 }
         }
 
@@ -617,21 +610,21 @@ void acpi_unregister_gsi(u32 gsi)
 
 EXPORT_SYMBOL(acpi_unregister_gsi);
 
-static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size)
+static int __init acpi_parse_fadt(struct acpi_table_header *table)
 {
         struct acpi_table_header *fadt_header;
-        struct fadt_descriptor *fadt;
+        struct acpi_table_fadt *fadt;
 
-        if (!phys_addr || !size)
+        if (!table)
                 return -EINVAL;
 
-        fadt_header = (struct acpi_table_header *)__va(phys_addr);
+        fadt_header = (struct acpi_table_header *)table;
         if (fadt_header->revision != 3)
                 return -ENODEV; /* Only deal with ACPI 2.0 FADT */
 
-        fadt = (struct fadt_descriptor *)fadt_header;
+        fadt = (struct acpi_table_fadt *)fadt_header;
 
-        acpi_register_gsi(fadt->sci_int, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW);
+        acpi_register_gsi(fadt->sci_interrupt, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW);
         return 0;
 }
 
@@ -658,7 +651,7 @@ int __init acpi_boot_init(void)
          * information -- the successor to MPS tables.
          */
 
-        if (acpi_table_parse(ACPI_APIC, acpi_parse_madt) < 1) {
+        if (acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt) < 1) {
                 printk(KERN_ERR PREFIX "Can't find MADT\n");
                 goto skip_madt;
         }
@@ -666,40 +659,40 @@ int __init acpi_boot_init(void)
         /* Local APIC */
 
         if (acpi_table_parse_madt
-            (ACPI_MADT_LAPIC_ADDR_OVR, acpi_parse_lapic_addr_ovr, 0) < 0)
+            (ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE, acpi_parse_lapic_addr_ovr, 0) < 0)
                 printk(KERN_ERR PREFIX
                        "Error parsing LAPIC address override entry\n");
 
-        if (acpi_table_parse_madt(ACPI_MADT_LSAPIC, acpi_parse_lsapic, NR_CPUS)
+        if (acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_SAPIC, acpi_parse_lsapic, NR_CPUS)
             < 1)
                 printk(KERN_ERR PREFIX
                        "Error parsing MADT - no LAPIC entries\n");
 
-        if (acpi_table_parse_madt(ACPI_MADT_LAPIC_NMI, acpi_parse_lapic_nmi, 0)
+        if (acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_NMI, acpi_parse_lapic_nmi, 0)
             < 0)
                 printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n");
 
         /* I/O APIC */
 
         if (acpi_table_parse_madt
-            (ACPI_MADT_IOSAPIC, acpi_parse_iosapic, NR_IOSAPICS) < 1)
+            (ACPI_MADT_TYPE_IO_SAPIC, acpi_parse_iosapic, NR_IOSAPICS) < 1)
                 printk(KERN_ERR PREFIX
                        "Error parsing MADT - no IOSAPIC entries\n");
 
         /* System-Level Interrupt Routing */
 
         if (acpi_table_parse_madt
-            (ACPI_MADT_PLAT_INT_SRC, acpi_parse_plat_int_src,
+            (ACPI_MADT_TYPE_INTERRUPT_SOURCE, acpi_parse_plat_int_src,
              ACPI_MAX_PLATFORM_INTERRUPTS) < 0)
                 printk(KERN_ERR PREFIX
                        "Error parsing platform interrupt source entry\n");
 
         if (acpi_table_parse_madt
-            (ACPI_MADT_INT_SRC_OVR, acpi_parse_int_src_ovr, 0) < 0)
+            (ACPI_MADT_TYPE_INTERRUPT_OVERRIDE, acpi_parse_int_src_ovr, 0) < 0)
                 printk(KERN_ERR PREFIX
                        "Error parsing interrupt source overrides entry\n");
 
-        if (acpi_table_parse_madt(ACPI_MADT_NMI_SRC, acpi_parse_nmi_src, 0) < 0)
+        if (acpi_table_parse_madt(ACPI_MADT_TYPE_NMI_SOURCE, acpi_parse_nmi_src, 0) < 0)
                 printk(KERN_ERR PREFIX "Error parsing NMI SRC entry\n");
       skip_madt:
 
@@ -709,7 +702,7 @@ int __init acpi_boot_init(void)
          * gets interrupts such as power and sleep buttons.  If it's not
          * on a Legacy interrupt, it needs to be setup.
          */
-        if (acpi_table_parse(ACPI_FADT, acpi_parse_fadt) < 1)
+        if (acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt) < 1)
                 printk(KERN_ERR PREFIX "Can't find FADT\n");
 
 #ifdef CONFIG_SMP
@@ -842,7 +835,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
 {
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         union acpi_object *obj;
-        struct acpi_table_lsapic *lsapic;
+        struct acpi_madt_local_sapic *lsapic;
         cpumask_t tmp_map;
         long physid;
         int cpu;
@@ -854,16 +847,16 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
                 return -EINVAL;
 
         obj = buffer.pointer;
-        if (obj->type != ACPI_TYPE_BUFFER ||
-            obj->buffer.length < sizeof(*lsapic)) {
+        if (obj->type != ACPI_TYPE_BUFFER)
+        {
                 kfree(buffer.pointer);
                 return -EINVAL;
         }
 
-        lsapic = (struct acpi_table_lsapic *)obj->buffer.pointer;
+        lsapic = (struct acpi_madt_local_sapic *)obj->buffer.pointer;
 
-        if ((lsapic->header.type != ACPI_MADT_LSAPIC) ||
-            (!lsapic->flags.enabled)) {
+        if ((lsapic->header.type != ACPI_MADT_TYPE_LOCAL_SAPIC) ||
+            (!lsapic->lapic_flags & ACPI_MADT_ENABLED)) {
                 kfree(buffer.pointer);
                 return -EINVAL;
         }
@@ -883,7 +876,6 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
 
         cpu_set(cpu, cpu_present_map);
         ia64_cpu_to_sapicid[cpu] = physid;
-        ia64_acpiid_to_sapicid[lsapic->acpi_id] = ia64_cpu_to_sapicid[cpu];
 
         *pcpu = cpu;
         return (0);
@@ -893,14 +885,6 @@ EXPORT_SYMBOL(acpi_map_lsapic);
 
 int acpi_unmap_lsapic(int cpu)
 {
-        int i;
-
-        for (i = 0; i < MAX_SAPICS; i++) {
-                if (ia64_acpiid_to_sapicid[i] == ia64_cpu_to_sapicid[cpu]) {
-                        ia64_acpiid_to_sapicid[i] = -1;
-                        break;
-                }
-        }
         ia64_cpu_to_sapicid[cpu] = -1;
         cpu_clear(cpu, cpu_present_map);
 
@@ -920,7 +904,7 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)
 {
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         union acpi_object *obj;
-        struct acpi_table_iosapic *iosapic;
+        struct acpi_madt_io_sapic *iosapic;
         unsigned int gsi_base;
         int pxm, node;
 
@@ -938,9 +922,9 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)
                 return AE_OK;
         }
 
-        iosapic = (struct acpi_table_iosapic *)obj->buffer.pointer;
+        iosapic = (struct acpi_madt_io_sapic *)obj->buffer.pointer;
 
-        if (iosapic->header.type != ACPI_MADT_IOSAPIC) {
+        if (iosapic->header.type != ACPI_MADT_TYPE_IO_SAPIC) {
                 kfree(buffer.pointer);
                 return AE_OK;
         }
diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c
index cb96b4ea7df6..8c331ca6e5c9 100644
--- a/arch/ia64/sn/kernel/io_acpi_init.c
+++ b/arch/ia64/sn/kernel/io_acpi_init.c
@@ -13,6 +13,7 @@
 #include <asm/sn/sn_sal.h>
 #include "xtalk/hubdev.h"
 #include <linux/acpi.h>
+#include <acpi/acnamesp.h>
 
 
 /*
@@ -31,6 +32,12 @@ struct acpi_vendor_uuid sn_uuid = {
                     0xa2, 0x7c, 0x08, 0x00, 0x69, 0x13, 0xea, 0x51 },
 };
 
+struct sn_pcidev_match {
+        u8 bus;
+        unsigned int devfn;
+        acpi_handle handle;
+};
+
 /*
  * Perform the early IO init in PROM.
  */
@@ -119,9 +126,11 @@ sn_get_bussoft_ptr(struct pci_bus *bus)
         status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,
                                           &sn_uuid, &buffer);
         if (ACPI_FAILURE(status)) {
-                printk(KERN_ERR "get_acpi_pcibus_ptr: "
-                       "get_acpi_bussoft_info() failed: %d\n",
-                       status);
+                printk(KERN_ERR "%s: "
+                       "acpi_get_vendor_resource() failed (0x%x) for: ",
+                       __FUNCTION__, status);
+                acpi_ns_print_node_pathname(handle, NULL);
+                printk("\n");
                 return NULL;
         }
         resource = buffer.pointer;
@@ -130,8 +139,8 @@ sn_get_bussoft_ptr(struct pci_bus *bus)
         if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !=
              sizeof(struct pcibus_bussoft *)) {
                 printk(KERN_ERR
-                       "get_acpi_bussoft_ptr: Invalid vendor data "
-                       "length %d\n", vendor->byte_length);
+                       "%s: Invalid vendor data length %d\n",
+                        __FUNCTION__, vendor->byte_length);
                 kfree(buffer.pointer);
                 return NULL;
         }
@@ -143,34 +152,254 @@ sn_get_bussoft_ptr(struct pci_bus *bus)
 }
 
 /*
- * sn_acpi_bus_fixup
+ * sn_extract_device_info - Extract the pcidev_info and the sn_irq_info
+ *                          pointers from the vendor resource using the
+ *                          provided acpi handle, and copy the structures
+ *                          into the argument buffers.
  */
-void
-sn_acpi_bus_fixup(struct pci_bus *bus)
+static int
+sn_extract_device_info(acpi_handle handle, struct pcidev_info **pcidev_info,
+                    struct sn_irq_info **sn_irq_info)
 {
-        struct pci_dev *pci_dev = NULL;
-        struct pcibus_bussoft *prom_bussoft_ptr;
-        extern void sn_common_bus_fixup(struct pci_bus *,
-                                        struct pcibus_bussoft *);
+        u64 addr;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        struct sn_irq_info *irq_info, *irq_info_prom;
+        struct pcidev_info *pcidev_ptr, *pcidev_prom_ptr;
+        struct acpi_resource *resource;
+        int ret = 0;
+        acpi_status status;
+        struct acpi_resource_vendor_typed *vendor;
 
-        if (!bus->parent) {     /* If root bus */
-                prom_bussoft_ptr = sn_get_bussoft_ptr(bus);
-                if (prom_bussoft_ptr == NULL) {
+        /*
+         * The pointer to this device's pcidev_info structure in
+         * the PROM, is in the vendor resource.
+         */
+        status = acpi_get_vendor_resource(handle, METHOD_NAME__CRS,
+                                          &sn_uuid, &buffer);
+        if (ACPI_FAILURE(status)) {
+                printk(KERN_ERR
+                       "%s: acpi_get_vendor_resource() failed (0x%x) for: ",
+                        __FUNCTION__, status);
+                acpi_ns_print_node_pathname(handle, NULL);
+                printk("\n");
+                return 1;
+        }
+
+        resource = buffer.pointer;
+        vendor = &resource->data.vendor_typed;
+        if ((vendor->byte_length - sizeof(struct acpi_vendor_uuid)) !=
+            sizeof(struct pci_devdev_info *)) {
+                printk(KERN_ERR
+                       "%s: Invalid vendor data length: %d for: ",
+                        __FUNCTION__, vendor->byte_length);
+                acpi_ns_print_node_pathname(handle, NULL);
+                printk("\n");
+                ret = 1;
+                goto exit;
+        }
+
+        pcidev_ptr = kzalloc(sizeof(struct pcidev_info), GFP_KERNEL);
+        if (!pcidev_ptr)
+                panic("%s: Unable to alloc memory for pcidev_info", __FUNCTION__);
+
+        memcpy(&addr, vendor->byte_data, sizeof(struct pcidev_info *));
+        pcidev_prom_ptr = __va(addr);
+        memcpy(pcidev_ptr, pcidev_prom_ptr, sizeof(struct pcidev_info));
+
+        /* Get the IRQ info */
+        irq_info = kzalloc(sizeof(struct sn_irq_info), GFP_KERNEL);
+        if (!irq_info)
+                 panic("%s: Unable to alloc memory for sn_irq_info", __FUNCTION__);
+
+        if (pcidev_ptr->pdi_sn_irq_info) {
+                irq_info_prom = __va(pcidev_ptr->pdi_sn_irq_info);
+                memcpy(irq_info, irq_info_prom, sizeof(struct sn_irq_info));
+        }
+
+        *pcidev_info = pcidev_ptr;
+        *sn_irq_info = irq_info;
+
+exit:
+        kfree(buffer.pointer);
+        return ret;
+}
+
+static unsigned int
+get_host_devfn(acpi_handle device_handle, acpi_handle rootbus_handle)
+{
+        unsigned long adr;
+        acpi_handle child;
+        unsigned int devfn;
+        int function;
+        acpi_handle parent;
+        int slot;
+        acpi_status status;
+
+        /*
+         * Do an upward search to find the root bus device, and
+         * obtain the host devfn from the previous child device.
+         */
+        child = device_handle;
+        while (child) {
+                status = acpi_get_parent(child, &parent);
+                if (ACPI_FAILURE(status)) {
+                        printk(KERN_ERR "%s: acpi_get_parent() failed "
+                               "(0x%x) for: ", __FUNCTION__, status);
+                        acpi_ns_print_node_pathname(child, NULL);
+                        printk("\n");
+                        panic("%s: Unable to find host devfn\n", __FUNCTION__);
+                }
+                if (parent == rootbus_handle)
+                        break;
+                child = parent;
+        }
+        if (!child) {
+                printk(KERN_ERR "%s: Unable to find root bus for: ",
+                       __FUNCTION__);
+                acpi_ns_print_node_pathname(device_handle, NULL);
+                printk("\n");
+                BUG();
+        }
+
+        status = acpi_evaluate_integer(child, METHOD_NAME__ADR, NULL, &adr);
+        if (ACPI_FAILURE(status)) {
+                printk(KERN_ERR "%s: Unable to get _ADR (0x%x) for: ",
+                       __FUNCTION__, status);
+                acpi_ns_print_node_pathname(child, NULL);
+                printk("\n");
+                panic("%s: Unable to find host devfn\n", __FUNCTION__);
+        }
+
+        slot = (adr >> 16) & 0xffff;
+        function = adr & 0xffff;
+        devfn = PCI_DEVFN(slot, function);
+        return devfn;
+}
+
+/*
+ * find_matching_device - Callback routine to find the ACPI device
+ *                        that matches up with our pci_dev device.
+ *                        Matching is done on bus number and devfn.
+ *                        To find the bus number for a particular
+ *                        ACPI device, we must look at the _BBN method
+ *                        of its parent.
+ */
+static acpi_status
+find_matching_device(acpi_handle handle, u32 lvl, void *context, void **rv)
+{
+        unsigned long bbn = -1;
+        unsigned long adr;
+        acpi_handle parent = NULL;
+        acpi_status status;
+        unsigned int devfn;
+        int function;
+        int slot;
+        struct sn_pcidev_match *info = context;
+
+        status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL,
+                                       &adr);
+        if (ACPI_SUCCESS(status)) {
+                status = acpi_get_parent(handle, &parent);
+                if (ACPI_FAILURE(status)) {
                         printk(KERN_ERR
-                               "sn_pci_fixup_bus: 0x%04x:0x%02x Unable to "
-                               "obtain prom_bussoft_ptr\n",
-                               pci_domain_nr(bus), bus->number);
-                        return;
+                               "%s: acpi_get_parent() failed (0x%x) for: ",
+                                        __FUNCTION__, status);
+                        acpi_ns_print_node_pathname(handle, NULL);
+                        printk("\n");
+                        return AE_OK;
+                }
+                status = acpi_evaluate_integer(parent, METHOD_NAME__BBN,
+                                               NULL, &bbn);
+                if (ACPI_FAILURE(status)) {
+                        printk(KERN_ERR
+                          "%s: Failed to find _BBN in parent of: ",
+                                        __FUNCTION__);
+                        acpi_ns_print_node_pathname(handle, NULL);
+                        printk("\n");
+                        return AE_OK;
+                }
+
+                slot = (adr >> 16) & 0xffff;
+                function = adr & 0xffff;
+                devfn = PCI_DEVFN(slot, function);
+                if ((info->devfn == devfn) && (info->bus == bbn)) {
+                        /* We have a match! */
+                        info->handle = handle;
+                        return 1;
                 }
-                sn_common_bus_fixup(bus, prom_bussoft_ptr);
         }
-        list_for_each_entry(pci_dev, &bus->devices, bus_list) {
-                sn_pci_fixup_slot(pci_dev);
+        return AE_OK;
+}
+
+/*
+ * sn_acpi_get_pcidev_info - Search ACPI namespace for the acpi
+ *                           device matching the specified pci_dev,
+ *                           and return the pcidev info and irq info.
+ */
+int
+sn_acpi_get_pcidev_info(struct pci_dev *dev, struct pcidev_info **pcidev_info,
+                        struct sn_irq_info **sn_irq_info)
+{
+        unsigned int host_devfn;
+        struct sn_pcidev_match pcidev_match;
+        acpi_handle rootbus_handle;
+        unsigned long segment;
+        acpi_status status;
+
+        rootbus_handle = PCI_CONTROLLER(dev)->acpi_handle;
+        status = acpi_evaluate_integer(rootbus_handle, METHOD_NAME__SEG, NULL,
+                                       &segment);
+        if (ACPI_SUCCESS(status)) {
+                if (segment != pci_domain_nr(dev)) {
+                        printk(KERN_ERR
+                               "%s: Segment number mismatch, 0x%lx vs 0x%x for: ",
+                               __FUNCTION__, segment, pci_domain_nr(dev));
+                        acpi_ns_print_node_pathname(rootbus_handle, NULL);
+                        printk("\n");
+                        return 1;
+                }
+        } else {
+                printk(KERN_ERR "%s: Unable to get __SEG from: ",
+                       __FUNCTION__);
+                acpi_ns_print_node_pathname(rootbus_handle, NULL);
+                printk("\n");
+                return 1;
+        }
+
+        /*
+         * We want to search all devices in this segment/domain
+         * of the ACPI namespace for the matching ACPI device,
+         * which holds the pcidev_info pointer in its vendor resource.
+         */
+        pcidev_match.bus = dev->bus->number;
+        pcidev_match.devfn = dev->devfn;
+        pcidev_match.handle = NULL;
+
+        acpi_walk_namespace(ACPI_TYPE_DEVICE, rootbus_handle, ACPI_UINT32_MAX,
+                            find_matching_device, &pcidev_match, NULL);
+
+        if (!pcidev_match.handle) {
+                printk(KERN_ERR
+                       "%s: Could not find matching ACPI device for %s.\n",
+                       __FUNCTION__, pci_name(dev));
+                return 1;
         }
+
+        if (sn_extract_device_info(pcidev_match.handle, pcidev_info, sn_irq_info))
+                return 1;
+
+        /* Build up the pcidev_info.pdi_slot_host_handle */
+        host_devfn = get_host_devfn(pcidev_match.handle, rootbus_handle);
+        (*pcidev_info)->pdi_slot_host_handle =
+                        ((unsigned long) pci_domain_nr(dev) << 40) |
+                                        /* bus == 0 */
+                                        host_devfn;
+        return 0;
 }
 
 /*
- * sn_acpi_slot_fixup - Perform any SN specific slot fixup.
+ * sn_acpi_slot_fixup - Obtain the pcidev_info and sn_irq_info.
+ *                      Perform any SN specific slot fixup.
  *                      At present there does not appear to be
  *                      any generic way to handle a ROM image
  *                      that has been shadowed by the PROM, so
@@ -179,11 +408,18 @@ sn_acpi_bus_fixup(struct pci_bus *bus)
  */
 
 void
-sn_acpi_slot_fixup(struct pci_dev *dev, struct pcidev_info *pcidev_info)
+sn_acpi_slot_fixup(struct pci_dev *dev)
 {
         void __iomem *addr;
+        struct pcidev_info *pcidev_info = NULL;
+        struct sn_irq_info *sn_irq_info = NULL;
         size_t size;
 
+        if (sn_acpi_get_pcidev_info(dev, &pcidev_info, &sn_irq_info)) {
+                panic("%s:  Failure obtaining pcidev_info for %s\n",
+                      __FUNCTION__, pci_name(dev));
+        }
+
         if (pcidev_info->pdi_pio_mapped_addr[PCI_ROM_RESOURCE]) {
                 /*
                  * A valid ROM image exists and has been shadowed by the
@@ -200,8 +436,11 @@ sn_acpi_slot_fixup(struct pci_dev *dev, struct pcidev_info *pcidev_info)
                                                 (unsigned long) addr + size;
                 dev->resource[PCI_ROM_RESOURCE].flags |= IORESOURCE_ROM_BIOS_COPY;
         }
+        sn_pci_fixup_slot(dev, pcidev_info, sn_irq_info);
 }
 
+EXPORT_SYMBOL(sn_acpi_slot_fixup);
+
 static struct acpi_driver acpi_sn_hubdev_driver = {
         .name = "SGI HUBDEV Driver",
         .ids = "SGIHUB,SGITIO",
@@ -212,6 +451,33 @@ static struct acpi_driver acpi_sn_hubdev_driver = {
 
 
 /*
+ * sn_acpi_bus_fixup -  Perform SN specific setup of software structs
+ *                      (pcibus_bussoft, pcidev_info) and hardware
+ *                      registers, for the specified bus and devices under it.
+ */
+void
+sn_acpi_bus_fixup(struct pci_bus *bus)
+{
+        struct pci_dev *pci_dev = NULL;
+        struct pcibus_bussoft *prom_bussoft_ptr;
+
+        if (!bus->parent) {     /* If root bus */
+                prom_bussoft_ptr = sn_get_bussoft_ptr(bus);
+                if (prom_bussoft_ptr == NULL) {
+                        printk(KERN_ERR
+                               "%s: 0x%04x:0x%02x Unable to "
+                               "obtain prom_bussoft_ptr\n",
+                               __FUNCTION__, pci_domain_nr(bus), bus->number);
+                        return;
+                }
+                sn_common_bus_fixup(bus, prom_bussoft_ptr);
+        }
+        list_for_each_entry(pci_dev, &bus->devices, bus_list) {
+                sn_acpi_slot_fixup(pci_dev);
+        }
+}
+
+/*
  * sn_io_acpi_init - PROM has ACPI support for IO, defining at a minimum the
  *                   nodes and root buses in the DSDT. As a result, bus scanning
  *                   will be initiated by the Linux ACPI code.
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c
index d4dd8f4b6b8d..d48bcd83253c 100644
--- a/arch/ia64/sn/kernel/io_common.c
+++ b/arch/ia64/sn/kernel/io_common.c
@@ -26,14 +26,10 @@
 #include <linux/acpi.h>
 #include <asm/sn/sn2/sn_hwperf.h>
 #include <asm/sn/acpi.h>
+#include "acpi/acglobal.h"
 
 extern void sn_init_cpei_timer(void);
 extern void register_sn_procfs(void);
-extern void sn_acpi_bus_fixup(struct pci_bus *);
-extern void sn_bus_fixup(struct pci_bus *);
-extern void sn_acpi_slot_fixup(struct pci_dev *, struct pcidev_info *);
-extern void sn_more_slot_fixup(struct pci_dev *, struct pcidev_info *);
-extern void sn_legacy_pci_window_fixup(struct pci_controller *, u64, u64);
 extern void sn_io_acpi_init(void);
 extern void sn_io_init(void);
 
@@ -48,6 +44,9 @@ struct sysdata_el {
 
 int sn_ioif_inited;             /* SN I/O infrastructure initialized? */
 
+int sn_acpi_rev;                /* SN ACPI revision */
+EXPORT_SYMBOL_GPL(sn_acpi_rev);
+
 struct sn_pcibus_provider *sn_pci_provider[PCIIO_ASIC_MAX_TYPES];       /* indexed by asic type */
 
 /*
@@ -99,25 +98,6 @@ sal_get_device_dmaflush_list(u64 nasid, u64 widget_num, u64 device_num,
 }
 
 /*
- * Retrieve the pci device information given the bus and device|function number.
- */
-static inline u64
-sal_get_pcidev_info(u64 segment, u64 bus_number, u64 devfn, u64 pci_dev,
-                    u64 sn_irq_info)
-{
-        struct ia64_sal_retval ret_stuff;
-        ret_stuff.status = 0;
-        ret_stuff.v0 = 0;
-
-        SAL_CALL_NOLOCK(ret_stuff,
-                        (u64) SN_SAL_IOIF_GET_PCIDEV_INFO,
-                        (u64) segment, (u64) bus_number, (u64) devfn,
-                        (u64) pci_dev,
-                        sn_irq_info, 0, 0);
-        return ret_stuff.v0;
-}
-
-/*
  * sn_pcidev_info_get() - Retrieve the pcidev_info struct for the specified
  *                        device.
  */
@@ -249,50 +229,25 @@ void sn_pci_unfixup_slot(struct pci_dev *dev)
 }
 
 /*
- * sn_pci_fixup_slot() - This routine sets up a slot's resources consistent
- *                       with the Linux PCI abstraction layer. Resources
- *                       acquired from our PCI provider include PIO maps
- *                       to BAR space and interrupt objects.
+ * sn_pci_fixup_slot()
  */
-void sn_pci_fixup_slot(struct pci_dev *dev)
+void sn_pci_fixup_slot(struct pci_dev *dev, struct pcidev_info *pcidev_info,
+                       struct sn_irq_info *sn_irq_info)
 {
         int segment = pci_domain_nr(dev->bus);
-        int status = 0;
         struct pcibus_bussoft *bs;
-        struct pci_bus *host_pci_bus;
-        struct pci_dev *host_pci_dev;
-        struct pcidev_info *pcidev_info;
-        struct sn_irq_info *sn_irq_info;
-        unsigned int bus_no, devfn;
+        struct pci_bus *host_pci_bus;
+        struct pci_dev *host_pci_dev;
+        unsigned int bus_no, devfn;
 
         pci_dev_get(dev); /* for the sysdata pointer */
-        pcidev_info = kzalloc(sizeof(struct pcidev_info), GFP_KERNEL);
-        if (!pcidev_info)
-                BUG();          /* Cannot afford to run out of memory */
-
-        sn_irq_info = kzalloc(sizeof(struct sn_irq_info), GFP_KERNEL);
-        if (!sn_irq_info)
-                BUG();          /* Cannot afford to run out of memory */
-
-        /* Call to retrieve pci device information needed by kernel. */
-        status = sal_get_pcidev_info((u64) segment, (u64) dev->bus->number,
-                                     dev->devfn,
-                                     (u64) __pa(pcidev_info),
-                                     (u64) __pa(sn_irq_info));
-        if (status)
-                BUG(); /* Cannot get platform pci device information */
 
         /* Add pcidev_info to list in pci_controller.platform_data */
         list_add_tail(&pcidev_info->pdi_list,
                       &(SN_PLATFORM_DATA(dev->bus)->pcidev_info));
-
-        if (SN_ACPI_BASE_SUPPORT())
-                sn_acpi_slot_fixup(dev, pcidev_info);
-        else
-                sn_more_slot_fixup(dev, pcidev_info);
         /*
          * Using the PROMs values for the PCI host bus, get the Linux
-         * PCI host_pci_dev struct and set up host bus linkages
+         * PCI host_pci_dev struct and set up host bus linkages
          */
 
         bus_no = (pcidev_info->pdi_slot_host_handle >> 32) & 0xff;
@@ -489,11 +444,6 @@ void sn_generate_path(struct pci_bus *pci_bus, char *address)
                         sprintf(address, "%s^%d", address, geo_slot(geoid));
 }
 
-/*
- * sn_pci_fixup_bus() - Perform SN specific setup of software structs
- *                      (pcibus_bussoft, pcidev_info) and hardware
- *                      registers, for the specified bus and devices under it.
- */
 void __devinit
 sn_pci_fixup_bus(struct pci_bus *bus)
 {
@@ -519,6 +469,15 @@ sn_io_early_init(void)
         if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
                 return 0;
 
+        /* we set the acpi revision to that of the DSDT table OEM rev. */
+        {
+                struct acpi_table_header *header = NULL;
+
+                acpi_get_table_by_index(ACPI_TABLE_INDEX_DSDT, &header);
+                BUG_ON(header == NULL);
+                sn_acpi_rev = header->oem_revision;
+        }
+
         /*
          * prime sn_pci_provider[].  Individial provider init routines will
          * override their respective default entries.
@@ -544,8 +503,12 @@ sn_io_early_init(void)
         register_sn_procfs();
 #endif
 
-        printk(KERN_INFO "ACPI  DSDT OEM Rev 0x%x\n",
-               acpi_gbl_DSDT->oem_revision);
+        {
+                struct acpi_table_header *header;
+                (void)acpi_get_table_by_index(ACPI_TABLE_INDEX_DSDT, &header);
+                printk(KERN_INFO "ACPI  DSDT OEM Rev 0x%x\n",
+                        header->oem_revision);
+        }
         if (SN_ACPI_BASE_SUPPORT())
                 sn_io_acpi_init();
         else
@@ -605,7 +568,6 @@ sn_io_late_init(void)
 
 fs_initcall(sn_io_late_init);
 
-EXPORT_SYMBOL(sn_pci_fixup_slot);
 EXPORT_SYMBOL(sn_pci_unfixup_slot);
 EXPORT_SYMBOL(sn_bus_store_sysdata);
 EXPORT_SYMBOL(sn_bus_free_sysdata);
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 9ad843e0383b..600be3ebae05 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -56,6 +56,25 @@ static inline u64 sal_get_pcibus_info(u64 segment, u64 busnum, u64 address)
         return ret_stuff.v0;
 }
 
+/*
+ * Retrieve the pci device information given the bus and device|function number.
+ */
+static inline u64
+sal_get_pcidev_info(u64 segment, u64 bus_number, u64 devfn, u64 pci_dev,
+                    u64 sn_irq_info)
+{
+        struct ia64_sal_retval ret_stuff;
+        ret_stuff.status = 0;
+        ret_stuff.v0 = 0;
+
+        SAL_CALL_NOLOCK(ret_stuff,
+                        (u64) SN_SAL_IOIF_GET_PCIDEV_INFO,
+                        (u64) segment, (u64) bus_number, (u64) devfn,
+                        (u64) pci_dev,
+                        sn_irq_info, 0, 0);
+        return ret_stuff.v0;
+}
+
 
 /*
  * sn_fixup_ionodes() - This routine initializes the HUB data structure for
@@ -172,18 +191,40 @@ sn_pci_window_fixup(struct pci_dev *dev, unsigned int count,
 }
 
 /*
- * sn_more_slot_fixup() - We are not running with an ACPI capable PROM,
+ * sn_io_slot_fixup() -   We are not running with an ACPI capable PROM,
  *                        and need to convert the pci_dev->resource
  *                        'start' and 'end' addresses to mapped addresses,
  *                        and setup the pci_controller->window array entries.
  */
 void
-sn_more_slot_fixup(struct pci_dev *dev, struct pcidev_info *pcidev_info)
+sn_io_slot_fixup(struct pci_dev *dev)
 {
         unsigned int count = 0;
         int idx;
         s64 pci_addrs[PCI_ROM_RESOURCE + 1];
         unsigned long addr, end, size, start;
+        struct pcidev_info *pcidev_info;
+        struct sn_irq_info *sn_irq_info;
+        int status;
+
+        pcidev_info = kzalloc(sizeof(struct pcidev_info), GFP_KERNEL);
+        if (!pcidev_info)
+                panic("%s: Unable to alloc memory for pcidev_info", __FUNCTION__);
+
+        sn_irq_info = kzalloc(sizeof(struct sn_irq_info), GFP_KERNEL);
+        if (!sn_irq_info)
+                panic("%s: Unable to alloc memory for sn_irq_info", __FUNCTION__);
+
+        /* Call to retrieve pci device information needed by kernel. */
+        status = sal_get_pcidev_info((u64) pci_domain_nr(dev),
+                (u64) dev->bus->number,
+                dev->devfn,
+                (u64) __pa(pcidev_info),
+                (u64) __pa(sn_irq_info));
+
+        if (status)
+                BUG(); /* Cannot get platform pci device information */
+
 
         /* Copy over PIO Mapped Addresses */
         for (idx = 0; idx <= PCI_ROM_RESOURCE; idx++) {
@@ -219,8 +260,12 @@ sn_more_slot_fixup(struct pci_dev *dev, struct pcidev_info *pcidev_info)
          */
         if (count > 0)
                 sn_pci_window_fixup(dev, count, pci_addrs);
+
+        sn_pci_fixup_slot(dev, pcidev_info, sn_irq_info);
 }
 
+EXPORT_SYMBOL(sn_io_slot_fixup);
+
 /*
  * sn_pci_controller_fixup() - This routine sets up a bus's resources
  *                             consistent with the Linux PCI abstraction layer.
@@ -272,9 +317,6 @@ sn_bus_fixup(struct pci_bus *bus)
 {
         struct pci_dev *pci_dev = NULL;
         struct pcibus_bussoft *prom_bussoft_ptr;
-        extern void sn_common_bus_fixup(struct pci_bus *,
-                                        struct pcibus_bussoft *);
-
 
         if (!bus->parent) {  /* If root bus */
                 prom_bussoft_ptr = PCI_CONTROLLER(bus)->platform_data;
@@ -291,7 +333,7 @@ sn_bus_fixup(struct pci_bus *bus)
                                            prom_bussoft_ptr->bs_legacy_mem);
         }
         list_for_each_entry(pci_dev, &bus->devices, bus_list) {
-                sn_pci_fixup_slot(pci_dev);
+                sn_io_slot_fixup(pci_dev);
         }
 
 }
diff --git a/arch/ia64/sn/kernel/iomv.c b/arch/ia64/sn/kernel/iomv.c
index 4aa4f301d56d..ab7e2fd40798 100644
--- a/arch/ia64/sn/kernel/iomv.c
+++ b/arch/ia64/sn/kernel/iomv.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
@@ -26,9 +26,10 @@
  * @port: port to convert
  *
  * Legacy in/out instructions are converted to ld/st instructions
- * on IA64.  This routine will convert a port number into a valid 
+ * on IA64.  This routine will convert a port number into a valid
  * SN i/o address.  Used by sn_in*() and sn_out*().
  */
+
 void *sn_io_addr(unsigned long port)
 {
         if (!IS_RUNNING_ON_SIMULATOR()) {
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_provider.c b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
index 6846dc9b432d..04a8256017eb 100644
--- a/arch/ia64/sn/pci/pcibr/pcibr_provider.c
+++ b/arch/ia64/sn/pci/pcibr/pcibr_provider.c
@@ -20,7 +20,8 @@
 #include "xtalk/hubdev.h"
 
 int
-sal_pcibr_slot_enable(struct pcibus_info *soft, int device, void *resp)
+sal_pcibr_slot_enable(struct pcibus_info *soft, int device, void *resp,
+                      char **ssdt)
 {
         struct ia64_sal_retval ret_stuff;
         u64 busnum;
@@ -32,7 +33,8 @@ sal_pcibr_slot_enable(struct pcibus_info *soft, int device, void *resp)
         segment = soft->pbi_buscommon.bs_persist_segment;
         busnum = soft->pbi_buscommon.bs_persist_busnum;
         SAL_CALL_NOLOCK(ret_stuff, (u64) SN_SAL_IOIF_SLOT_ENABLE, segment,
-                        busnum, (u64) device, (u64) resp, 0, 0, 0);
+                        busnum, (u64) device, (u64) resp, (u64)ia64_tpa(ssdt),
+                        0, 0);
 
         return (int)ret_stuff.v0;
 }