9 files changed, 85 insertions, 124 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 806c44fa645a..395c67d3d296 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -100,11 +100,11 @@ static int post_dock_fixups(struct notifier_block *nb, unsigned long val,
                         PCI_PRIMARY_BUS,
                         &buses);
 
-        if (((buses >> 8) & 0xff) != bus->secondary) {
+        if (((buses >> 8) & 0xff) != bus->busn_res.start) {
                 buses = (buses & 0xff000000)
                         | ((unsigned int)(bus->primary)     <<  0)
-                        | ((unsigned int)(bus->secondary)   <<  8)
-                        | ((unsigned int)(bus->subordinate) << 16);
+                        | ((unsigned int)(bus->busn_res.start)   <<  8)
+                        | ((unsigned int)(bus->busn_res.end) << 16);
                 pci_write_config_dword(bus->self, PCI_PRIMARY_BUS, buses);
         }
         return NOTIFY_OK;
@@ -132,6 +132,15 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
         if (!acpi_pci_check_ejectable(pbus, handle) && !is_dock_device(handle))
                 return AE_OK;
 
+        status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr);
+        if (ACPI_FAILURE(status)) {
+                warn("can't evaluate _ADR (%#x)\n", status);
+                return AE_OK;
+        }
+
+        device = (adr >> 16) & 0xffff;
+        function = adr & 0xffff;
+
         pdev = pbus->self;
         if (pdev && pci_is_pcie(pdev)) {
                 tmp = acpi_find_root_bridge_handle(pdev);
@@ -144,10 +153,6 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
                 }
         }
 
-        acpi_evaluate_integer(handle, "_ADR", NULL, &adr);
-        device = (adr >> 16) & 0xffff;
-        function = adr & 0xffff;
-
         newfunc = kzalloc(sizeof(struct acpiphp_func), GFP_KERNEL);
         if (!newfunc)
                 return AE_NO_MEMORY;
@@ -692,7 +697,7 @@ static unsigned char acpiphp_max_busnr(struct pci_bus *bus)
          * bus->subordinate value because it could have
          * padding in it.
          */
-        max = bus->secondary;
+        max = bus->busn_res.start;
 
         list_for_each(tmp, &bus->children) {
                 n = pci_bus_max_busnr(pci_bus_b(tmp));
@@ -878,6 +883,24 @@ static void disable_bridges(struct pci_bus *bus)
         }
 }
 
