drop queue-4.19/pci-add-acs-quirk-for-zhaoxin-root-downstream-ports.patch

diff --git a/queue-4.19/pci-add-acs-quirk-for-zhaoxin-root-downstream-ports.patch b/queue-4.19/pci-add-acs-quirk-for-zhaoxin-root-downstream-ports.patch
deleted file mode 100644 (file)
index 4ed2ef6..0000000
--- a/queue-4.19/pci-add-acs-quirk-for-zhaoxin-root-downstream-ports.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 299bd044a6f332b4a6c8f708575c27cad70a35c1 Mon Sep 17 00:00:00 2001
-From: Raymond Pang <RaymondPang-oc@zhaoxin.com>
-Date: Fri, 27 Mar 2020 17:11:48 +0800
-Subject: PCI: Add ACS quirk for Zhaoxin Root/Downstream Ports
-
-From: Raymond Pang <RaymondPang-oc@zhaoxin.com>
-
-commit 299bd044a6f332b4a6c8f708575c27cad70a35c1 upstream.
-
-Many Zhaoxin Root Ports and Switch Downstream Ports do provide ACS-like
-capability but have no ACS Capability Structure.  Peer-to-Peer transactions
-could be blocked between these ports, so add quirk so devices behind them
-could be assigned to different IOMMU group.
-
-Link: https://lore.kernel.org/r/20200327091148.5190-4-RaymondPang-oc@zhaoxin.com
-Signed-off-by: Raymond Pang <RaymondPang-oc@zhaoxin.com>
-Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/pci/quirks.c |   25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
---- a/drivers/pci/quirks.c
-+++ b/drivers/pci/quirks.c
-@@ -4424,6 +4424,29 @@ static int pci_quirk_intel_pch_acs(struc
- }
- 
- /*
-+ * Many Zhaoxin Root Ports and Switch Downstream Ports have no ACS capability.
-+ * But the implementation could block peer-to-peer transactions between them
-+ * and provide ACS-like functionality.
-+ */
-+static int  pci_quirk_zhaoxin_pcie_ports_acs(struct pci_dev *dev, u16 acs_flags)
-+{
-+      if (!pci_is_pcie(dev) ||
-+          ((pci_pcie_type(dev) != PCI_EXP_TYPE_ROOT_PORT) &&
-+           (pci_pcie_type(dev) != PCI_EXP_TYPE_DOWNSTREAM)))
-+              return -ENOTTY;
-+
-+      switch (dev->device) {
-+      case 0x0710 ... 0x071e:
-+      case 0x0721:
-+      case 0x0723 ... 0x0732:
-+              return pci_acs_ctrl_enabled(acs_flags,
-+                      PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF);
-+      }
-+
-+      return false;
-+}
-+
-+/*
-  * These QCOM root ports do provide ACS-like features to disable peer
-  * transactions and validate bus numbers in requests, but do not provide an
-  * actual PCIe ACS capability.  Hardware supports source validation but it
-@@ -4634,6 +4657,8 @@ static const struct pci_dev_acs_enabled
-       { PCI_VENDOR_ID_AMPERE, 0xE00A, pci_quirk_xgene_acs },
-       { PCI_VENDOR_ID_AMPERE, 0xE00B, pci_quirk_xgene_acs },
-       { PCI_VENDOR_ID_AMPERE, 0xE00C, pci_quirk_xgene_acs },
-+      /* Zhaoxin Root/Downstream Ports */
-+      { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
-       { 0 }
- };
- 

diff --git a/queue-4.19/pci-move-apex-edge-tpu-class-quirk-to-fix-bar-assignment.patch b/queue-4.19/pci-move-apex-edge-tpu-class-quirk-to-fix-bar-assignment.patch
index 7a01b2d5901bbfdf4e0373840f7b96feb509a08a..72f4b64ab6bd0c7c0f4e1b87f138858ea0c2900a 100644 (file)
--- a/queue-4.19/pci-move-apex-edge-tpu-class-quirk-to-fix-bar-assignment.patch
+++ b/queue-4.19/pci-move-apex-edge-tpu-class-quirk-to-fix-bar-assignment.patch
@@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -5318,3 +5318,10 @@ static void pci_fixup_no_d0_pme(struct p
+@@ -5293,3 +5293,10 @@ static void pci_fixup_no_d0_pme(struct p
        dev->pme_support &= ~(PCI_PM_CAP_PME_D0 >> PCI_PM_CAP_PME_SHIFT);
  }
  DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASMEDIA, 0x2142, pci_fixup_no_d0_pme);

diff --git a/queue-4.19/series b/queue-4.19/series
index 135686aabef17e175cb29bf0e2a50f7aa1291dee..cbb6d83157902c3e073265b5cfa90b9397d9c979 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -16,7 +16,6 @@ xfs-acquire-superblock-freeze-protection-on-eofblocks-scans.patch
 svcrdma-fix-trace-point-use-after-free-race.patch
 svcrdma-fix-leak-of-svc_rdma_recv_ctxt-objects.patch
 pci-avoid-asmedia-xhci-usb-pme-from-d0-defect.patch
-pci-add-acs-quirk-for-zhaoxin-root-downstream-ports.patch
 pci-move-apex-edge-tpu-class-quirk-to-fix-bar-assignment.patch
 arm-dts-bcm283x-disable-dsi0-node.patch
 cpumap-avoid-warning-when-config_debug_per_cpu_maps-is-enabled.patch