Commit b30d87cf authored Nov 30, 2022 by Kunkun Jiang Committed by Zheng Zengkai Nov 30, 2022

Revert "iommu/arm-smmu-v3: Standardize granule size when support RIL"

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


CVE: NA

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

This reverts commit f7cdf692.

Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
Reviewed-by: Keqian Zhu <zhukeqian1@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent 54286c3a

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

+0 −5

Original line number	Diff line number	Diff line
		@@ -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 */