iommu/exynos: Reuse SysMMU constants for page size and order
authorSam Protsenko <semen.protsenko@linaro.org>
Thu, 14 Jul 2022 16:55:45 +0000 (19:55 +0300)
committerJoerg Roedel <jroedel@suse.de>
Fri, 15 Jul 2022 08:30:43 +0000 (10:30 +0200)
Using SZ_4K in context of SysMMU driver is better than using PAGE_SIZE,
as PAGE_SIZE might have different value on different platforms. Though
it would be even better to use more specific constants, already existing
in SysMMU driver. Make the code more strict by using SPAGE_ORDER and
SPAGE_SIZE constants.

It also makes sense, as __sysmmu_tlb_invalidate_entry() also uses
SPAGE_* constants for further calculations with num_inv param, so it's
logical that num_inv should be previously calculated using also SPAGE_*
values.

Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://lore.kernel.org/r/20220714165550.8884-2-semen.protsenko@linaro.org
Signed-off-by: Joerg Roedel <jroedel@suse.de>
drivers/iommu/exynos-iommu.c

index 9c060505a46e1cbdf91349291c41ec70d4aaab26..e3527ae5d96fea02ac34652ee3b94611b3e41383 100644 (file)
@@ -340,7 +340,7 @@ static void __sysmmu_set_ptbase(struct sysmmu_drvdata *data, phys_addr_t pgd)
        if (MMU_MAJ_VER(data->version) < 5)
                writel(pgd, data->sfrbase + REG_PT_BASE_ADDR);
        else
-               writel(pgd / SZ_4K, data->sfrbase + REG_V5_PT_BASE_PFN);
+               writel(pgd >> SPAGE_ORDER, data->sfrbase + REG_V5_PT_BASE_PFN);
 
        __sysmmu_tlb_invalidate(data);
 }
@@ -550,7 +550,7 @@ static void sysmmu_tlb_invalidate_entry(struct sysmmu_drvdata *data,
                 * 64KB page can be one of 16 consecutive sets.
                 */
                if (MMU_MAJ_VER(data->version) == 2)
-                       num_inv = min_t(unsigned int, size / SZ_4K, 64);
+                       num_inv = min_t(unsigned int, size / SPAGE_SIZE, 64);
 
                if (sysmmu_block(data)) {
                        __sysmmu_tlb_invalidate_entry(data, iova, num_inv);