3 files changed, 51 insertions, 21 deletions

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index f46914a0f33e..7d22a675fe1a 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1462,6 +1462,8 @@ void pcibios_finish_adding_to_bus(struct pci_bus *bus)
         /* Allocate bus and devices resources */
         pcibios_allocate_bus_resources(bus);
         pcibios_claim_one_bus(bus);
+        if (!pci_has_flag(PCI_PROBE_ONLY))
+                pci_assign_unassigned_bus_resources(bus);
 
         /* Fixup EEH */
         eeh_add_device_tree_late(bus);
diff --git a/arch/powerpc/kernel/pci-hotplug.c b/arch/powerpc/kernel/pci-hotplug.c
index fc0831d4971f..c1e17ae68a08 100644
--- a/arch/powerpc/kernel/pci-hotplug.c
+++ b/arch/powerpc/kernel/pci-hotplug.c
@@ -71,7 +71,7 @@ EXPORT_SYMBOL_GPL(pcibios_remove_pci_devices);
  */
 void pcibios_add_pci_devices(struct pci_bus * bus)
 {
-        int slotno, num, mode, pass, max;
+        int slotno, mode, pass, max;
         struct pci_dev *dev;
         struct device_node *dn = pci_bus_to_OF_node(bus);
 
@@ -85,11 +85,15 @@ void pcibios_add_pci_devices(struct pci_bus * bus)
                 /* use ofdt-based probe */
                 of_rescan_bus(dn, bus);
         } else if (mode == PCI_PROBE_NORMAL) {
-                /* use legacy probe */
+                /*
+                 * Use legacy probe. In the partial hotplug case, we
+                 * probably have grandchildren devices unplugged. So
+                 * we don't check the return value from pci_scan_slot() in
+                 * order for fully rescan all the way down to pick them up.
+                 * They can have been removed during partial hotplug.
+                 */
                 slotno = PCI_SLOT(PCI_DN(dn->child)->devfn);
-                num = pci_scan_slot(bus, PCI_DEVFN(slotno, 0));
-                if (!num)
-                        return;
+                pci_scan_slot(bus, PCI_DEVFN(slotno, 0));
                 pcibios_setup_bus_devices(bus);
                 max = bus->busn_res.start;
                 for (pass = 0; pass < 2; pass++) {
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index 6b0ba5854d99..15d9105323bf 100644
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -230,11 +230,14 @@ void of_scan_pci_bridge(struct pci_dev *dev)
                 return;
         }
 
-        bus = pci_add_new_bus(dev->bus, dev, busrange[0]);
+        bus = pci_find_bus(pci_domain_nr(dev->bus), busrange[0]);
         if (!bus) {
-                printk(KERN_ERR "Failed to create pci bus for %s\n",
-                       node->full_name);
-                return;
+                bus = pci_add_new_bus(dev->bus, dev, busrange[0]);
+                if (!bus) {
+                        printk(KERN_ERR "Failed to create pci bus for %s\n",
+                               node->full_name);
+                        return;
+                }
         }
 
         bus->primary = dev->bus->number;
@@ -292,6 +295,38 @@ void of_scan_pci_bridge(struct pci_dev *dev)
 }
 EXPORT_SYMBOL(of_scan_pci_bridge);
 
+static struct pci_dev *of_scan_pci_dev(struct pci_bus *bus,
+                            struct device_node *dn)
+{
+        struct pci_dev *dev = NULL;
+        const u32 *reg;
+        int reglen, devfn;
+
+        pr_debug("  * %s\n", dn->full_name);
+        if (!of_device_is_available(dn))
+                return NULL;
+
+        reg = of_get_property(dn, "reg", &reglen);
+        if (reg == NULL || reglen < 20)
+                return NULL;
+        devfn = (reg[0] >> 8) & 0xff;
+
+        /* Check if the PCI device is already there */
+        dev = pci_get_slot(bus, devfn);
+        if (dev) {
+                pci_dev_put(dev);
+                return dev;
+        }
+
+        /* create a new pci_dev for this device */
+        dev = of_create_pci_dev(dn, bus, devfn);
+        if (!dev)
+                return NULL;
+
+        pr_debug("  dev header type: %x\n", dev->hdr_type);
+        return dev;
+}
+
 /**
  * __of_scan_bus - given a PCI bus node, setup bus and scan for child devices
  * @node: device tree node for the PCI bus
@@ -302,8 +337,6 @@ static void __of_scan_bus(struct device_node *node, struct pci_bus *bus,
                           int rescan_existing)
 {
         struct device_node *child;
-        const u32 *reg;
-        int reglen, devfn;
         struct pci_dev *dev;
 
         pr_debug("of_scan_bus(%s) bus no %d...\n",
@@ -311,16 +344,7 @@ static void __of_scan_bus(struct device_node *node, struct pci_bus *bus,
 
         /* Scan direct children */
         for_each_child_of_node(node, child) {
-                pr_debug("  * %s\n", child->full_name);
-                if (!of_device_is_available(child))
-                        continue;
-                reg = of_get_property(child, "reg", &reglen);
-                if (reg == NULL || reglen < 20)
-                        continue;
-                devfn = (reg[0] >> 8) & 0xff;
-
-                /* create a new pci_dev for this device */
-                dev = of_create_pci_dev(child, bus, devfn);
+                dev = of_scan_pci_dev(bus, child);
                 if (!dev)
                         continue;
                 pr_debug("    dev header type: %x\n", dev->hdr_type);