tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2024-05-10 10:10:21 -07:00
parent 448b3fe5a0 65ade5653f
commit 98957025cf
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/iommu/amd/iommu.c
+4
View File
@@ -2754,6 +2754,10 @@ static int amd_iommu_def_domain_type(struct device *dev)
if (!dev_data) if (!dev_data)
return 0; 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: * Do not identity map IOMMUv2 capable devices when:
* - memory encryption is active, because some of those devices * - memory encryption is active, because some of those devices
drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
+1 -3
View File
@@ -221,11 +221,9 @@ static irqreturn_t nvidia_smmu_context_fault(int irq, void *dev)
unsigned int inst; unsigned int inst;
irqreturn_t ret = IRQ_NONE; irqreturn_t ret = IRQ_NONE;
struct arm_smmu_device *smmu; struct arm_smmu_device *smmu;
struct iommu_domain *domain = dev; struct arm_smmu_domain *smmu_domain = dev;
struct arm_smmu_domain *smmu_domain;
struct nvidia_smmu *nvidia; struct nvidia_smmu *nvidia;
smmu_domain = container_of(domain, struct arm_smmu_domain, domain);
smmu = smmu_domain->smmu; smmu = smmu_domain->smmu;
nvidia = to_nvidia_smmu(smmu); nvidia = to_nvidia_smmu(smmu);