diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2018-01-31 10:10:30 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-01-31 10:10:30 -0600 |
| commit | 5be31686cf4752443e669f48843eed036c69f999 (patch) | |
| tree | 2b13b1c012f929de0a897f1088c8c330b7e786a4 /include/linux/pci.h | |
| parent | 6b290397afb89ac23f29be30c6637756d256f959 (diff) | |
| parent | 20c3ff6114b0c32beb85d476d7331ad9ab1942e2 (diff) | |
Merge branch 'pci/enumeration' into next
* pci/enumeration:
RDMA/qedr: Use pci_enable_atomic_ops_to_root()
PCI: Add pci_enable_atomic_ops_to_root()
PCI: Make PCI_SCAN_ALL_PCIE_DEVS work for Root as well as Downstream Ports
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index d75d30e55976..22dfaff8bafc 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -2063,6 +2063,7 @@ void pci_request_acs(void); bool pci_acs_enabled(struct pci_dev *pdev, u16 acs_flags); bool pci_acs_path_enabled(struct pci_dev *start, struct pci_dev *end, u16 acs_flags); +int pci_enable_atomic_ops_to_root(struct pci_dev *dev, u32 cap_mask); #define PCI_VPD_LRDT 0x80 /* Large Resource Data Type */ #define PCI_VPD_LRDT_ID(x) ((x) | PCI_VPD_LRDT) |