7 files changed, 8 insertions, 90 deletions

diff --git a/arch/powerpc/platforms/cell/io-workarounds.c b/arch/powerpc/platforms/cell/io-workarounds.c
index 7fb92f23f38..9d7c2ef940a 100644
--- a/arch/powerpc/platforms/cell/io-workarounds.c
+++ b/arch/powerpc/platforms/cell/io-workarounds.c
@@ -102,7 +102,7 @@ static void spider_io_flush(const volatile void __iomem *addr)
                 vaddr = (unsigned long)PCI_FIX_ADDR(addr);
 
                 /* Check if it's in allowed range for  PIO */
-                if (vaddr < PHBS_IO_BASE || vaddr >= IMALLOC_BASE)
+                if (vaddr < PHB_IO_BASE || vaddr > PHB_IO_END)
                         return;
 
                 /* Try to find a PTE. If not, clear the paddr, we'll do
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index 9c974227155..23d87621187 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -742,6 +742,11 @@ void __init iSeries_pcibios_init(void)
         /* Install IO hooks */
         ppc_pci_io = iseries_pci_io;
 
+        /* iSeries has no IO space in the common sense, it needs to set
+         * the IO base to 0
+         */
+        pci_io_base = 0;
+
         if (root == NULL) {
                 printk(KERN_CRIT "iSeries_pcibios_init: can't find root "
                                 "of device tree\n");
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 7aaa5bbc936..f357b925887 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -519,23 +519,6 @@ void __devinit maple_pci_irq_fixup(struct pci_dev *dev)
         DBG(" <- maple_pci_irq_fixup\n");
 }
 
-static void __init maple_fixup_phb_resources(void)
-{
-        struct pci_controller *hose, *tmp;
-        
-        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
-                unsigned long offset = (unsigned long)hose->io_base_virt - pci_io_base;
-
-                hose->io_resource.start += offset;
-                hose->io_resource.end += offset;
-
-                printk(KERN_INFO "PCI Host %d, io start: %llx; io end: %llx\n",
-                       hose->global_number,
-                       (unsigned long long)hose->io_resource.start,
-                       (unsigned long long)hose->io_resource.end);
-        }
-}
-
 void __init maple_pci_init(void)
 {
         struct device_node *np, *root;
@@ -573,24 +556,6 @@ void __init maple_pci_init(void)
         if (ht && add_bridge(ht) != 0)
                 of_node_put(ht);
 
-        /*
-         * We need to call pci_setup_phb_io for the HT bridge first
-         * so it gets the I/O port numbers starting at 0, and we
-         * need to call it for the AGP bridge after that so it gets
-         * small positive I/O port numbers.
-         */
-        if (u3_ht)
-                pci_setup_phb_io(u3_ht, 1);
-        if (u3_agp)
-                pci_setup_phb_io(u3_agp, 0);
-        if (u4_pcie)
-                pci_setup_phb_io(u4_pcie, 0);
-
-        /* Fixup the IO resources on our host bridges as the common code
-         * does it only for childs of the host bridges
-         */
-        maple_fixup_phb_resources();
-
         /* Setup the linkage between OF nodes and PHBs */ 
         pci_devs_phb_init();
 
diff --git a/arch/powerpc/platforms/pasemi/pci.c b/arch/powerpc/platforms/pasemi/pci.c
index bbc6dfcfaa9..5606f25760b 100644
--- a/arch/powerpc/platforms/pasemi/pci.c
+++ b/arch/powerpc/platforms/pasemi/pci.c
@@ -150,29 +150,11 @@ static int __init add_bridge(struct device_node *dev)
         printk(KERN_INFO "Found PA-PXP PCI host bridge.\n");
 
         /* Interpret the "ranges" property */
-        /* This also maps the I/O region and sets isa_io/mem_base */
         pci_process_bridge_OF_ranges(hose, dev, 1);
-        pci_setup_phb_io(hose, 1);
 
         return 0;
 }
 
-
-static void __init pas_fixup_phb_resources(void)
-{
-        struct pci_controller *hose, *tmp;
-
-        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
-                unsigned long offset = (unsigned long)hose->io_base_virt - pci_io_base;
-                hose->io_resource.start += offset;
-                hose->io_resource.end += offset;
-                printk(KERN_INFO "PCI Host %d, io start: %lx; io end: %lx\n",
-                       hose->global_number,
-                       hose->io_resource.start, hose->io_resource.end);
-        }
-}
-
-
 void __init pas_pci_init(void)
 {
         struct device_node *np, *root;
@@ -190,8 +172,6 @@ void __init pas_pci_init(void)
 
         of_node_put(root);
 
-        pas_fixup_phb_resources();
-
         /* Setup the linkage between OF nodes and PHBs */
         pci_devs_phb_init();
 
diff --git a/arch/powerpc/platforms/powermac/pci.c b/arch/powerpc/platforms/powermac/pci.c
index c4af9e21ac9..8302e34a3cb 100644
--- a/arch/powerpc/platforms/powermac/pci.c
+++ b/arch/powerpc/platforms/powermac/pci.c
@@ -1006,19 +1006,6 @@ void __devinit pmac_pci_irq_fixup(struct pci_dev *dev)
 #endif /* CONFIG_PPC32 */
 }
 
-#ifdef CONFIG_PPC64
-static void __init pmac_fixup_phb_resources(void)
-{
-        struct pci_controller *hose, *tmp;
-
-        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
-                printk(KERN_INFO "PCI Host %d, io start: %lx; io end: %lx\n",
-                       hose->global_number,
-                       hose->io_resource.start, hose->io_resource.end);
-        }
-}
-#endif
-
 void __init pmac_pci_init(void)
 {
         struct device_node *np, *root;
@@ -1053,25 +1040,6 @@ void __init pmac_pci_init(void)
         if (ht && add_bridge(ht) != 0)
                 of_node_put(ht);
 
-        /*
-         * We need to call pci_setup_phb_io for the HT bridge first
-         * so it gets the I/O port numbers starting at 0, and we
-         * need to call it for the AGP bridge after that so it gets
-         * small positive I/O port numbers.
-         */
-        if (u3_ht)
-                pci_setup_phb_io(u3_ht, 1);
-        if (u3_agp)
-                pci_setup_phb_io(u3_agp, 0);
-        if (u4_pcie)
-                pci_setup_phb_io(u4_pcie, 0);
-
-        /*
-         * On ppc64, fixup the IO resources on our host bridges as
-         * the common code does it only for children of the host bridges
-         */
-        pmac_fixup_phb_resources();
-
         /* Setup the linkage between OF nodes and PHBs */
         pci_devs_phb_init();
 
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index 0b113ab90ba..47f0e0857f0 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -202,8 +202,6 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
         rtas_setup_phb(phb);
         pci_process_bridge_OF_ranges(phb, dn, 0);
 
-        pci_setup_phb_io_dynamic(phb, primary);
-
         pci_devs_phb_init_dynamic(phb);
 
         if (dn->child)
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h
index 2729d559fd9..61e19f78b92 100644
--- a/arch/powerpc/platforms/pseries/pseries.h
+++ b/arch/powerpc/platforms/pseries/pseries.h
@@ -33,6 +33,8 @@ static inline void setup_kexec_cpu_down_xics(void) { }
 static inline void setup_kexec_cpu_down_mpic(void) { }
 #endif
 
+extern void pSeries_final_fixup(void);
+
 /* Poweron flag used for enabling auto ups restart */
 extern unsigned long rtas_poweron_auto;