Bump to 6.5.5.arch1

Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
2023-10-02 11:11:20 +01:00
parent e4f10324b8
commit 21b0fce3cc
6 changed files with 312 additions and 183 deletions

View File

@@ -1,19 +1,7 @@
From c1ed6974bffaee49ae8a82838a4cf7cd8ebad36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
<848000+eclairevoyant@users.noreply.github.com>
Date: Sun, 1 Jan 2023 16:21:00 -0500
Subject: [PATCH 1/2] add-acs-overrides
---
.../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 42af9ca0127e..4f94a9f2cff0 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -4145,6 +4145,14 @@
diff --unified --recursive --text a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
--- a/Documentation/admin-guide/kernel-parameters.txt 2023-08-26 21:41:59.900155485 +0200
+++ b/Documentation/admin-guide/kernel-parameters.txt 2023-08-26 21:42:33.030920840 +0200
@@ -4256,6 +4256,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.
@@ -28,14 +16,13 @@ index 42af9ca0127e..4f94a9f2cff0 100644
noioapicquirk [APIC] Disable all boot interrupt quirks.
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 285acc4aaccc..7ad267e87c34 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void)
diff --unified --recursive --text a/drivers/pci/quirks.c b/drivers/pci/quirks.c
--- a/drivers/pci/quirks.c 2023-08-26 21:42:01.850200571 +0200
+++ b/drivers/pci/quirks.c 2023-08-26 21:42:33.030920840 +0200
@@ -194,6 +194,106 @@
}
fs_initcall_sync(pci_apply_final_quirks);
+static bool acs_on_downstream;
+static bool acs_on_multifunction;
+
@@ -139,7 +126,7 @@ index 285acc4aaccc..7ad267e87c34 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
@@ -5002,6 +5102,8 @@ static const struct pci_dev_acs_enabled {
@@ -5017,6 +5117,8 @@
{ PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
/* Wangxun nics */
{ PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs },
@@ -147,7 +134,5 @@ index 285acc4aaccc..7ad267e87c34 100644
+ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
{ 0 }
};
--
2.38.1
--