diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index e22ed91d27e1..bab3f386a6c2 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -2285,6 +2285,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
 #ifndef CONFIG_64BIT
 		smmu->va_size = min(32UL, smmu->va_size);
 #endif
+		smmu->va_size = min(36UL, smmu->va_size);
 		size = 0;
 		if (id & ID2_PTFS_4K)
 			size |= SZ_4K | SZ_2M | SZ_1G;