|
|
@@ -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 174554924fb8..efa4a99121b7 100644
|
|
|
+index dc93d6b94d82..b9a5d6aa44fb 100644
|
|
|
--- a/Documentation/admin-guide/kernel-parameters.txt
|
|
|
+++ b/Documentation/admin-guide/kernel-parameters.txt
|
|
|
@@ -3434,6 +3434,15 @@
|
|
|
@@ -75,7 +75,7 @@ index 174554924fb8..efa4a99121b7 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 8991b59c5c5b..86f6b7ae6fe6 100644
|
|
|
+index 25f5e253decd..0a0fd4db3908 100644
|
|
|
--- a/drivers/pci/quirks.c
|
|
|
+++ b/drivers/pci/quirks.c
|
|
|
@@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void)
|
|
|
@@ -185,7 +185,7 @@ index 8991b59c5c5b..86f6b7ae6fe6 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
|
|
|
-@@ -4764,6 +4864,8 @@ static const struct pci_dev_acs_enabled {
|
|
|
+@@ -4796,6 +4896,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 },
|