diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:33:15 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-04-28 10:33:15 -0500 |
commit | 1154768ad342cc3ad295340130c1fad6869effa9 (patch) | |
tree | 877f93098d09b70799ede33a5ef6a82cddfa50dc /include | |
parent | 95773672830d49ed6202bfa47cbb752823c96593 (diff) | |
parent | cd183740480f045600aa1fa38fe70809b5498f05 (diff) | |
download | lwn-1154768ad342cc3ad295340130c1fad6869effa9.tar.gz lwn-1154768ad342cc3ad295340130c1fad6869effa9.zip |
Merge branch 'pci/host-thunder' into next
* pci/host-thunder:
PCI/ACPI: Add ThunderX pass2.x 2nd node MCFG quirk
PCI/ACPI: Tidy up MCFG quirk whitespace
PCI: Avoid generating invalid ThunderX2 DMA aliases
PCI: Add device flag PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT
PCI: Apply Cavium ACS quirk only to CN81xx/CN83xx/CN88xx devices
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index eb3da1a04e6c..3f596acc05be 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -178,6 +178,8 @@ enum pci_dev_flags { PCI_DEV_FLAGS_NO_PM_RESET = (__force pci_dev_flags_t) (1 << 7), /* Get VPD from function 0 VPD */ 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), }; enum pci_irq_reroute_variant { |