Patch fixes
0999-acs.gitpatch 0001-patch-fixes.patch
From 0b3e1357c628e162f872c0c02745c3626ea30513 Mon Sep 17 00:00:00 2001
From: Masato TOYOSHIMA <phoepsilonix@phoepsilonix.love>
Date: Thu, 10 Aug 2023 09:31:32 +0900
Subject: [PATCH] patch fixes
---
0999-acs.gitpatch | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/0999-acs.gitpatch b/0999-acs.gitpatch
index adbbc6b..aff1bc3 100644
--- a/0999-acs.gitpatch
+++ b/0999-acs.gitpatch
@@ -18,13 +18,13 @@ index 2fba824..a797d74 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 003950c..d3bb542 100644
+index 472fa2c..6860e58 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
-@@ -193,6 +193,107 @@ static int __init pci_apply_final_quirks(void)
+@@ -194,6 +194,107 @@ static int __init pci_apply_final_quirks(void)
}
fs_initcall_sync(pci_apply_final_quirks);
-
+
+static bool acs_on_downstream;
+static bool acs_on_multifunction;
+
@@ -129,13 +129,12 @@ index 003950c..d3bb542 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
-@@ -4950,6 +5051,8 @@ static const struct pci_dev_acs_enabled {
- { PCI_VENDOR_ID_NXP, 0x8d9b, pci_quirk_nxp_rp_acs },
- /* Zhaoxin Root/Downstream Ports */
+@@ -5017,6 +5118,8 @@ static const struct pci_dev_acs_enabled {
{ 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 },
+ /* allow acs for any */
+ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
{ 0 }
};
-
-
+
--
2.41.0