diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-09-02 14:56:43 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-09-02 14:56:43 -0500 |
| commit | 1295d187abfb80514240ea3179b722a2d8f7871d (patch) | |
| tree | f88a0364e5bcbd9768e4f057b1113fde76a17584 /drivers/pci/pci.c | |
| parent | 9045f63e67bc91f02be245346fff9fb9703e7a3c (diff) | |
| parent | 7cae7849fccee81c20072e3fc9102107837263f3 (diff) | |
Merge branch 'pci/virtualization'
- Add ACS quirks for NXP LX2xx0 and LX2xx2 platforms (Wasim Khan)
- Add ACS quirks for Cavium multi-function devices (George Cherian)
- Enforce pci=noats with Transaction Blocking (Alex Williamson)
* pci/virtualization:
PCI/ACS: Enforce pci=noats with Transaction Blocking
PCI: Add ACS quirks for Cavium multi-function devices
PCI: Add ACS quirks for NXP LX2xx0 and LX2xx2 platforms
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 8e594c3a0e4d..c3f6ff3bd2af 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -925,8 +925,8 @@ static void pci_std_enable_acs(struct pci_dev *dev) /* Upstream Forwarding */ ctrl |= (cap & PCI_ACS_UF); - /* Enable Translation Blocking for external devices */ - if (dev->external_facing || dev->untrusted) + /* Enable Translation Blocking for external devices and noats */ + if (pci_ats_disabled() || dev->external_facing || dev->untrusted) ctrl |= (cap & PCI_ACS_TB); pci_write_config_word(dev, pos + PCI_ACS_CTRL, ctrl); |