2 files changed, 70 insertions, 66 deletions

diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index d7de3ec0bf83..5a5b24685081 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -187,7 +187,7 @@ static DEFINE_SPINLOCK(hose_spinlock);
 /*
  * pci_controller(phb) initialized common variables.
  */
-void __devinit pci_setup_pci_controller(struct pci_controller *hose)
+static void __devinit pci_setup_pci_controller(struct pci_controller *hose)
 {
         memset(hose, 0, sizeof(struct pci_controller));
 
@@ -197,6 +197,65 @@ void __devinit pci_setup_pci_controller(struct pci_controller *hose)
         spin_unlock(&hose_spinlock);
 }
 
+static void add_linux_pci_domain(struct device_node *dev,
+                                 struct pci_controller *phb)
+{
+        struct property *of_prop;
+        unsigned int size;
+
+        of_prop = (struct property *)
+                get_property(dev, "linux,pci-domain", &size);
+        if (of_prop != NULL)
+                return;
+        WARN_ON(of_prop && size < sizeof(int));
+        if (of_prop && size < sizeof(int))
+                of_prop = NULL;
+        size = sizeof(struct property) + sizeof(int);
+        if (of_prop == NULL) {
+                if (mem_init_done)
+                        of_prop = kmalloc(size, GFP_KERNEL);
+                else
+                        of_prop = alloc_bootmem(size);
+        }
+        memset(of_prop, 0, sizeof(struct property));
+        of_prop->name = "linux,pci-domain";
+        of_prop->length = sizeof(int);
+        of_prop->value = (unsigned char *)&of_prop[1];
+        *((int *)of_prop->value) = phb->global_number;
+        prom_add_property(dev, of_prop);
+}
+
+struct pci_controller * pcibios_alloc_controller(struct device_node *dev)
+{
+        struct pci_controller *phb;
+
+        if (mem_init_done)
+                phb = kmalloc(sizeof(struct pci_controller), GFP_KERNEL);
+        else
+                phb = alloc_bootmem(sizeof (struct pci_controller));
+        if (phb == NULL)
+                return NULL;
+        pci_setup_pci_controller(phb);
+        phb->arch_data = dev;
+        phb->is_dynamic = mem_init_done;
+        if (dev)
+                add_linux_pci_domain(dev, phb);
+        return phb;
+}
+
+void pcibios_free_controller(struct pci_controller *phb)
+{
+        if (phb->arch_data) {
+                struct device_node *np = phb->arch_data;
+                int *domain = (int *)get_property(np,
+                                                  "linux,pci-domain", NULL);
+                if (domain)
+                        *domain = -1;
+        }
+        if (phb->is_dynamic)
+                kfree(phb);
+}
+
 static void __init pcibios_claim_one_bus(struct pci_bus *b)
 {
         struct pci_dev *dev;
@@ -907,9 +966,10 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,
          *                      (size depending on dev->n_addr_cells)
          *   cells 4+5 or 5+6:  the size of the range
          */
-        rlen = 0;
-        hose->io_base_phys = 0;
         ranges = (unsigned int *) get_property(dev, "ranges", &rlen);
+        if (ranges == NULL)
+                return;
+        hose->io_base_phys = 0;
         while ((rlen -= np * sizeof(unsigned int)) >= 0) {
                 res = NULL;
                 pci_space = ranges[0];
@@ -1107,6 +1167,8 @@ int remap_bus_range(struct pci_bus *bus)
         
         if (get_bus_io_range(bus, &start_phys, &start_virt, &size))
                 return 1;
+        if (start_phys == 0)
+                return 1;
         printk("mapping IO %lx -> %lx, size: %lx\n", start_phys, start_virt, size);
         if (__ioremap_explicit(start_phys, start_virt, size,
                                _PAGE_NO_CACHE | _PAGE_GUARDED))
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index 0e5a8e116653..60dec2401c26 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -304,75 +304,18 @@ static int __devinit setup_phb(struct device_node *dev,
                                struct pci_controller *phb,
                                unsigned int addr_size_words)
 {
-        pci_setup_pci_controller(phb);
-
         if (is_python(dev))
                 python_countermeasures(dev, addr_size_words);
 
         if (phb_set_bus_ranges(dev, phb))
                 return 1;
 
-        phb->arch_data = dev;
         phb->ops = &rtas_pci_ops;
         phb->buid = get_phb_buid(dev);
 
         return 0;
 }
 
-static void __devinit add_linux_pci_domain(struct device_node *dev,
-                                           struct pci_controller *phb,
-                                           struct property *of_prop)
-{
-        memset(of_prop, 0, sizeof(struct property));
-        of_prop->name = "linux,pci-domain";
-        of_prop->length = sizeof(phb->global_number);
-        of_prop->value = (unsigned char *)&of_prop[1];
-        memcpy(of_prop->value, &phb->global_number, sizeof(phb->global_number));
-        prom_add_property(dev, of_prop);
-}
-
-static struct pci_controller * __init alloc_phb(struct device_node *dev,
-                                                unsigned int addr_size_words)
-{
-        struct pci_controller *phb;
-        struct property *of_prop;
-
-        phb = alloc_bootmem(sizeof(struct pci_controller));
-        if (phb == NULL)
-                return NULL;
-
-        of_prop = alloc_bootmem(sizeof(struct property) +
-                                sizeof(phb->global_number));
-        if (!of_prop)
-                return NULL;
-
-        if (setup_phb(dev, phb, addr_size_words))
-                return NULL;
-
-        add_linux_pci_domain(dev, phb, of_prop);
-
-        return phb;
-}
-
-static struct pci_controller * __devinit alloc_phb_dynamic(struct device_node *dev, unsigned int addr_size_words)
-{
-        struct pci_controller *phb;
-
-        phb = (struct pci_controller *)kmalloc(sizeof(struct pci_controller),
-                                               GFP_KERNEL);
-        if (phb == NULL)
-                return NULL;
-
-        if (setup_phb(dev, phb, addr_size_words))
-                return NULL;
-
-        phb->is_dynamic = 1;
-
-        /* TODO: linux,pci-domain? */
-
-        return phb;
-}
-
 unsigned long __init find_and_init_phbs(void)
 {
         struct device_node *node;
@@ -397,10 +340,10 @@ unsigned long __init find_and_init_phbs(void)
                 if (node->type == NULL || strcmp(node->type, "pci") != 0)
                         continue;
 
-                phb = alloc_phb(node, root_size_cells);
+                phb = pcibios_alloc_controller(node);
                 if (!phb)
                         continue;
-
+                setup_phb(node, phb, root_size_cells);
                 pci_process_bridge_OF_ranges(phb, node, 0);
                 pci_setup_phb_io(phb, index == 0);
 #ifdef CONFIG_PPC_PSERIES
@@ -446,10 +389,10 @@ struct pci_controller * __devinit init_phb_dynamic(struct device_node *dn)
         root_size_cells = prom_n_size_cells(root);
 
         primary = list_empty(&hose_list);
-        phb = alloc_phb_dynamic(dn, root_size_cells);
+        phb = pcibios_alloc_controller(dn);
         if (!phb)
                 return NULL;
-
+        setup_phb(dn, phb, root_size_cells);
         pci_process_bridge_OF_ranges(phb, dn, primary);
 
         pci_setup_phb_io_dynamic(phb, primary);
@@ -505,8 +448,7 @@ int pcibios_remove_root_bus(struct pci_controller *phb)
         }
 
         list_del(&phb->list_node);
-        if (phb->is_dynamic)
-                kfree(phb);
+        pcibios_free_controller(phb);
 
         return 0;
 }