diff options
Diffstat (limited to 'add-acs-overrides.patch')
-rw-r--r-- | add-acs-overrides.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/add-acs-overrides.patch b/add-acs-overrides.patch index cbe6a4487b2a..9dee450f2ce0 100644 --- a/add-acs-overrides.patch +++ b/add-acs-overrides.patch @@ -47,10 +47,10 @@ your customers the hassle of this boot option. --- diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index fb95fad81c79..0a1e5281809a 100644 +index f6a1513dfb76..3c3e25cdc90e 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 +66,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 f70692ac79c5..e1208a614703 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 +176,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 }, |