iommu/exynos: Make driver independent of the system page size
authorMarek Szyprowski <m.szyprowski@samsung.com>
Thu, 23 Jun 2022 09:36:29 +0000 (11:36 +0200)
committerJoerg Roedel <jroedel@suse.de>
Wed, 6 Jul 2022 10:57:55 +0000 (12:57 +0200)
PAGE_{SIZE,SHIFT} macros depend on the configured kernel's page size, but
the driver expects values calculated as for 4KB pages. Fix this.

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

index 71f2018..9c06050 100644 (file)
@@ -340,8 +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 >> PAGE_SHIFT,
-                            data->sfrbase + REG_V5_PT_BASE_PFN);
+               writel(pgd / SZ_4K, data->sfrbase + REG_V5_PT_BASE_PFN);
 
        __sysmmu_tlb_invalidate(data);
 }
@@ -551,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 / PAGE_SIZE, 64);
+                       num_inv = min_t(unsigned int, size / SZ_4K, 64);
 
                if (sysmmu_block(data)) {
                        __sysmmu_tlb_invalidate_entry(data, iova, num_inv);