Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a9d18b37e408b10854e15a918849194a4e089001

Authored by Jiang Liu
Committed by Bjorn Helgaas
1 parent f85567c89e
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

PCI/cpcihp: Use hotplug-safe pci_get_domain_bus_and_slot() 

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>

Showing 1 changed file with 2 additions and 6 deletions Side-by-side Diff

drivers/pci/hotplug/cpcihp_generic.c
Diff comments   View file @ a9d18b3
... ... @@ -154,12 +154,8 @@
154 154 if(!r)
155 155 return -EBUSY;
156 156  
157   - bus = pci_find_bus(0, bridge_busnr);
158   - if (!bus) {
159   - err("Invalid bus number %d", bridge_busnr);
160   - return -EINVAL;
161   - }
162   - dev = pci_get_slot(bus, PCI_DEVFN(bridge_slot, 0));
  157 + dev = pci_get_domain_bus_and_slot(0, bridge_busnr,
  158 + PCI_DEVFN(bridge_slot, 0));
163 159 if(!dev || dev->hdr_type != PCI_HEADER_TYPE_BRIDGE) {
164 160 err("Invalid bridge device %s", bridge);
165 161 pci_dev_put(dev);