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.patch30
1 files changed, 14 insertions, 16 deletions
diff --git a/add-acs-overrides.patch b/add-acs-overrides.patch
index b4c39f178ed..89ec2b13ebf 100644
--- a/add-acs-overrides.patch
+++ b/add-acs-overrides.patch
@@ -1,7 +1,7 @@
-From 3cf550fd8ca366897abe643442d198d1647cadc7 Mon Sep 17 00:00:00 2001
+From 5ffe511d5d8b5e803c8fa7249438efca7368b4c4 Mon Sep 17 00:00:00 2001
From: Mark Weiman <mark.weiman@markzz.com>
-Date: Sun, 12 Aug 2018 11:36:21 -0400
-Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.17.14)
+Date: Wed, 12 Dec 2018 10:18:35 -0500
+Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.18)
This an updated version of Alex Williamson's patch from:
https://lkml.org/lkml/2013/5/30/513
@@ -44,18 +44,16 @@ 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>
---
.../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 ff4ba249a26f..e23d259d461f 100644
+index 1370b424a453..e9334812da5d 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -3019,6 +3019,14 @@
+@@ -3106,6 +3106,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.
@@ -71,11 +69,11 @@ index ff4ba249a26f..e23d259d461f 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 785a29ba4f51..63fb2096f90d 100644
+index a4d11d14b196..0be08f804e87 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
-@@ -3533,6 +3533,106 @@ static int __init pci_apply_final_quirks(void)
-
+@@ -186,6 +186,106 @@ static int __init pci_apply_final_quirks(void)
+ }
fs_initcall_sync(pci_apply_final_quirks);
+static bool acs_on_downstream;
@@ -179,17 +177,17 @@ index 785a29ba4f51..63fb2096f90d 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
-@@ -4401,6 +4501,8 @@ static const struct pci_dev_acs_enabled {
+ * 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
+@@ -4393,6 +4493,8 @@ 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 },
-+ /* allow acs for any */
-+ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
++ /* allow acs for any */
++ { PCI_ANY_ID, PCI_ANY_ID, pci_acs_overrides },
{ 0 }
};
--
-2.18.0
+2.20.0