Commit 32977242 authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Joerg Roedel
Browse files

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: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarSam Protsenko <semen.protsenko@linaro.org>
Acked-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220623093629.32178-1-m.szyprowski@samsung.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent a111daf0

drivers/iommu/exynos-iommu.c

+2 −3
Original line number Diff line number Diff line
@@ -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);