summaryrefslogtreecommitdiffstats
path: root/include/linux/pci.h
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-01-15 10:53:35 -0700
committerBjorn Helgaas <bhelgaas@google.com>2014-01-15 10:53:35 -0700
commit6e2d98dc1af49a6736cd9c54e2e44b5d5234d242 (patch)
treef17178aad8cc3e721c8da14ad439379a03a488ef /include/linux/pci.h
parent40304618468cae5259f77c15511e4feb7bfb624b (diff)
parent890ed578df82f5b7b5a874f9f2fa4f117305df5f (diff)
downloadop-kernel-dev-6e2d98dc1af49a6736cd9c54e2e44b5d5234d242.zip
op-kernel-dev-6e2d98dc1af49a6736cd9c54e2e44b5d5234d242.tar.gz
Merge branch 'pci/reset' into next
* pci/reset: vfio-pci: Use pci "try" reset interface PCI: Add pci_try_reset_function(), pci_try_reset_slot(), pci_try_reset_bus()
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r--include/linux/pci.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 2087e6b..fa959aa 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -949,10 +949,13 @@ int pcie_get_minimum_link(struct pci_dev *dev, enum pci_bus_speed *speed,
int __pci_reset_function(struct pci_dev *dev);
int __pci_reset_function_locked(struct pci_dev *dev);
int pci_reset_function(struct pci_dev *dev);
+int pci_try_reset_function(struct pci_dev *dev);
int pci_probe_reset_slot(struct pci_slot *slot);
int pci_reset_slot(struct pci_slot *slot);
+int pci_try_reset_slot(struct pci_slot *slot);
int pci_probe_reset_bus(struct pci_bus *bus);
int pci_reset_bus(struct pci_bus *bus);
+int pci_try_reset_bus(struct pci_bus *bus);
void pci_reset_bridge_secondary_bus(struct pci_dev *dev);
void pci_update_resource(struct pci_dev *dev, int resno);
int __must_check pci_assign_resource(struct pci_dev *dev, int i);
OpenPOWER on IntegriCloud