From: Will Deacon <will@kernel.org>
Date: Thu, 24 Jul 2025 10:17:52 +0000 (+0100)
Subject: Merge branch 'intel/vt-d' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f341a2aeb1f53297fb1aec74fc069de43be3d00;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'intel/vt-d' into next

* intel/vt-d:
  iommu/vt-d: Fix UAF on sva unbind with pending IOPFs
  iommu/vt-d: Make iotlb_sync_map a static property of dmar_domain
  iommu/vt-d: Deduplicate cache_tag_flush_all by reusing flush_range
  iommu/vt-d: Fix missing PASID in dev TLB flush with cache_tag_flush_all
  iommu/vt-d: Split paging_domain_compatible()
  iommu/vt-d: Split intel_iommu_enforce_cache_coherency()
  iommu/vt-d: Create unique domain ops for each stage
  iommu/vt-d: Split intel_iommu_domain_alloc_paging_flags()
  iommu/vt-d: Do not wipe out the page table NID when devices detach
  iommu/vt-d: Fold domain_exit() into intel_iommu_domain_free()
  iommu/vt-d: Lift the __pa to domain_setup_first_level/intel_svm_set_dev_pasid()
  iommu/vt-d: Optimize iotlb_sync_map for non-caching/non-RWBF modes
  iommu/vt-d: Remove the CONFIG_X86 wrapping from iommu init hook
---

9f341a2aeb1f53297fb1aec74fc069de43be3d00
diff --cc drivers/iommu/intel/iommu.c
index 68b695953c57e,a4f53b62dfbb1..82b0cec240de0
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@@ -4365,19 -4484,8 +4484,7 @@@ const struct iommu_ops intel_iommu_ops 
  	.device_group		= intel_iommu_device_group,
  	.is_attach_deferred	= intel_iommu_is_attach_deferred,
  	.def_domain_type	= device_def_domain_type,
 -	.pgsize_bitmap		= SZ_4K,
  	.page_response		= intel_iommu_page_response,
- 	.default_domain_ops = &(const struct iommu_domain_ops) {
- 		.attach_dev		= intel_iommu_attach_device,
- 		.set_dev_pasid		= intel_iommu_set_dev_pasid,
- 		.map_pages		= intel_iommu_map_pages,
- 		.unmap_pages		= intel_iommu_unmap_pages,
- 		.iotlb_sync_map		= intel_iommu_iotlb_sync_map,
- 		.flush_iotlb_all        = intel_flush_iotlb_all,
- 		.iotlb_sync		= intel_iommu_tlb_sync,
- 		.iova_to_phys		= intel_iommu_iova_to_phys,
- 		.free			= intel_iommu_domain_free,
- 		.enforce_cache_coherency = intel_iommu_enforce_cache_coherency,
- 	}
  };
  
  static void quirk_iommu_igfx(struct pci_dev *dev)