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

PCI/cpcihp: Use hotplug-safe pci_get_domain_bus_and_slot()

Browse Source 
Following code has a race window between pci_find_bus() and pci_get_slot()
if PCI hotplug operation happens between them which removes the pci_bus.
So use PCI hotplug safe interface pci_get_domain_bus_and_slot() instead,
which also reduces code complexity.

    struct pci_bus *pci_bus = pci_find_bus(domain, busno);
    struct pci_dev *pci_dev = pci_get_slot(pci_bus, devfn);

Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Jiang Liu
2012-08-28 23:43:56 +08:00
committed by Bjorn Helgaas
parent f85567c89e
commit a9d18b37e4
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/pci/hotplug/cpcihp_generic.c
View File

@@ -154,12 +154,8 @@ static int __init cpcihp_generic_init(void)
if(!r) if(!r)
return -EBUSY; return -EBUSY;
bus = pci_find_bus(0, bridge_busnr); dev = pci_get_domain_bus_and_slot(0, bridge_busnr,
if (!bus) { PCI_DEVFN(bridge_slot, 0));
err("Invalid bus number %d", bridge_busnr);
return -EINVAL;
}
dev = pci_get_slot(bus, PCI_DEVFN(bridge_slot, 0));
if(!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) { if(!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) {
err("Invalid bridge device %s", bridge); err("Invalid bridge device %s", bridge);
pci_dev_put(dev); pci_dev_put(dev);