iommu/arm-smmu-v3: Remove IAS
Subsystems (2)
PATCH RESEND 1/1 iommu/arm-smmu-v3: Remove IAS
The driver only supports AArch64 page tables where OAS == IAS.
Remove the extra IAS tracking for AArch32 as this feature was never implemented and that was creating BAD_STEs for SMMUv3 with stage-2 and OAS < 40.
Further discussion on this in:
https://lore.kernel.org/linux-iommu/[email protected]/
Reported-by Tomasz Nowicki <[email protected]>
Fixes f0c453dbcce7 ("iommu/arm-smmu: Ensure IAS is set correctly for AArch32-capable SMMUs")
Signed-off-by Mostafa Saleh <[email protected]>
--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 18 +++++------------- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 2 -- 2 files changed, 5 insertions(+), 15 deletions(-)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +5 -13
@@ -2551,7 +2551,7 @@ static int arm_smmu_domain_finalise(struct arm_smmu_domain *smmu_domain, ARM_SMMU_FEAT_VAX) ? 52 : 48; pgtbl_cfg.ias = min_t(unsigned long, ias, VA_BITS); - pgtbl_cfg.oas = smmu->ias; + pgtbl_cfg.oas = smmu->oas;if (enable_dirty) pgtbl_cfg.quirks |=IO_PGTABLE_QUIRK_ARM_HD ; fmt =ARM_64_LPAE_S1 ;
@@ -2561,7 +2561,7 @@ static int arm_smmu_domain_finalise(struct arm_smmu_domain *smmu_domain,case ARM_SMMU_DOMAIN_S2 :if (enable_dirty)return -EOPNOTSUPP ; - pgtbl_cfg.ias = smmu->ias; + pgtbl_cfg.ias = smmu->oas; pgtbl_cfg.oas = smmu->oas; fmt =ARM_64_LPAE_S2 ; finalise_stage_fn = arm_smmu_domain_finalise_s2;
@@ -4395,13 +4395,7 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu) }/* We only support the AArch64 table format at present */ -switch (FIELD_GET (IDR0_TTF , reg)) { -case IDR0_TTF_AARCH32_64 : - smmu->ias =40 ; - fallthrough; -case IDR0_TTF_AARCH64 : -break ; -default : +if (!(FIELD_GET (IDR0_TTF , reg) &IDR0_TTF_AARCH64 )) {dev_err (smmu->dev,"AArch64 table format not supported!\n" );return -ENXIO ; }
@@ -4514,8 +4508,6 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu)dev_warn (smmu->dev,"failed to set DMA mask for table walker\n" ); - smmu->ias =max (smmu->ias, smmu->oas); -if ((smmu->features &ARM_SMMU_FEAT_TRANS_S1 ) && (smmu->features &ARM_SMMU_FEAT_TRANS_S2 )) smmu->features |=ARM_SMMU_FEAT_NESTING ;
@@ -4525,8 +4517,8 @@ static int arm_smmu_device_hw_probe(struct arm_smmu_device *smmu)if (arm_smmu_sva_supported (smmu)) smmu->features |=ARM_SMMU_FEAT_SVA ; -dev_info (smmu->dev,"ias %lu-bit, oas %lu-bit (features 0x%08x)\n" , - smmu->ias, smmu->oas, smmu->features); +dev_info (smmu->dev,"oas %lu-bit (features 0x%08x)\n" , + smmu->oas, smmu->features);return 0 ; }
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h +0 -2
@@ -43,7 +43,6 @@ struct arm_vsmmu;#define IDR0_COHACC (1 << 4)#define IDR0_TTF GENMASK(3, 2)#define IDR0_TTF_AARCH64 2 -#define IDR0_TTF_AARCH32_64 3#define IDR0_S1P (1 << 1)#define IDR0_S2P (1 << 0)
@@ -784,7 +783,6 @@ struct arm_smmu_device {int gerr_irq;int combined_irq; -unsigned long ias;/* IPA */ unsigned long oas;/* PA */ unsigned long pgsize_bitmap;
Signature · 1 line
2.52.0.351.gbe84eed79e-goog
Quoted 10 lines · Mostafa Saleh
The driver only supports AArch64 page tables where OAS == IAS.
Remove the extra IAS tracking for AArch32 as this feature was never implemented and that was creating
BAD_STEsfor SMMUv3 with stage-2 and OAS < 40.Further discussion on this in:
https://lore.kernel.org/linux-iommu/[email protected]/[...]
Applied to iommu (arm/smmu/updates), thanks!
[1/1] iommu/arm-smmu-v3: Remove IAS
https://git.kernel.org/iommu/c/5ac66ed8417f
Cheers,
Signature · 5 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev