update ACS capabillities patch context

[pve-kernel.git] / patches / kernel / 0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch

diff --git a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
index 36a59ea6f8890d71edfbaf1ce679fec7c6850a8f..884142390d8bfa1b31fcda1d13326d1a55ac6ef8 100644 (file)
--- a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
+++ b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch
@@ -49,20 +49,20 @@ your customers the hassle of this boot option.
 
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
- Documentation/admin-guide/kernel-parameters.txt |   9 +++
- drivers/pci/quirks.c                            | 101 ++++++++++++++++++++++++
+ .../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 f49ba96f8881..133fcf975b80 100644
+index 51210d10d905..ceb1b471d249 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -2968,6 +2968,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.
+@@ -3067,6 +3067,15 @@
+                               Also, it enforces the PCI Local Bus spec
+                               rule that those bits should be 0 in system reset
+                               events (useful for kexec/kdump cases).
 +              pci_acs_override =
-+                                      [PCIE] Override missing PCIe ACS support for:
++                              [PCIE] Override missing PCIe ACS support for:
 +                              downstream
 +                                      All downstream ports - full ACS capabilities
 +                              multifunction
@@ -74,10 +74,10 @@ index f49ba96f8881..133fcf975b80 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 451fd28f1855..a928bd86e102 100644
+index facd0d08a380..6ed8f3ead0dd 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -3702,6 +3702,106 @@ static int __init pci_apply_final_quirks(void)
+@@ -3703,6 +3703,106 @@ static int __init pci_apply_final_quirks(void)
  
  fs_initcall_sync(pci_apply_final_quirks);
  
@@ -184,7 +184,7 @@ index 451fd28f1855..a928bd86e102 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
-@@ -4536,6 +4636,7 @@ static const struct pci_dev_acs_enabled {
+@@ -4542,6 +4642,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 },
@@ -192,6 +192,3 @@ index 451fd28f1855..a928bd86e102 100644
        { 0 }
  };
  
--- 
-2.14.2
-