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

Commit 9b03088f authored by Yinghai Lu's avatar Yinghai Lu Committed by Jesse Barnes
Browse files

PCI: Make pci_rescan_bus handle add_list 



This allows us to allocate resources to hotplug bridges during
remove/rescan.

We need to move the function to setup-bus.c so it can use
__pci_bus_size_bridges and __pci_bus_assign_resources directly to take
the add_list resource tracking list.

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 2f320521

drivers/pci/probe.c

+0 −32
Original line number Diff line number Diff line
@@ -1691,38 +1691,6 @@ unsigned int __ref pci_rescan_bus_bridge_resize(struct pci_dev *bridge) 
	return max;

}



/**

 * pci_rescan_bus - scan a PCI bus for devices.

 * @bus: PCI bus to scan

 *

 * Scan a PCI bus and child buses for new devices, adds them,

 * and enables them.

 *

 * Returns the max number of subordinate bus discovered.

 */

unsigned int __ref pci_rescan_bus(struct pci_bus *bus)

{

	unsigned int max;

	struct pci_dev *dev;



	max = pci_scan_child_bus(bus);



	down_read(&pci_bus_sem);

	list_for_each_entry(dev, &bus->devices, bus_list)

		if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||

		    dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)

			if (dev->subordinate)

				pci_bus_size_bridges(dev->subordinate);

	up_read(&pci_bus_sem);



	pci_bus_assign_resources(bus);

	pci_enable_bridges(bus);

	pci_bus_add_devices(bus);



	return max;

}

EXPORT_SYMBOL_GPL(pci_rescan_bus);



EXPORT_SYMBOL(pci_add_new_bus);

EXPORT_SYMBOL(pci_scan_slot);

EXPORT_SYMBOL(pci_scan_bridge);

drivers/pci/setup-bus.c

+39 −0
Original line number Diff line number Diff line
@@ -1357,3 +1357,42 @@ void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge) 
	pci_enable_bridges(parent);

}

EXPORT_SYMBOL_GPL(pci_assign_unassigned_bridge_resources);



#ifdef CONFIG_HOTPLUG

/**

 * pci_rescan_bus - scan a PCI bus for devices.

 * @bus: PCI bus to scan

 *

 * Scan a PCI bus and child buses for new devices, adds them,

 * and enables them.

 *

 * Returns the max number of subordinate bus discovered.

 */

unsigned int __ref pci_rescan_bus(struct pci_bus *bus)

{

	unsigned int max;

	struct pci_dev *dev;

	struct resource_list_x add_list; /* list of resources that

					want additional resources */



	max = pci_scan_child_bus(bus);



	add_list.next = NULL;

	down_read(&pci_bus_sem);

	list_for_each_entry(dev, &bus->devices, bus_list)

		if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||

		    dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)

			if (dev->subordinate)

				__pci_bus_size_bridges(dev->subordinate,

							 &add_list);

	up_read(&pci_bus_sem);

	__pci_bus_assign_resources(bus, &add_list, NULL);

	BUG_ON(add_list.next);



	pci_enable_bridges(bus);

	pci_bus_add_devices(bus);



	return max;

}

EXPORT_SYMBOL_GPL(pci_rescan_bus);

#endif