History

PCI: Export pci_dev_lock()

Commit e3a9b1212b9d ("PCI: Export pci_dev_trylock() and pci_dev_unlock()") already exported pci_dev_trylock()/pci_dev_unlock() however in some circumstances such as during error recovery it makes sense to block waiting to get full access to the device so also export pci_dev_lock().

Niklas Schnelle committed 5 years ago

Commit dfd5bb21 parent da995d52 files · +3 −1Browse files

Unified · Split

2 files
  1. drivers/pci/pci.c +2 −1
  2. include/linux/pci.h +1 −0
drivers/pci/pci.c+2−1
@@ -5074,12 +5074,13 @@ static int pci_reset_bus_function(struct pci_dev *dev, bool probe) · 5073 unmodified lines
5074 return pci_parent_bus_reset(dev, probe);5074 return pci_parent_bus_reset(dev, probe);
5075}5075}
5076 5076
5077static void pci_dev_lock(struct pci_dev *dev)5077void pci_dev_lock(struct pci_dev *dev)
5078{5078{
5079 pci_cfg_access_lock(dev);5079 pci_cfg_access_lock(dev);
5080 /* block PM suspend, driver probe, etc. */5080 /* block PM suspend, driver probe, etc. */
5081 device_lock(&dev->dev);5081 device_lock(&dev->dev);
5082}5082}
5083EXPORT_SYMBOL_GPL(pci_dev_lock);
5083 5084
5084/* Return 1 on successful lock, 0 on contention */5085/* Return 1 on successful lock, 0 on contention */
5085int pci_dev_trylock(struct pci_dev *dev)5086int pci_dev_trylock(struct pci_dev *dev)
include/linux/pci.h+1−0
@@ -1664,6 +1664,7 @@ void pci_cfg_access_lock(struct pci_dev *dev); · 1663 unmodified lines
1664bool pci_cfg_access_trylock(struct pci_dev *dev);1664bool pci_cfg_access_trylock(struct pci_dev *dev);
1665void pci_cfg_access_unlock(struct pci_dev *dev);1665void pci_cfg_access_unlock(struct pci_dev *dev);
1666 1666
1667void pci_dev_lock(struct pci_dev *dev);
1667int pci_dev_trylock(struct pci_dev *dev);1668int pci_dev_trylock(struct pci_dev *dev);
1668void pci_dev_unlock(struct pci_dev *dev);1669void pci_dev_unlock(struct pci_dev *dev);
1669 1670

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t