|
|
@@ -55,7 +55,7 @@ Signed-off-by: Thomas Lamprecht <[email protected]>
|
|
|
2 files changed, 111 insertions(+)
|
|
|
|
|
|
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
|
|
|
-index 6de806c2e26c..a81214deec04 100644
|
|
|
+index b1645c11b384..2e19a7b0bea6 100644
|
|
|
--- a/Documentation/admin-guide/kernel-parameters.txt
|
|
|
+++ b/Documentation/admin-guide/kernel-parameters.txt
|
|
|
@@ -3287,6 +3287,15 @@
|
|
|
@@ -75,7 +75,7 @@ index 6de806c2e26c..a81214deec04 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 c641af59dd41..67aeb07271fe 100644
|
|
|
+index 66eac47bbdd6..315e170523d8 100644
|
|
|
--- a/drivers/pci/quirks.c
|
|
|
+++ b/drivers/pci/quirks.c
|
|
|
@@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void)
|
|
|
@@ -185,7 +185,7 @@ index c641af59dd41..67aeb07271fe 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
|
|
|
-@@ -4546,6 +4646,8 @@ static const struct pci_dev_acs_enabled {
|
|
|
+@@ -4564,6 +4664,8 @@ 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 },
|