diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index d3575e05b1bea8673b2ab21cd1c80378d705f7b3..9ac38f9140eb57fa3244f8c4eda8ae6898ef4e8f 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -2297,11 +2297,6 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd,
 		cmd->tlbi.tg = (tg - 10) / 2;
 
 		/* Determine what level the granule is at */
-		if (!(granule & smmu_domain->domain.pgsize_bitmap) ||
-		    (granule & (granule - 1))) {
-			granule = leaf_pgsize;
-			iova = ALIGN_DOWN(iova, leaf_pgsize);
-		}
 		cmd->tlbi.ttl = 4 - ((ilog2(granule) - 3) / (tg - 3));
 
 		/* Align size with the leaf page size upwards */