diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2022-05-24 16:42:23 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2022-05-24 16:42:23 -0500 |
| commit | 8d8b2669f98e8276ce0c26f5d9562a8ace2f9744 (patch) | |
| tree | 64ca729a2bdce17ab86a26e3980c6458d67f357d /drivers/pci/pci.c | |
| parent | Merge branch 'pci/resource' (diff) | |
| parent | PCI: Avoid pci_dev_lock() AB/BA deadlock with sriov_numvfs_store() (diff) | |
| download | linux-dev-8d8b2669f98e8276ce0c26f5d9562a8ace2f9744.tar.xz linux-dev-8d8b2669f98e8276ce0c26f5d9562a8ace2f9744.zip | |
Merge branch 'pci/virtualization'
- Avoid pci_dev_lock() AB/BA deadlock with sriov_numvfs_store() (Yicong
Yang, Jay Zhou)
* pci/virtualization:
PCI: Avoid pci_dev_lock() AB/BA deadlock with sriov_numvfs_store()
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index df886098bd60..eb7c0a08ff57 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -5150,19 +5150,19 @@ static int pci_reset_bus_function(struct pci_dev *dev, bool probe) void pci_dev_lock(struct pci_dev *dev) { - pci_cfg_access_lock(dev); /* block PM suspend, driver probe, etc. */ device_lock(&dev->dev); + pci_cfg_access_lock(dev); } EXPORT_SYMBOL_GPL(pci_dev_lock); /* Return 1 on successful lock, 0 on contention */ int pci_dev_trylock(struct pci_dev *dev) { - if (pci_cfg_access_trylock(dev)) { - if (device_trylock(&dev->dev)) + if (device_trylock(&dev->dev)) { + if (pci_cfg_access_trylock(dev)) return 1; - pci_cfg_access_unlock(dev); + device_unlock(&dev->dev); } return 0; @@ -5171,8 +5171,8 @@ EXPORT_SYMBOL_GPL(pci_dev_trylock); void pci_dev_unlock(struct pci_dev *dev) { - device_unlock(&dev->dev); pci_cfg_access_unlock(dev); + device_unlock(&dev->dev); } EXPORT_SYMBOL_GPL(pci_dev_unlock); |