Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ef6f0e3 authored by Rajesh Shah's avatar Rajesh Shah Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarRajesh Shah <rajesh.shah@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e4ea9bb7

drivers/pci/bus.c

+7 −4
Original line number Diff line number Diff line
@@ -121,10 +121,13 @@ void __devinit pci_bus_add_devices(struct pci_bus *bus) 
		 * If there is an unattached subordinate bus, attach

		 * it and then scan for unattached PCI devices.

		 */

		if (dev->subordinate && list_empty(&dev->subordinate->node)) {

		if (dev->subordinate) {

		       if (list_empty(&dev->subordinate->node)) {

			       spin_lock(&pci_bus_lock);

			list_add_tail(&dev->subordinate->node, &dev->bus->children);

			       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");

drivers/pci/probe.c

+2 −2
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max 
			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;
@@ -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 */

		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)