+/* return first device in slot, acquiring a reference on it */
+static struct pci_dev *dev_in_slot(struct acpiphp_slot *slot)
+{
+        struct pci_bus *bus = slot->bridge->pci_bus;
+        struct pci_dev *dev;
+        struct pci_dev *ret = NULL;
+
+        down_read(&pci_bus_sem);
+        list_for_each_entry(dev, &bus->devices, bus_list)
+                if (PCI_SLOT(dev->devfn) == slot->device) {
+                        ret = pci_dev_get(dev);
+                        break;
+                }
+        up_read(&pci_bus_sem);
+
+        return ret;
+}
+
 /**
  * disable_device - disable a slot
  * @slot: ACPI PHP slot
@@ -893,6 +916,7 @@ static int disable_device(struct acpiphp_slot *slot)
         pdev = pci_get_slot(bus, PCI_DEVFN(slot->device, 0));
         if (!pdev)
                 goto err_exit;
+        pci_dev_put(pdev);
 
         list_for_each_entry(func, &slot->funcs, sibling) {
                 if (func->bridge) {
@@ -901,18 +925,22 @@ static int disable_device(struct acpiphp_slot *slot)
                                                 (u32)1, NULL, NULL);
                         func->bridge = NULL;
                 }
+        }
 
-                pdev = pci_get_slot(slot->bridge->pci_bus,
-                                    PCI_DEVFN(slot->device, func->function));
-                if (pdev) {
-                        pci_stop_bus_device(pdev);
-                        if (pdev->subordinate) {
-                                disable_bridges(pdev->subordinate);
-                                pci_disable_device(pdev);
-                        }
-                        __pci_remove_bus_device(pdev);
-                        pci_dev_put(pdev);
+        /*
+         * enable_device() enumerates all functions in this device via
+         * pci_scan_slot(), whether they have associated ACPI hotplug
+         * methods (_EJ0, etc.) or not.  Therefore, we remove all functions
+         * here.
+         */
+        while ((pdev = dev_in_slot(slot))) {
+                pci_stop_bus_device(pdev);
+                if (pdev->subordinate) {
+                        disable_bridges(pdev->subordinate);
+                        pci_disable_device(pdev);
                 }
+                __pci_remove_bus_device(pdev);
+                pci_dev_put(pdev);
         }
 
         list_for_each_entry(func, &slot->funcs, sibling) {
diff --git a/drivers/pci/hotplug/cpci_hotplug_pci.c b/drivers/pci/hotplug/cpci_hotplug_pci.c
index ae853ccd0cd5..dcc75c785443 100644
--- a/drivers/pci/hotplug/cpci_hotplug_pci.c
+++ b/drivers/pci/hotplug/cpci_hotplug_pci.c
@@ -285,42 +285,19 @@ int __ref cpci_configure_slot(struct slot *slot)
         for (fn = 0; fn < 8; fn++) {
                 struct pci_dev *dev;
 
-                dev = pci_get_slot(parent, PCI_DEVFN(PCI_SLOT(slot->devfn), fn));
+                dev = pci_get_slot(parent,
+                                   PCI_DEVFN(PCI_SLOT(slot->devfn), fn));
                 if (!dev)
                         continue;
                 if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||
-                    (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) {
-                        /* Find an unused bus number for the new bridge */
-                        struct pci_bus *child;
-                        unsigned char busnr, start = parent->secondary;
-                        unsigned char end = parent->subordinate;
-
-                        for (busnr = start; busnr <= end; busnr++) {
-                                if (!pci_find_bus(pci_domain_nr(parent),
-                                                  busnr))
-                                        break;
-                        }
-                        if (busnr >= end) {
-                                err("No free bus for hot-added bridge\n");
-                                pci_dev_put(dev);
-                                continue;
-                        }
-                        child = pci_add_new_bus(parent, dev, busnr);
-                        if (!child) {
-                                err("Cannot add new bus for %s\n",
-                                    pci_name(dev));
-                                pci_dev_put(dev);
-                                continue;
-                        }
-                        child->subordinate = pci_do_scan_bus(child);
-                        pci_bus_size_bridges(child);
-                }
+                    (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS))
+                        pci_hp_add_bridge(dev);
                 pci_dev_put(dev);
         }
 
-        pci_bus_assign_resources(parent);
+        pci_assign_unassigned_bridge_resources(parent->self);
+
         pci_bus_add_devices(parent);
-        pci_enable_bridges(parent);
 
         dbg("%s - exit", __func__);
         return 0;
diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c
index 1c8494021a42..09801c6945ce 100644
--- a/drivers/pci/hotplug/cpqphp_pci.c
+++ b/drivers/pci/hotplug/cpqphp_pci.c
@@ -83,7 +83,6 @@ static void __iomem *detect_HRT_floating_pointer(void __iomem *begin, void __iom
 
 int cpqhp_configure_device (struct controller* ctrl, struct pci_func* func)
 {
-        unsigned char bus;
         struct pci_bus *child;
         int num;
 
@@ -106,9 +105,10 @@ int cpqhp_configure_device (struct controller* ctrl, struct pci_func* func)
         }
 
         if (func->pci_dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
-                pci_read_config_byte(func->pci_dev, PCI_SECONDARY_BUS, &bus);
-                child = (struct pci_bus*) pci_add_new_bus(func->pci_dev->bus, (func->pci_dev), bus);
-                pci_do_scan_bus(child);
+                pci_hp_add_bridge(func->pci_dev);
+                child = func->pci_dev->subordinate;
+                if (child)
+                        pci_bus_add_devices(child);
         }
 
         pci_dev_put(func->pci_dev);
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index 4fda7e6a86a7..7dccad5fc891 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -775,7 +775,6 @@ static u8 bus_structure_fixup(u8 busno)
 
 static int ibm_configure_device(struct pci_func *func)
 {
-        unsigned char bus;
         struct pci_bus *child;
         int num;
         int flag = 0;   /* this is to make sure we don't double scan the bus,
@@ -805,9 +804,10 @@ static int ibm_configure_device(struct pci_func *func)
                 }
         }
         if (!(flag) && (func->dev->hdr_type == PCI_HEADER_TYPE_BRIDGE)) {
-                pci_read_config_byte(func->dev, PCI_SECONDARY_BUS, &bus);
-                child = pci_add_new_bus(func->dev->bus, func->dev, bus);
-                pci_do_scan_bus(child);
+                pci_hp_add_bridge(func->dev);
+                child = func->dev->subordinate;
+                if (child)
+                        pci_bus_add_devices(child);
         }
 
         return 0;
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c
index 47d9dc06b109..09cecaf450c5 100644
--- a/drivers/pci/hotplug/pciehp_pci.c
+++ b/drivers/pci/hotplug/pciehp_pci.c
@@ -34,29 +34,6 @@
 #include "../pci.h"
 #include "pciehp.h"
 
-static int __ref pciehp_add_bridge(struct pci_dev *dev)
-{
-        struct pci_bus *parent = dev->bus;
-        int pass, busnr, start = parent->secondary;
-        int end = parent->subordinate;
-
-        for (busnr = start; busnr <= end; busnr++) {
-                if (!pci_find_bus(pci_domain_nr(parent), busnr))
-                        break;
-        }
-        if (busnr-- > end) {
-                err("No bus number available for hot-added bridge %s\n",
-                                pci_name(dev));
-                return -1;
-        }
-        for (pass = 0; pass < 2; pass++)
-                busnr = pci_scan_bridge(parent, dev, busnr, pass);
-        if (!dev->subordinate)
-                return -1;
-
-        return 0;
-}
-
 int pciehp_configure_device(struct slot *p_slot)
 {
         struct pci_dev *dev;
@@ -85,9 +62,8 @@ int pciehp_configure_device(struct slot *p_slot)
                 if (!dev)
                         continue;
                 if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||
-                                (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) {
-                        pciehp_add_bridge(dev);
-                }
+                                (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS))
+                        pci_hp_add_bridge(dev);
                 pci_dev_put(dev);
         }
 
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index de573113c102..f64ca92253da 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -397,13 +397,11 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
                         else
                                 sn_io_slot_fixup(dev);
                         if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
-                                unsigned char sec_bus;
-                                pci_read_config_byte(dev, PCI_SECONDARY_BUS,
-                                                     &sec_bus);
-                                new_bus = pci_add_new_bus(dev->bus, dev,
-                                                          sec_bus);
-                                pci_scan_child_bus(new_bus);
-                                new_ppb = 1;
+                                pci_hp_add_bridge(dev);
+                                if (dev->subordinate) {
+                                        new_bus = dev->subordinate;
+                                        new_ppb = 1;
+                                }
                         }
                         pci_dev_put(dev);
                 }
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c
index b00b09bdd38a..f9b5a52e4115 100644
--- a/drivers/pci/hotplug/shpchp_ctrl.c
+++ b/drivers/pci/hotplug/shpchp_ctrl.c
@@ -262,9 +262,6 @@ static int board_added(struct slot *p_slot)
         }
 
         if ((ctrl->pci_dev->vendor == 0x8086) && (ctrl->pci_dev->device == 0x0332)) {
-                if (slots_not_empty)
-                        return WRONG_BUS_FREQUENCY;
-
                 if ((rc = p_slot->hpc_ops->set_bus_speed_mode(p_slot, PCI_SPEED_33MHz))) {
                         ctrl_err(ctrl, "%s: Issue of set bus speed mode command"
                                  " failed\n", __func__);
diff --git a/drivers/pci/hotplug/shpchp_pci.c b/drivers/pci/hotplug/shpchp_pci.c
index df7e4bfadae3..c627ed9957d1 100644
--- a/drivers/pci/hotplug/shpchp_pci.c
+++ b/drivers/pci/hotplug/shpchp_pci.c
@@ -37,9 +37,10 @@
 int __ref shpchp_configure_device(struct slot *p_slot)
 {
         struct pci_dev *dev;
-        struct pci_bus *parent = p_slot->ctrl->pci_dev->subordinate;
-        int num, fn;
         struct controller *ctrl = p_slot->ctrl;
+        struct pci_dev *bridge = ctrl->pci_dev;
+        struct pci_bus *parent = bridge->subordinate;
+        int num, fn;
 
         dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, 0));
         if (dev) {
@@ -61,39 +62,23 @@ int __ref shpchp_configure_device(struct slot *p_slot)
                 if (!dev)
                         continue;
                 if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||
-                                (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) {
-                        /* Find an unused bus number for the new bridge */
-                        struct pci_bus *child;
-                        unsigned char busnr, start = parent->secondary;
-                        unsigned char end = parent->subordinate;
-                        for (busnr = start; busnr <= end; busnr++) {
-                                if (!pci_find_bus(pci_domain_nr(parent),
-                                                        busnr))
-                                        break;
-                        }
-                        if (busnr > end) {
-                                ctrl_err(ctrl,
-                                         "No free bus for hot-added bridge\n");
-                                pci_dev_put(dev);
-                                continue;
-                        }
-                        child = pci_add_new_bus(parent, dev, busnr);
-                        if (!child) {
-                                ctrl_err(ctrl, "Cannot add new bus for %s\n",
-                                         pci_name(dev));
-                                pci_dev_put(dev);
-                                continue;
-                        }
-                        child->subordinate = pci_do_scan_bus(child);
-                        pci_bus_size_bridges(child);
-                }
+                    (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS))
+                        pci_hp_add_bridge(dev);
+                pci_dev_put(dev);
+        }
+
+        pci_assign_unassigned_bridge_resources(bridge);
+
+        for (fn = 0; fn < 8; fn++) {
+                dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, fn));
+                if (!dev)
+                        continue;
                 pci_configure_slot(dev);
                 pci_dev_put(dev);
         }
 
-        pci_bus_assign_resources(parent);
         pci_bus_add_devices(parent);
-        pci_enable_bridges(parent);
+
         return 0;
 }
 
diff --git a/drivers/pci/hotplug/shpchp_sysfs.c b/drivers/pci/hotplug/shpchp_sysfs.c
index efa30da1ae8f..eeb23ceae4a8 100644
--- a/drivers/pci/hotplug/shpchp_sysfs.c
+++ b/drivers/pci/hotplug/shpchp_sysfs.c
@@ -73,13 +73,13 @@ static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, cha
                 }
         }
         out += sprintf(out, "Free resources: bus numbers\n");
-        for (busnr = bus->secondary; busnr <= bus->subordinate; busnr++) {
+        for (busnr = bus->busn_res.start; busnr <= bus->busn_res.end; busnr++) {
                 if (!pci_find_bus(pci_domain_nr(bus), busnr))
                         break;
         }
-        if (busnr < bus->subordinate)
+        if (busnr < bus->busn_res.end)
                 out += sprintf(out, "start = %8.8x, length = %8.8x\n",
-                                busnr, (bus->subordinate - busnr));
+                                busnr, (int)(bus->busn_res.end - busnr));
 
         return out - buf;
 }