From akpm@osdl.org Thu Apr 28 00:27:52 2005
Subject: [patch 07/20] acpi bridge hotadd: Link newly created pci child bus to its parent on creation
To: greg@kroah.com
Cc: akpm@osdl.org, rajesh.shah@intel.com
From: akpm@osdl.org
Date: Thu, 28 Apr 2005 00:25:49 -0700
From: Rajesh Shah <rajesh.shah@intel.com>
When a pci child bus is created, add it to the parent's children list
immediately rather than waiting till pci_bus_add_devices(). For hot-plug
bridges/devices, pci_bus_add_devices() may be called much later, after they
have been properly configured. In the meantime, this allows us to use the
normal pci bus search functions for the hot-plug bridges/buses.
Signed-off-by: Rajesh Shah <rajesh.shah@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/pci/bus.c | 11 +++++++----
drivers/pci/probe.c | 4 ++--
2 files changed, 9 insertions(+), 6 deletions(-)
--- gregkh-2.6.orig/drivers/pci/bus.c 2005-05-03 22:13:51.000000000 -0700
+++ gregkh-2.6/drivers/pci/bus.c 2005-05-03 22:28:27.000000000 -0700
@@ -153,10 +153,13 @@
* If there is an unattached subordinate bus, attach
* it and then scan for unattached PCI devices.
*/
- if (dev->subordinate && list_empty(&dev->subordinate->node)) {
- spin_lock(&pci_bus_lock);
- list_add_tail(&dev->subordinate->node, &dev->bus->children);
- spin_unlock(&pci_bus_lock);
+ if (dev->subordinate) {
+ if (list_empty(&dev->subordinate->node)) {
+ spin_lock(&pci_bus_lock);
+ list_add_tail(&dev->subordinate->node,
+ &dev->bus->children);
+ spin_unlock(&pci_bus_lock);
+ }
pci_bus_add_devices(dev->subordinate);
sysfs_create_link(&dev->subordinate->class_dev.kobj, &dev->dev.kobj, "bridge");
--- gregkh-2.6.orig/drivers/pci/probe.c 2005-05-03 22:28:25.000000000 -0700
+++ gregkh-2.6/drivers/pci/probe.c 2005-05-03 22:28:27.000000000 -0700
@@ -446,7 +446,7 @@
return max;
}
- child = pci_alloc_child_bus(bus, dev, busnr);
+ child = pci_add_new_bus(bus, dev, busnr);
if (!child)
return max;
child->primary = buses & 0xFF;
@@ -473,7 +473,7 @@
* This can happen when a bridge is hot-plugged */
if (pci_find_bus(pci_domain_nr(bus), max+1))
return max;
- child = pci_alloc_child_bus(bus, dev, ++max);
+ child = pci_add_new_bus(bus, dev, ++max);
buses = (buses & 0xff000000)
| ((unsigned int)(child->primary) << 0)
| ((unsigned int)(child->secondary) << 8)