Skip to content

Commit dfd5bb2

Browse files
niklas88Vasily Gorbik
authored andcommitted
PCI: Export pci_dev_lock()
Commit e3a9b12 ("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(). Link: https://lore.kernel.org/all/20210928181014.GA713179@bhelgaas/ Acked-by: Pierre Morel <[email protected]> Acked-by: Bjorn Helgaas <[email protected]> Signed-off-by: Niklas Schnelle <[email protected]> Signed-off-by: Vasily Gorbik <[email protected]>
1 parent da995d5 commit dfd5bb2

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

drivers/pci/pci.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5074,12 +5074,13 @@ static int pci_reset_bus_function(struct pci_dev *dev, bool probe)
50745074
return pci_parent_bus_reset(dev, probe);
50755075
}
50765076

5077-
static void pci_dev_lock(struct pci_dev *dev)
5077+
void pci_dev_lock(struct pci_dev *dev)
50785078
{
50795079
pci_cfg_access_lock(dev);
50805080
/* block PM suspend, driver probe, etc. */
50815081
device_lock(&dev->dev);
50825082
}
5083+
EXPORT_SYMBOL_GPL(pci_dev_lock);
50835084

50845085
/* Return 1 on successful lock, 0 on contention */
50855086
int pci_dev_trylock(struct pci_dev *dev)

include/linux/pci.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1664,6 +1664,7 @@ void pci_cfg_access_lock(struct pci_dev *dev);
16641664
bool pci_cfg_access_trylock(struct pci_dev *dev);
16651665
void pci_cfg_access_unlock(struct pci_dev *dev);
16661666

1667+
void pci_dev_lock(struct pci_dev *dev);
16671668
int pci_dev_trylock(struct pci_dev *dev);
16681669
void pci_dev_unlock(struct pci_dev *dev);
16691670

0 commit comments

Comments
 (0)