diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-15 14:58:58 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-08-15 14:58:58 -0500 |
commit | c689209be23166b340c224df8ecd5deea163da56 (patch) | |
tree | 3e7a5ec634d0db624644a79c08e983e38d3ad736 /include/linux/pci.h | |
parent | eadf3d3209435faa500a8e39ff6181c41ecea29d (diff) | |
parent | 10dbc9fedcf151ab794f5e22d4f34f1eff01a08f (diff) | |
download | linux-stable-c689209be23166b340c224df8ecd5deea163da56.tar.gz linux-stable-c689209be23166b340c224df8ecd5deea163da56.tar.bz2 linux-stable-c689209be23166b340c224df8ecd5deea163da56.zip |
Merge branch 'pci/peer-to-peer'
- Add "pci=disable_acs_redir=" parameter to disable ACS redirection for
peer-to-peer DMA support (we don't have the peer-to-peer support yet;
this is just one piece) (Logan Gunthorpe)
* pci/peer-to-peer:
PCI: Add ACS Redirect disable quirk for Intel Sunrise Point
PCI: Add device-specific ACS Redirect disable infrastructure
PCI: Convert device-specific ACS quirks from NULL termination to ARRAY_SIZE
PCI: Add "pci=disable_acs_redir=" parameter for peer-to-peer support
PCI: Allow specifying devices using a base bus and path of devfns
PCI: Make specifying PCI devices in kernel parameters reusable
PCI: Hide ACS quirk declarations inside PCI core
Diffstat (limited to 'include/linux/pci.h')
-rw-r--r-- | include/linux/pci.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index b37f2734f9a2..3dd5b871b895 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1890,20 +1890,9 @@ enum pci_fixup_pass { #ifdef CONFIG_PCI_QUIRKS void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev); -int pci_dev_specific_acs_enabled(struct pci_dev *dev, u16 acs_flags); -int pci_dev_specific_enable_acs(struct pci_dev *dev); #else static inline void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev) { } -static inline int pci_dev_specific_acs_enabled(struct pci_dev *dev, - u16 acs_flags) -{ - return -ENOTTY; -} -static inline int pci_dev_specific_enable_acs(struct pci_dev *dev) -{ - return -ENOTTY; -} #endif void __iomem *pcim_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen); |