iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCI: Introduce pci_rescan_bus()

Browse Source 
This API is used by the PCI core to rescan a bus and rediscover
newly added devices.

Over time, it is expected that the various PCI hotplug drivers
will migrate to this interface and away from the old
pci_do_scan_bus() interface.

Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Alex Chiang 2009-03-20 14:56:25 -06:00 committed by Jesse Barnes
parent 9dd90cafa7
commit 3ed4fd96b3
3 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pci/hotplug/fakephp.c
View File

@ -245,12 +245,12 @@ static int pci_rescan_slot(struct pci_dev *temp)
/** /**
* pci_rescan_bus - Rescan PCI bus * pci_rescan_bus_local - fakephp version of rescan PCI bus
* @bus: the PCI bus to rescan * @bus: the PCI bus to rescan
* *
* Call pci_rescan_slot for each possible function of the bus. * Call pci_rescan_slot for each possible function of the bus.
*/ */
static void pci_rescan_bus(const struct pci_bus *bus) static void pci_rescan_bus_local(const struct pci_bus *bus)
{ {
unsigned int devfn; unsigned int devfn;
struct pci_dev *dev; struct pci_dev *dev;
@ -291,7 +291,7 @@ static void pci_rescan_buses(const struct list_head *list)
const struct list_head *l; const struct list_head *l;
list_for_each(l,list) { list_for_each(l,list) {
const struct pci_bus *b = pci_bus_b(l); const struct pci_bus *b = pci_bus_b(l);
pci_rescan_bus(b); pci_rescan_bus_local(b);
pci_rescan_buses(&b->children); pci_rescan_buses(&b->children);
} }
} }

32
drivers/pci/probe.c
View File

@ -1212,6 +1212,38 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent,
EXPORT_SYMBOL(pci_scan_bus_parented); EXPORT_SYMBOL(pci_scan_bus_parented);
#ifdef CONFIG_HOTPLUG #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 __devinit pci_rescan_bus(struct pci_bus *bus)
{
unsigned int max;
struct pci_dev *dev;
max = pci_scan_child_bus(bus);
up_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);
down_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_add_new_bus);
EXPORT_SYMBOL(pci_scan_slot); EXPORT_SYMBOL(pci_scan_slot);
EXPORT_SYMBOL(pci_scan_bridge); EXPORT_SYMBOL(pci_scan_bridge);

3
include/linux/pci.h
View File

@ -726,6 +726,9 @@ int pci_back_from_sleep(struct pci_dev *dev);
/* Functions for PCI Hotplug drivers to use */ /* Functions for PCI Hotplug drivers to use */
int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap); int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap);
#ifdef CONFIG_HOTPLUG
unsigned int pci_rescan_bus(struct pci_bus *bus);
#endif
/* Vital product data routines */ /* Vital product data routines */
ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf); ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf);