Drop pci-hv-fix-multi-msi-to-allow-more-than-one-msi-vect.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.17/pci-hv-fix-multi-msi-to-allow-more-than-one-msi-vect.patch b/queue-5.17/pci-hv-fix-multi-msi-to-allow-more-than-one-msi-vect.patch
deleted file mode 100644 (file)
index bd4296f..0000000
--- a/queue-5.17/pci-hv-fix-multi-msi-to-allow-more-than-one-msi-vect.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 697ac18ad46b263883d044f0954efc73425d6da8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 13 Apr 2022 07:36:21 -0600
-Subject: PCI: hv: Fix multi-MSI to allow more than one MSI vector
-
-From: Jeffrey Hugo <quic_jhugo@quicinc.com>
-
-[ Upstream commit 08e61e861a0e47e5e1a3fb78406afd6b0cea6b6d ]
-
-If the allocation of multiple MSI vectors for multi-MSI fails in the core
-PCI framework, the framework will retry the allocation as a single MSI
-vector, assuming that meets the min_vecs specified by the requesting
-driver.
-
-Hyper-V advertises that multi-MSI is supported, but reuses the VECTOR
-domain to implement that for x86.  The VECTOR domain does not support
-multi-MSI, so the alloc will always fail and fallback to a single MSI
-allocation.
-
-In short, Hyper-V advertises a capability it does not implement.
-
-Hyper-V can support multi-MSI because it coordinates with the hypervisor
-to map the MSIs in the IOMMU's interrupt remapper, which is something the
-VECTOR domain does not have.  Therefore the fix is simple - copy what the
-x86 IOMMU drivers (AMD/Intel-IR) do by removing
-X86_IRQ_ALLOC_CONTIGUOUS_VECTORS after calling the VECTOR domain's
-pci_msi_prepare().
-
-Fixes: 4daace0d8ce8 ("PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V VMs")
-Signed-off-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
-Reviewed-by: Dexuan Cui <decui@microsoft.com>
-Link: https://lore.kernel.org/r/1649856981-14649-1-git-send-email-quic_jhugo@quicinc.com
-Signed-off-by: Wei Liu <wei.liu@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pci/controller/pci-hyperv.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
-index 88b3b56d0522..87d4d6f97119 100644
---- a/drivers/pci/controller/pci-hyperv.c
-+++ b/drivers/pci/controller/pci-hyperv.c
-@@ -614,7 +614,16 @@ static void hv_set_msi_entry_from_desc(union hv_msi_entry *msi_entry,
- static int hv_msi_prepare(struct irq_domain *domain, struct device *dev,
-                         int nvec, msi_alloc_info_t *info)
- {
--      return pci_msi_prepare(domain, dev, nvec, info);
-+      int ret = pci_msi_prepare(domain, dev, nvec, info);
-+
-+      /*
-+       * By using the interrupt remapper in the hypervisor IOMMU, contiguous
-+       * CPU vectors is not needed for multi-MSI
-+       */
-+      if (info->type == X86_IRQ_ALLOC_TYPE_PCI_MSI)
-+              info->flags &= ~X86_IRQ_ALLOC_CONTIGUOUS_VECTORS;
-+
-+      return ret;
- }
- #elif defined(CONFIG_ARM64)
- /*
--- 
-2.35.1
-

diff --git a/queue-5.17/series b/queue-5.17/series
index 51391e6949083a0a1e412d8a976dd167c6f60f68..138e49a8fef40043f43d3f3c933fdd6db25c4561 100644 (file)
--- a/queue-5.17/series
+++ b/queue-5.17/series
@@ -489,7 +489,6 @@ arm-mediatek-select-arch-timer-for-mt7629.patch
 pinctrl-rockchip-support-deferring-other-gpio-params.patch
 pinctrl-mediatek-mt8195-enable-driver-on-mtk-platfor.patch
 arm64-dts-qcom-qrb5165-rb5-fix-can-clock-node-name.patch
-pci-hv-fix-multi-msi-to-allow-more-than-one-msi-vect.patch
 drivers-hv-vmbus-fix-handling-of-messages-with-trans.patch
 powerpc-fadump-fix-pt_load-segment-for-boot-memory-a.patch
 mfd-ipaq-micro-fix-error-check-return-value-of-platf.patch

diff --git a/queue-5.18/pci-hv-fix-multi-msi-to-allow-more-than-one-msi-vect.patch b/queue-5.18/pci-hv-fix-multi-msi-to-allow-more-than-one-msi-vect.patch
deleted file mode 100644 (file)
index 2b052d4..0000000
--- a/queue-5.18/pci-hv-fix-multi-msi-to-allow-more-than-one-msi-vect.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 2729c65017327b32a169f274cf804a9dfe5d5240 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 13 Apr 2022 07:36:21 -0600
-Subject: PCI: hv: Fix multi-MSI to allow more than one MSI vector
-
-From: Jeffrey Hugo <quic_jhugo@quicinc.com>
-
-[ Upstream commit 08e61e861a0e47e5e1a3fb78406afd6b0cea6b6d ]
-
-If the allocation of multiple MSI vectors for multi-MSI fails in the core
-PCI framework, the framework will retry the allocation as a single MSI
-vector, assuming that meets the min_vecs specified by the requesting
-driver.
-
-Hyper-V advertises that multi-MSI is supported, but reuses the VECTOR
-domain to implement that for x86.  The VECTOR domain does not support
-multi-MSI, so the alloc will always fail and fallback to a single MSI
-allocation.
-
-In short, Hyper-V advertises a capability it does not implement.
-
-Hyper-V can support multi-MSI because it coordinates with the hypervisor
-to map the MSIs in the IOMMU's interrupt remapper, which is something the
-VECTOR domain does not have.  Therefore the fix is simple - copy what the
-x86 IOMMU drivers (AMD/Intel-IR) do by removing
-X86_IRQ_ALLOC_CONTIGUOUS_VECTORS after calling the VECTOR domain's
-pci_msi_prepare().
-
-Fixes: 4daace0d8ce8 ("PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V VMs")
-Signed-off-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
-Reviewed-by: Dexuan Cui <decui@microsoft.com>
-Link: https://lore.kernel.org/r/1649856981-14649-1-git-send-email-quic_jhugo@quicinc.com
-Signed-off-by: Wei Liu <wei.liu@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/pci/controller/pci-hyperv.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/pci/controller/pci-hyperv.c b/drivers/pci/controller/pci-hyperv.c
-index d270a204324e..1cbe24b92a38 100644
---- a/drivers/pci/controller/pci-hyperv.c
-+++ b/drivers/pci/controller/pci-hyperv.c
-@@ -614,7 +614,16 @@ static void hv_set_msi_entry_from_desc(union hv_msi_entry *msi_entry,
- static int hv_msi_prepare(struct irq_domain *domain, struct device *dev,
-                         int nvec, msi_alloc_info_t *info)
- {
--      return pci_msi_prepare(domain, dev, nvec, info);
-+      int ret = pci_msi_prepare(domain, dev, nvec, info);
-+
-+      /*
-+       * By using the interrupt remapper in the hypervisor IOMMU, contiguous
-+       * CPU vectors is not needed for multi-MSI
-+       */
-+      if (info->type == X86_IRQ_ALLOC_TYPE_PCI_MSI)
-+              info->flags &= ~X86_IRQ_ALLOC_CONTIGUOUS_VECTORS;
-+
-+      return ret;
- }
- 
- /**
--- 
-2.35.1
-

diff --git a/queue-5.18/series b/queue-5.18/series
index dba3942441b76f76db5bbba91825fbe195fa3422..1b8f3d921537f834a5d35d94223cb8b251c2c66c 100644 (file)
--- a/queue-5.18/series
+++ b/queue-5.18/series
@@ -579,7 +579,6 @@ arm-mediatek-select-arch-timer-for-mt7629.patch
 pinctrl-rockchip-support-deferring-other-gpio-params.patch
 pinctrl-mediatek-mt8195-enable-driver-on-mtk-platfor.patch
 arm64-dts-qcom-qrb5165-rb5-fix-can-clock-node-name.patch
-pci-hv-fix-multi-msi-to-allow-more-than-one-msi-vect.patch
 drivers-hv-vmbus-fix-handling-of-messages-with-trans.patch
 powerpc-fadump-fix-pt_load-segment-for-boot-memory-a.patch
 mfd-ipaq-micro-fix-error-check-return-value-of-platf.patch