GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] acpi bridge hotadd: Link newly created pci child bus to its parent on creation

Browse source 
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>
This commit is contained in:
Rajesh Shah 2005-04-28 00:25:49 -07:00 • committed by Greg Kroah-Hartman
parent e4ea9bb7e9
commit 6ef6f0e33c
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/pci/bus.c
View file

@ -121,10 +121,13 @@ void __devinit pci_bus_add_devices(struct pci_bus *bus)
* If there is an unattached subordinate bus, attach * If there is an unattached subordinate bus, attach
* it and then scan for unattached PCI devices. * it and then scan for unattached PCI devices.
*/ */
if (dev->subordinate && list_empty(&dev->subordinate->node)) { if (dev->subordinate) {
spin_lock(&pci_bus_lock); if (list_empty(&dev->subordinate->node)) {
list_add_tail(&dev->subordinate->node, &dev->bus->children); spin_lock(&pci_bus_lock);
spin_unlock(&pci_bus_lock); list_add_tail(&dev->subordinate->node,
&dev->bus->children);
spin_unlock(&pci_bus_lock);
}
pci_bus_add_devices(dev->subordinate); pci_bus_add_devices(dev->subordinate);
sysfs_create_link(&dev->subordinate->class_dev.kobj, &dev->dev.kobj, "bridge"); sysfs_create_link(&dev->subordinate->class_dev.kobj, &dev->dev.kobj, "bridge");

4
drivers/pci/probe.c
View file

@ -450,7 +450,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
return max; return max;
} }
child = pci_alloc_child_bus(bus, dev, busnr); child = pci_add_new_bus(bus, dev, busnr);
if (!child) if (!child)
return max; return max;
child->primary = buses & 0xFF; child->primary = buses & 0xFF;
@ -477,7 +477,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max
* This can happen when a bridge is hot-plugged */ * This can happen when a bridge is hot-plugged */
if (pci_find_bus(pci_domain_nr(bus), max+1)) if (pci_find_bus(pci_domain_nr(bus), max+1))
return max; return max;
child = pci_alloc_child_bus(bus, dev, ++max); child = pci_add_new_bus(bus, dev, ++max);
buses = (buses & 0xff000000) buses = (buses & 0xff000000)
| ((unsigned int)(child->primary) << 0) | ((unsigned int)(child->primary) << 0)
| ((unsigned int)(child->secondary) << 8) | ((unsigned int)(child->secondary) << 8)