5.10.11

1 files changed, 14 insertions, 9 deletions

diff --git a/add-acs-overrides.patch b/add-acs-overrides.patch
index cbe6a4487b2a..f291975edb48 100644
--- a/add-acs-overrides.patch
+++ b/add-acs-overrides.patch
@@ -1,7 +1,7 @@
-From 169ce1a1bf376ba90cd0ab51ec19f9e32ead9dcb Mon Sep 17 00:00:00 2001
+From 578d958c59002358abdeeb294c25ac28027b9f7a Mon Sep 17 00:00:00 2001
 From: Mark Weiman <mark.weiman@markzz.com>
-Date: Wed, 6 May 2020 15:40:50 -0400
-Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (5.6.9+)
+Date: Wed, 27 Jan 2021 13:28:09 -0500
+Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (5.10.11+)
 
 This an updated version of Alex Williamson's patch from:
 https://lkml.org/lkml/2013/5/30/513
@@ -42,15 +42,17 @@ 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.
+capability.  Please contact me to have your devicstarting
 ---
+ .../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 fb95fad81c79..0a1e5281809a 100644
+index 26bfe7ae711b..7babcf646686 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -3568,6 +3568,14 @@
+@@ -3629,6 +3629,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.
@@ -66,7 +68,7 @@ index fb95fad81c79..0a1e5281809a 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 2ea61abd5830..025974dfc10a 100644
+index fb1dc11e7cc5..8748df0fe1e1 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
 @@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void)
@@ -176,7 +178,7 @@ index 2ea61abd5830..025974dfc10a 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
-@@ -4824,6 +4924,8 @@ static const struct pci_dev_acs_enabled {
+@@ -4769,6 +4869,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 },
@@ -185,3 +187,6 @@ index 2ea61abd5830..025974dfc10a 100644
  	{ 0 }
  };
  
+-- 
+2.30.0
+