diff options
Diffstat (limited to 'add-acs-overrides.patch')
| -rw-r--r-- | add-acs-overrides.patch | 82 |
1 files changed, 13 insertions, 69 deletions
diff --git a/add-acs-overrides.patch b/add-acs-overrides.patch index 31ef973665e6..2a54b7746638 100644 --- a/add-acs-overrides.patch +++ b/add-acs-overrides.patch @@ -1,61 +1,8 @@ -From 0457fc4aaca4bc954154347b209d1da78ba7f2d7 Mon Sep 17 00:00:00 2001 -From: Mark Weiman <mark.weiman@markzz.com> -Date: Wed, 7 Feb 2018 16:04:03 -0500 -Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.15) - -This an updated version of Alex Williamson's patch from: -https://lkml.org/lkml/2013/5/30/513 - -Original commit message follows: ---- -PCIe ACS (Access Control Services) is the PCIe 2.0+ feature that -allows us to control whether transactions are allowed to be redirected -in various subnodes of a PCIe topology. For instance, if two -endpoints are below a root port or downsteam switch port, the -downstream port may optionally redirect transactions between the -devices, bypassing upstream devices. The same can happen internally -on multifunction devices. The transaction may never be visible to the -upstream devices. - -One upstream device that we particularly care about is the IOMMU. If -a redirection occurs in the topology below the IOMMU, then the IOMMU -cannot provide isolation between devices. This is why the PCIe spec -encourages topologies to include ACS support. Without it, we have to -assume peer-to-peer DMA within a hierarchy can bypass IOMMU isolation. - -Unfortunately, far too many topologies do not support ACS to make this -a steadfast requirement. Even the latest chipsets from Intel are only -sporadically supporting ACS. We have trouble getting interconnect -vendors to include the PCIe spec required PCIe capability, let alone -suggested features. - -Therefore, we need to add some flexibility. The pcie_acs_override= -boot option lets users opt-in specific devices or sets of devices to -assume ACS support. The "downstream" option assumes full ACS support -on root ports and downstream switch ports. The "multifunction" -option assumes the subset of ACS features available on multifunction -endpoints and upstream switch ports are supported. The "id:nnnn:nnnn" -option enables ACS support on devices matching the provided vendor -and device IDs, allowing more strategic ACS overrides. These options -may be combined in any order. A maximum of 16 id specific overrides -are available. It's suggested to use the most limited set of options -necessary to avoid completely disabling ACS across the topology. -Note to hardware vendors, we have facilities to permanently quirk -specific devices which enforce isolation but not provide an ACS -capability. Please contact me to have your devices added and save -your customers the hassle of this boot option. - -Signed-off-by: Mark Weiman <mark.weiman@markzz.com> ---- - Documentation/admin-guide/kernel-parameters.txt | 9 +++ - drivers/pci/quirks.c | 101 ++++++++++++++++++++++++ - 2 files changed, 110 insertions(+) - diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 46b26bfee27b..9018767828b0 100644 +index 638342d0a095..e4cc511bdef3 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -2966,6 +2966,15 @@ +@@ -3031,6 +3031,15 @@ nomsi [MSI] If the PCI_MSI kernel config parameter is enabled, this kernel boot option can be used to disable the use of MSI interrupts system-wide. @@ -72,12 +19,12 @@ index 46b26bfee27b..9018767828b0 100644 Safety option to keep boot IRQs enabled. This should never be necessary. diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 10684b17d0bd..091c8a0aca1e 100644 +index f439de848658..10f282e95f1c 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -3680,6 +3680,106 @@ static int __init pci_apply_final_quirks(void) - - fs_initcall_sync(pci_apply_final_quirks); +@@ -3676,6 +3676,106 @@ static const struct pci_dev_reset_methods pci_dev_reset_methods[] = { + { 0 } + }; +static bool acs_on_downstream; +static bool acs_on_multifunction; @@ -180,16 +127,13 @@ index 10684b17d0bd..091c8a0aca1e 100644 +} + /* - * Following are device-specific reset methods which can be used to - * reset a single function if other methods (e.g. FLR, PM D0->D3) are -@@ -4512,6 +4612,7 @@ static const struct pci_dev_acs_enabled { - { PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs }, - /* APM X-Gene */ - { PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs }, -+ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides }, + * These device-specific reset methods are here rather than in a driver + * because when a host assigns a device to a guest VM, the host may need +@@ -4395,6 +4495,7 @@ static const struct pci_dev_acs_enabled { + { PCI_VENDOR_ID_AMPERE, 0xE00A, pci_quirk_xgene_acs }, + { PCI_VENDOR_ID_AMPERE, 0xE00B, pci_quirk_xgene_acs }, + { PCI_VENDOR_ID_AMPERE, 0xE00C, pci_quirk_xgene_acs }, ++ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides }, { 0 } }; --- -2.16.1 - |