7 files changed, 61 insertions, 66 deletions

diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
index b856a837b4a3..7aca4839387b 100644
--- a/arch/powerpc/include/asm/pci.h
+++ b/arch/powerpc/include/asm/pci.h
@@ -233,6 +233,8 @@ extern void pci_resource_to_user(const struct pci_dev *dev, int bar,
 
 extern void pcibios_setup_bus_devices(struct pci_bus *bus);
 extern void pcibios_setup_bus_self(struct pci_bus *bus);
+extern void pcibios_setup_phb_io_space(struct pci_controller *hose);
+extern void pcibios_scan_phb(struct pci_controller *hose, void *sysdata);
 
 #endif  /* __KERNEL__ */
 #endif /* __ASM_POWERPC_PCI_H */
diff --git a/arch/powerpc/include/asm/ppc-pci.h b/arch/powerpc/include/asm/ppc-pci.h
index 854ab713f56c..2828f9d0f66d 100644
--- a/arch/powerpc/include/asm/ppc-pci.h
+++ b/arch/powerpc/include/asm/ppc-pci.h
@@ -39,7 +39,6 @@ void *traverse_pci_devices(struct device_node *start, traverse_func pre,
 
 extern void pci_devs_phb_init(void);
 extern void pci_devs_phb_init_dynamic(struct pci_controller *phb);
-extern void scan_phb(struct pci_controller *hose);
 
 /* From rtas_pci.h */
 extern void init_pci_config_tokens (void);
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c
index 87df428e3588..1a4fc0d11a03 100644
--- a/arch/powerpc/kernel/of_platform.c
+++ b/arch/powerpc/kernel/of_platform.c
@@ -276,7 +276,7 @@ static int __devinit of_pci_phb_probe(struct of_device *dev,
 #endif /* CONFIG_EEH */
 
         /* Scan the bus */
-        scan_phb(phb);
+        pcibios_scan_phb(phb, dev->node);
         if (phb->bus == NULL)
                 return -ENXIO;
 
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 8f84a9a8428e..e9f4840096b3 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1688,3 +1688,52 @@ int early_find_capability(struct pci_controller *hose, int bus, int devfn,
 {
         return pci_bus_find_capability(fake_pci_bus(hose, bus), devfn, cap);
 }
+
+/**
+ * pci_scan_phb - Given a pci_controller, setup and scan the PCI bus
+ * @hose: Pointer to the PCI host controller instance structure
+ * @sysdata: value to use for sysdata pointer.  ppc32 and ppc64 differ here
+ *
+ * Note: the 'data' pointer is a temporary measure.  As 32 and 64 bit
+ * pci code gets merged, this parameter should become unnecessary because
+ * both will use the same value.
+ */
+void __devinit pcibios_scan_phb(struct pci_controller *hose, void *sysdata)
+{
+        struct pci_bus *bus;
+        struct device_node *node = hose->dn;
+        int mode;
+
+        pr_debug("PCI: Scanning PHB %s\n",
+                 node ? node->full_name : "<NO NAME>");
+
+        /* Create an empty bus for the toplevel */
+        bus = pci_create_bus(hose->parent, hose->first_busno, hose->ops,
+                             sysdata);
+        if (bus == NULL) {
+                pr_err("Failed to create bus for PCI domain %04x\n",
+                        hose->global_number);
+                return;
+        }
+        bus->secondary = hose->first_busno;
+        hose->bus = bus;
+
+        /* Get some IO space for the new PHB */
+        pcibios_setup_phb_io_space(hose);
+
+        /* Wire up PHB bus resources */
+        pcibios_setup_phb_resources(hose);
+
+        /* Get probe mode and perform scan */
+        mode = PCI_PROBE_NORMAL;
+        if (node && ppc_md.pci_probe_mode)
+                mode = ppc_md.pci_probe_mode(bus);
+        pr_debug("    probe mode: %d\n", mode);
+        if (mode == PCI_PROBE_DEVTREE) {
+                bus->subordinate = hose->last_busno;
+                of_scan_bus(node, bus);
+        }
+
+        if (mode == PCI_PROBE_NORMAL)
+                hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);
+}
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 8cf15d961c38..c13668cf36d9 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -354,36 +354,15 @@ pci_create_OF_bus_map(void)
         }
 }
 
-static void __devinit pcibios_scan_phb(struct pci_controller *hose)
+void __devinit pcibios_setup_phb_io_space(struct pci_controller *hose)
 {
-        struct pci_bus *bus;
-        struct device_node *node = hose->dn;
         unsigned long io_offset;
         struct resource *res = &hose->io_resource;
 
-        pr_debug("PCI: Scanning PHB %s\n",
-                 node ? node->full_name : "<NO NAME>");
-
-        /* Create an empty bus for the toplevel */
-        bus = pci_create_bus(hose->parent, hose->first_busno, hose->ops, hose);
-        if (bus == NULL) {
-                printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",
-                       hose->global_number);
-                return;
-        }
-        bus->secondary = hose->first_busno;
-        hose->bus = bus;
-
         /* Fixup IO space offset */
         io_offset = (unsigned long)hose->io_base_virt - isa_io_base;
         res->start = (res->start + io_offset) & 0xffffffffu;
         res->end = (res->end + io_offset) & 0xffffffffu;
-
-        /* Wire up PHB bus resources */
-        pcibios_setup_phb_resources(hose);
-
-        /* Scan children */
-        hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);
 }
 
 static int __init pcibios_init(void)
