| Message ID | 20220623093629.32178-1-m.szyprowski@samsung.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 32977242f80e343e2247f77e53fe20e8f7c23938 |
| Headers | show |
| Series | iommu/exynos: Make driver independent of the system page size | expand |
On 23/06/2022 11:36, Marek Szyprowski wrote: > 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> > --- > Untested, because Exynos based boards I have doesn't boot with non-4KB > page size for other reasons. > --- > drivers/iommu/exynos-iommu.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
Hi Marek, On Thu, 23 Jun 2022 at 12:36, Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > 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> with one note: SPAGE_SIZE and SPAGE_ORDER could be used instead of SZ_4K. But that's just a matter of taste, I'm ok with that as is, hence R-b tag. Thanks! > Untested, because Exynos based boards I have doesn't boot with non-4KB > page size for other reasons. > --- > drivers/iommu/exynos-iommu.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c > index 71f2018e23fe..9c060505a46e 100644 > --- a/drivers/iommu/exynos-iommu.c > +++ b/drivers/iommu/exynos-iommu.c > @@ -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); > -- > 2.17.1 >
On Thu, Jun 23, 2022 at 11:36:29AM +0200, Marek Szyprowski wrote: > drivers/iommu/exynos-iommu.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) Applied, thanks.
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 71f2018e23fe..9c060505a46e 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -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);
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> --- Untested, because Exynos based boards I have doesn't boot with non-4KB page size for other reasons. --- drivers/iommu/exynos-iommu.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)