Commit 98957025 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iommu-fixes-v6.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu 

Pull iommu fixes from Joerg Roedel:

 - Fix offset miscalculation on ARM-SMMU driver

 - AMD IOMMU fix for initializing state of untrusted devices

* tag 'iommu-fixes-v6.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/arm-smmu: Use the correct type in nvidia_smmu_context_fault()
  iommu/amd: Enhance def_domain_type to handle untrusted device
parents 448b3fe5 65ade565

drivers/iommu/amd/iommu.c

+4 −0
Original line number Diff line number Diff line
@@ -2754,6 +2754,10 @@ static int amd_iommu_def_domain_type(struct device *dev) 
	if (!dev_data)

		return 0;



	/* Always use DMA domain for untrusted device */

	if (dev_is_pci(dev) && to_pci_dev(dev)->untrusted)

		return IOMMU_DOMAIN_DMA;



	/*

	 * Do not identity map IOMMUv2 capable devices when:

	 *  - memory encryption is active, because some of those devices

drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c

+1 −3
Original line number Diff line number Diff line
@@ -221,11 +221,9 @@ static irqreturn_t nvidia_smmu_context_fault(int irq, void *dev) 
	unsigned int inst;

	irqreturn_t ret = IRQ_NONE;

	struct arm_smmu_device *smmu;

	struct iommu_domain *domain = dev;

	struct arm_smmu_domain *smmu_domain;

	struct arm_smmu_domain *smmu_domain = dev;

	struct nvidia_smmu *nvidia;



	smmu_domain = container_of(domain, struct arm_smmu_domain, domain);

	smmu = smmu_domain->smmu;

	nvidia = to_nvidia_smmu(smmu);