Skip to content

Commit 3297724

Browse files
mszyprowjoergroedel
authored andcommitted
iommu/exynos: Make driver independent of the system page size
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>
1 parent a111daf commit 3297724

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/iommu/exynos-iommu.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,7 @@ static void __sysmmu_set_ptbase(struct sysmmu_drvdata *data, phys_addr_t pgd)
340340
if (MMU_MAJ_VER(data->version) < 5)
341341
writel(pgd, data->sfrbase + REG_PT_BASE_ADDR);
342342
else
343-
writel(pgd >> PAGE_SHIFT,
344-
data->sfrbase + REG_V5_PT_BASE_PFN);
343+
writel(pgd / SZ_4K, data->sfrbase + REG_V5_PT_BASE_PFN);
345344

346345
__sysmmu_tlb_invalidate(data);
347346
}
@@ -551,7 +550,7 @@ static void sysmmu_tlb_invalidate_entry(struct sysmmu_drvdata *data,
551550
* 64KB page can be one of 16 consecutive sets.
552551
*/
553552
if (MMU_MAJ_VER(data->version) == 2)
554-
num_inv = min_t(unsigned int, size / PAGE_SIZE, 64);
553+
num_inv = min_t(unsigned int, size / SZ_4K, 64);
555554

556555
if (sysmmu_block(data)) {
557556
__sysmmu_tlb_invalidate_entry(data, iova, num_inv);

0 commit comments

Comments
 (0)