From c84d7831c9a1e15111cdfa2b77ec0827bf2f3008 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 4 Dec 2023 14:50:23 -0500 Subject: [PATCH] Drop iommu-vt-d-disable-pci-ats-in-legacy-passthrough-mod.patch-15652 Signed-off-by: Sasha Levin --- ...-ats-in-legacy-passthrough-mod.patch-15652 | 50 ------------------- queue-6.1/series | 1 - 2 files changed, 51 deletions(-) delete mode 100644 queue-6.1/iommu-vt-d-disable-pci-ats-in-legacy-passthrough-mod.patch-15652 diff --git a/queue-6.1/iommu-vt-d-disable-pci-ats-in-legacy-passthrough-mod.patch-15652 b/queue-6.1/iommu-vt-d-disable-pci-ats-in-legacy-passthrough-mod.patch-15652 deleted file mode 100644 index cc41a33d72c..00000000000 --- a/queue-6.1/iommu-vt-d-disable-pci-ats-in-legacy-passthrough-mod.patch-15652 +++ /dev/null @@ -1,50 +0,0 @@ -From c77bc80790d78b3019d3adde7f596ac088b1988c Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 22 Nov 2023 11:26:04 +0800 -Subject: iommu/vt-d: Disable PCI ATS in legacy passthrough mode - -From: Lu Baolu - -[ Upstream commit da37dddcf4caf015c400a930301d2ee27a7a15fb ] - -When IOMMU hardware operates in legacy mode, the TT field of the context -entry determines the translation type, with three supported types (Section -9.3 Context Entry): - -- DMA translation without device TLB support -- DMA translation with device TLB support -- Passthrough mode with translated and translation requests blocked - -Device TLB support is absent when hardware is configured in passthrough -mode. - -Disable the PCI ATS feature when IOMMU is configured for passthrough -translation type in legacy (non-scalable) mode. - -Fixes: 0faa19a1515f ("iommu/vt-d: Decouple PASID & PRI enabling from SVA") -Signed-off-by: Lu Baolu -Reviewed-by: Kevin Tian -Link: https://lore.kernel.org/r/20231114011036.70142-3-baolu.lu@linux.intel.com -Signed-off-by: Joerg Roedel -Signed-off-by: Sasha Levin ---- - drivers/iommu/intel/iommu.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c -index de76272d0fb02..807abf4707be7 100644 ---- a/drivers/iommu/intel/iommu.c -+++ b/drivers/iommu/intel/iommu.c -@@ -2517,7 +2517,8 @@ static int domain_add_dev_info(struct dmar_domain *domain, struct device *dev) - return ret; - } - -- iommu_enable_pci_caps(info); -+ if (sm_supported(info->iommu) || !domain_type_is_si(info->domain)) -+ iommu_enable_pci_caps(info); - - return 0; - } --- -2.42.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 5ca8cd8f830..2f9b070cb5d 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -92,7 +92,6 @@ iommu-vt-d-add-device_block_translation-helper.patch iommu-vt-d-disable-pci-ats-in-legacy-passthrough-mod.patch iommu-vt-d-make-context-clearing-consistent-with-con.patch drm-amd-pm-fix-a-memleak-in-aldebaran_tables_init.patch -iommu-vt-d-disable-pci-ats-in-legacy-passthrough-mod.patch-15652 iommu-vt-d-make-context-clearing-consistent-with-con.patch-12070 drm-amd-pm-fix-a-memleak-in-aldebaran_tables_init.patch-16085 mmc-core-add-helpers-mmc_regulator_enable-disable_vq.patch -- 2.47.3