Drop iommu-vt-d-make-context-clearing-consistent-with-con.patch-18873

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

diff --git a/queue-5.15/iommu-vt-d-make-context-clearing-consistent-with-con.patch-18873 b/queue-5.15/iommu-vt-d-make-context-clearing-consistent-with-con.patch-18873
deleted file mode 100644 (file)
index 413ba93..0000000
--- a/queue-5.15/iommu-vt-d-make-context-clearing-consistent-with-con.patch-18873
+++ /dev/null
@@ -1,46 +0,0 @@
-From 155c41a0f96213a7ecc87af31f9427177e8deb5d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 22 Nov 2023 11:26:05 +0800
-Subject: iommu/vt-d: Make context clearing consistent with context mapping
-
-From: Lu Baolu <baolu.lu@linux.intel.com>
-
-[ Upstream commit 9a16ab9d640274b20813d2d17475e18d3e99d834 ]
-
-In the iommu probe_device path, domain_context_mapping() allows setting
-up the context entry for a non-PCI device. However, in the iommu
-release_device path, domain_context_clear() only clears context entries
-for PCI devices.
-
-Make domain_context_clear() behave consistently with
-domain_context_mapping() by clearing context entries for both PCI and
-non-PCI devices.
-
-Fixes: 579305f75d34 ("iommu/vt-d: Update to use PCI DMA aliases")
-Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
-Reviewed-by: Kevin Tian <kevin.tian@intel.com>
-Link: https://lore.kernel.org/r/20231114011036.70142-4-baolu.lu@linux.intel.com
-Signed-off-by: Joerg Roedel <jroedel@suse.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/iommu/intel/iommu.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index 51f008398c0cc..46b2751c3f003 100644
---- a/drivers/iommu/intel/iommu.c
-+++ b/drivers/iommu/intel/iommu.c
-@@ -4465,8 +4465,8 @@ static int domain_context_clear_one_cb(struct pci_dev *pdev, u16 alias, void *op
-  */
- static void domain_context_clear(struct device_domain_info *info)
- {
--      if (!info->iommu || !info->dev || !dev_is_pci(info->dev))
--              return;
-+      if (!dev_is_pci(info->dev))
-+              domain_context_clear_one(info, info->bus, info->devfn);
- 
-       pci_for_each_dma_alias(to_pci_dev(info->dev),
-                              &domain_context_clear_one_cb, info);
--- 
-2.42.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 9f5afa8885f011ba168cf9b75fd31ed94e216c46..de169feb12eeb16e055203df0d2bf73d87c6862e 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -62,7 +62,6 @@ cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch
 iommu-vt-d-omit-devtlb-invalidation-requests-when-te.patch
 iommu-vt-d-make-context-clearing-consistent-with-con.patch
 smb3-fix-touch-h-of-symlink.patch-27885
-iommu-vt-d-make-context-clearing-consistent-with-con.patch-18873
 mmc-core-add-helpers-mmc_regulator_enable-disable_vq.patch
 mmc-sdhci-sprd-fix-vqmmc-not-shutting-down-after-the.patch
 r8169-disable-aspm-in-case-of-tx-timeout.patch