summarylogtreecommitdiffstats
path: root/add-acs-overrides.patch
diff options
context:
space:
mode:
Diffstat (limited to 'add-acs-overrides.patch')
-rw-r--r--add-acs-overrides.patch14
1 files changed, 4 insertions, 10 deletions
diff --git a/add-acs-overrides.patch b/add-acs-overrides.patch
index 72c1bc7a06a..cbe6a4487b2 100644
--- a/add-acs-overrides.patch
+++ b/add-acs-overrides.patch
@@ -45,16 +45,12 @@ 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.
---
- .../admin-guide/kernel-parameters.txt | 8 ++
- drivers/pci/quirks.c | 102 ++++++++++++++++++
- 2 files changed, 110 insertions(+)
-
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 5e2ce88d6eda..958769fe0fa2 100644
+index fb95fad81c79..0a1e5281809a 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -3509,6 +3509,14 @@
+@@ -3568,6 +3568,14 @@
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.
@@ -70,7 +66,7 @@ index 5e2ce88d6eda..958769fe0fa2 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 ca9ed5774eb1..4567b0e8f2de 100644
+index 2ea61abd5830..025974dfc10a 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void)
@@ -180,7 +176,7 @@ index ca9ed5774eb1..4567b0e8f2de 100644
/*
* Decoding should be disabled for a PCI device during BAR sizing to avoid
* conflict. But doing so may cause problems on host bridge and perhaps other
-@@ -4796,6 +4896,8 @@ static const struct pci_dev_acs_enabled {
+@@ -4824,6 +4924,8 @@ static const struct pci_dev_acs_enabled {
{ PCI_VENDOR_ID_ZHAOXIN, 0x9083, pci_quirk_mf_endpoint_acs },
/* Zhaoxin Root/Downstream Ports */
{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
@@ -189,5 +185,3 @@ index ca9ed5774eb1..4567b0e8f2de 100644
{ 0 }
};
---
-2.26.2