From 998db5888a5d1bfc6f7b48cfb2e6955291172f87 Mon Sep 17 00:00:00 2001 From: Kunkun Jiang Date: Wed, 7 Dec 2022 18:38:59 +0800 Subject: [PATCH] Revert "iommu/arm-smmu-v3: Remove the redundant shift operation of 'size'" virt inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I61SPO CVE: NA -------------------------------- This reverts commit c046c2a2c57587243b1fc53e65061f3e842848e3. Signed-off-by: Kunkun Jiang Reviewed-by: Keqian Zhu Signed-off-by: Zheng Zengkai --- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 1 + 1 file changed, 1 insertion(+) 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 e02bf2578a64..d3575e05b1be 100644 --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c @@ -3832,6 +3832,7 @@ arm_smmu_cache_invalidate(struct iommu_domain *domain, struct device *dev, !(granule_size & smmu_domain->domain.pgsize_bitmap)) { tg = __ffs(smmu_domain->domain.pgsize_bitmap); granule_size = 1 << tg; + size = size >> tg; } arm_smmu_tlb_inv_range_domain(info->addr, size, -- GitLab