Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+5
-3
+4
drivers/iommu/amd/iommu.c
+4
drivers/iommu/amd/iommu.c
···
2754
2754
if (!dev_data)
2755
2755
return 0;
2756
2756
2757
+
/* Always use DMA domain for untrusted device */
2758
+
if (dev_is_pci(dev) && to_pci_dev(dev)->untrusted)
2759
+
return IOMMU_DOMAIN_DMA;
2760
+
2757
2761
/*
2758
2762
* Do not identity map IOMMUv2 capable devices when:
2759
2763
* - memory encryption is active, because some of those devices
+1
-3
drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
+1
-3
drivers/iommu/arm/arm-smmu/arm-smmu-nvidia.c
···
221
221
unsigned int inst;
222
222
irqreturn_t ret = IRQ_NONE;
223
223
struct arm_smmu_device *smmu;
224
-
struct iommu_domain *domain = dev;
225
-
struct arm_smmu_domain *smmu_domain;
224
+
struct arm_smmu_domain *smmu_domain = dev;
226
225
struct nvidia_smmu *nvidia;
227
226
228
-
smmu_domain = container_of(domain, struct arm_smmu_domain, domain);
229
227
smmu = smmu_domain->smmu;
230
228
nvidia = to_nvidia_smmu(smmu);
231
229