diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:36:12 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:36:12 -0500 |
| commit | ef1b5dad5a386885998d11eb45ca7fd183079965 (patch) | |
| tree | f065b28a01dbe57ef28ace9b88dfbf9c2fe49b09 /include/linux/pci.h | |
| parent | Merge branch 'pci/resource-mmap' into next (diff) | |
| parent | ixgbe: Use pcie_flr() instead of duplicating it (diff) | |
| download | linux-dev-ef1b5dad5a386885998d11eb45ca7fd183079965.tar.xz linux-dev-ef1b5dad5a386885998d11eb45ca7fd183079965.zip | |
Merge branch 'pci/virtualization' into next
* pci/virtualization:
ixgbe: Use pcie_flr() instead of duplicating it
IB/hfi1: Use pcie_flr() instead of duplicating it
PCI: Call pcie_flr() from reset_chelsio_generic_dev()
PCI: Call pcie_flr() from reset_intel_82599_sfp_virtfn()
PCI: Export pcie_flr()
PCI: Add sysfs sriov_drivers_autoprobe to control VF driver binding
PCI: Avoid FLR for Intel 82579 NICs
Conflicts:
include/linux/pci.h
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index bbd17d49c947..88185ffcbf47 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -181,6 +181,8 @@ enum pci_dev_flags { PCI_DEV_FLAGS_VPD_REF_F0 = (__force pci_dev_flags_t) (1 << 8), /* a non-root bridge where translation occurs, stop alias search here */ PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT = (__force pci_dev_flags_t) (1 << 9), + /* Do not use FLR even if device advertises PCI_AF_CAP */ + PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10), }; enum pci_irq_reroute_variant { @@ -1037,6 +1039,7 @@ int pcie_get_mps(struct pci_dev *dev); int pcie_set_mps(struct pci_dev *dev, int mps); int pcie_get_minimum_link(struct pci_dev *dev, enum pci_bus_speed *speed, enum pcie_link_width *width); +void pcie_flr(struct pci_dev *dev); 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); |