summarylogtreecommitdiffstats
path: root/add-acs-overrides.patch
diff options
context:
space:
mode:
authorMark Weiman2018-02-07 22:41:21 -0500
committerMark Weiman2018-02-07 22:41:21 -0500
commitb23427dec7d7b93e7089623cc8fb7283143b657f (patch)
tree1e056c919042ddc2cb7655792588e2e51c499e84 /add-acs-overrides.patch
parent3e2b5d93724e4df9911a5550acd221226801803a (diff)
downloadaur-b23427dec7d7b93e7089623cc8fb7283143b657f.tar.gz
Update to 4.15.1-1
Diffstat (limited to 'add-acs-overrides.patch')
-rw-r--r--add-acs-overrides.patch22
1 files changed, 12 insertions, 10 deletions
diff --git a/add-acs-overrides.patch b/add-acs-overrides.patch
index 4db61704bfa..31ef973665e 100644
--- a/add-acs-overrides.patch
+++ b/add-acs-overrides.patch
@@ -1,7 +1,7 @@
-From 77026d26e851bbdc1bf5d5f1b6f21be7bbac86f1 Mon Sep 17 00:00:00 2001
+From 0457fc4aaca4bc954154347b209d1da78ba7f2d7 Mon Sep 17 00:00:00 2001
From: Mark Weiman <mark.weiman@markzz.com>
-Date: Wed, 13 Dec 2017 15:30:35 -0500
-Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.14)
+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
@@ -44,16 +44,18 @@ 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 05496622b4ef..d4c793024f7c 100644
+index 46b26bfee27b..9018767828b0 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -2937,6 +2937,15 @@
+@@ -2966,6 +2966,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.
@@ -70,10 +72,10 @@ index 05496622b4ef..d4c793024f7c 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 f66f9375177c..7c1867f29b7f 100644
+index 10684b17d0bd..091c8a0aca1e 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
-@@ -3673,6 +3673,106 @@ static int __init pci_apply_final_quirks(void)
+@@ -3680,6 +3680,106 @@ static int __init pci_apply_final_quirks(void)
fs_initcall_sync(pci_apply_final_quirks);
@@ -180,14 +182,14 @@ index f66f9375177c..7c1867f29b7f 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
-@@ -4505,6 +4605,7 @@ static const struct pci_dev_acs_enabled {
+@@ -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 },
++ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
{ 0 }
};
--
-2.15.1
+2.16.1