Commit 78a7553a authored by Kunkun Jiang's avatar Kunkun Jiang Committed by Zheng Zengkai
Browse files

Revert "iommu/arm-smmu-v3: Align invalid range with leaf page size upwards when support RIL" 

virt inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I61SPO


CVE: NA

--------------------------------

This reverts commit 8f1d8ede.

Signed-off-by: default avatarKunkun Jiang <jiangkunkun@huawei.com>
Reviewed-by: default avatarKeqian Zhu <zhukeqian1@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent b30d87cf

drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c

+0 −5
Original line number Diff line number Diff line
@@ -2288,10 +2288,7 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd, 


	if (smmu->features & ARM_SMMU_FEAT_RANGE_INV) {

		/* Get the leaf page size */

		size_t leaf_pgsize;



		tg = __ffs(smmu_domain->domain.pgsize_bitmap);

		leaf_pgsize = 1 << tg;



		/* Convert page size of 12,14,16 (log2) to 1,2,3 */

		cmd->tlbi.tg = (tg - 10) / 2;
@@ -2299,8 +2296,6 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd, 
		/* Determine what level the granule is at */

		cmd->tlbi.ttl = 4 - ((ilog2(granule) - 3) / (tg - 3));



		/* Align size with the leaf page size upwards */

		size = ALIGN(size, leaf_pgsize);

		num_pages = size >> tg;

	}