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.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/add-acs-overrides.patch b/add-acs-overrides.patch
index cee24157445..07b29d9c0e6 100644
--- a/add-acs-overrides.patch
+++ b/add-acs-overrides.patch
@@ -1,7 +1,7 @@
-From f9aad69bb8f781531702883e3c8646d3c0f77d43 Mon Sep 17 00:00:00 2001
+From 14fa9884ba1082e0280e8d477e22df917326fca5 Mon Sep 17 00:00:00 2001
From: Mark Weiman <mark.weiman@markzz.com>
-Date: Sun, 5 Mar 2017 10:47:35 -0500
-Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.10+)
+Date: Sat, 29 Jul 2017 09:15:32 -0400
+Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.12+)
This an updated version of Alex Williamson's patch from:
https://lkml.org/lkml/2013/5/30/513
@@ -50,10 +50,10 @@ your customers the hassle of this boot option.
2 files changed, 111 insertions(+)
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index be7c0d9506b1..97081bbc9a4e 100644
+index 7737ab5d04b2..e7353191fa5c 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -2829,6 +2829,15 @@
+@@ -2866,6 +2866,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 +70,10 @@ index be7c0d9506b1..97081bbc9a4e 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 1800befa8b8b..b8484c732210 100644
+index 085fb787aa9e..73a2b4cb61a0 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
-@@ -3605,6 +3605,107 @@ static int __init pci_apply_final_quirks(void)
+@@ -3654,6 +3654,107 @@ static int __init pci_apply_final_quirks(void)
fs_initcall_sync(pci_apply_final_quirks);
@@ -179,9 +179,9 @@ index 1800befa8b8b..b8484c732210 100644
+}
+
/*
- * Followings are device-specific reset methods which can be used to
+ * 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
-@@ -4278,6 +4379,7 @@ static const struct pci_dev_acs_enabled {
+@@ -4368,6 +4469,7 @@ static const struct pci_dev_acs_enabled {
{ 0x10df, 0x720, pci_quirk_mf_endpoint_acs }, /* Emulex Skyhawk-R */
/* Cavium ThunderX */
{ PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
@@ -190,5 +190,5 @@ index 1800befa8b8b..b8484c732210 100644
};
--
-2.12.0
+2.13.3