@@ -401,7 +380,7 @@ static int __init pcibios_init(void)
                 if (pci_assign_all_buses)
                         hose->first_busno = next_busno;
                 hose->last_busno = 0xff;
-                pcibios_scan_phb(hose);
+                pcibios_scan_phb(hose, hose);
                 pci_bus_add_devices(hose->bus);
                 if (pci_assign_all_buses || next_busno <= hose->last_busno)
                         next_busno = hose->last_busno + pcibios_assign_bus_offset;
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 4d5b4ced7e45..ba949a2c93ac 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -43,45 +43,6 @@ unsigned long pci_probe_only = 1;
 unsigned long pci_io_base = ISA_IO_BASE;
 EXPORT_SYMBOL(pci_io_base);
 
-void __devinit scan_phb(struct pci_controller *hose)
-{
-        struct pci_bus *bus;
-        struct device_node *node = hose->dn;
-        int mode;
-
-        pr_debug("PCI: Scanning PHB %s\n",
-                 node ? node->full_name : "<NO NAME>");
-
-        /* Create an empty bus for the toplevel */
-        bus = pci_create_bus(hose->parent, hose->first_busno, hose->ops, node);
-        if (bus == NULL) {
-                printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",
-                       hose->global_number);
-                return;
-        }
-        bus->secondary = hose->first_busno;
-        hose->bus = bus;
-
-        /* Get some IO space for the new PHB */
-        pcibios_map_io_space(bus);
-
-        /* Wire up PHB bus resources */
-        pcibios_setup_phb_resources(hose);
-
-        /* Get probe mode and perform scan */
-        mode = PCI_PROBE_NORMAL;
-        if (node && ppc_md.pci_probe_mode)
-                mode = ppc_md.pci_probe_mode(bus);
-        pr_debug("    probe mode: %d\n", mode);
-        if (mode == PCI_PROBE_DEVTREE) {
-                bus->subordinate = hose->last_busno;
-                of_scan_bus(node, bus);
-        }
-
-        if (mode == PCI_PROBE_NORMAL)
-                hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);
-}
-
 static int __init pcibios_init(void)
 {
         struct pci_controller *hose, *tmp;
@@ -103,7 +64,7 @@ static int __init pcibios_init(void)
 
         /* Scan all of the recorded PCI controllers.  */
         list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
-                scan_phb(hose);
+                pcibios_scan_phb(hose, hose->dn);
                 pci_bus_add_devices(hose->bus);
         }
 
@@ -237,6 +198,11 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus)
 }
 EXPORT_SYMBOL_GPL(pcibios_map_io_space);
 
+void __devinit pcibios_setup_phb_io_space(struct pci_controller *hose)
+{
+        pcibios_map_io_space(hose->bus);
+}
+
 #define IOBASE_BRIDGE_NUMBER    0
 #define IOBASE_MEMORY           1
 #define IOBASE_IO               2
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index ad152a0e3946..b6fa3e4b51b5 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -151,7 +151,7 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
         if (dn->child)
                 eeh_add_device_tree_early(dn);
 
-        scan_phb(phb);
+        pcibios_scan_phb(phb, dn);
         pcibios_finish_adding_to_bus(phb->bus);
 
         return phb;