Commit fe046f1b authored by Pasha Tatashin's avatar Pasha Tatashin Committed by Joerg Roedel
Browse files

iommu/exynos: use page allocation function provided by iommu-pages.h 



Convert iommu/exynos-iommu.c to use the new page allocation functions
provided in iommu-pages.h.

Signed-off-by: default avatarPasha Tatashin <pasha.tatashin@soleen.com>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Tested-by: default avatarBagas Sanjaya <bagasdotme@gmail.com>
Link: https://lore.kernel.org/r/20240413002522.1101315-7-pasha.tatashin@soleen.com


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

drivers/iommu/exynos-iommu.c

+8 −6
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <linux/pm_runtime.h>

#include <linux/slab.h>



#include "iommu-pages.h"



typedef u32 sysmmu_iova_t;

typedef u32 sysmmu_pte_t;

static struct iommu_domain exynos_identity_domain;
@@ -900,11 +902,11 @@ static struct iommu_domain *exynos_iommu_domain_alloc_paging(struct device *dev) 
	if (!domain)

		return NULL;



	domain->pgtable = (sysmmu_pte_t *)__get_free_pages(GFP_KERNEL, 2);

	domain->pgtable = iommu_alloc_pages(GFP_KERNEL, 2);

	if (!domain->pgtable)

		goto err_pgtable;



	domain->lv2entcnt = (short *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, 1);

	domain->lv2entcnt = iommu_alloc_pages(GFP_KERNEL, 1);

	if (!domain->lv2entcnt)

		goto err_counter;
@@ -930,9 +932,9 @@ static struct iommu_domain *exynos_iommu_domain_alloc_paging(struct device *dev) 
	return &domain->domain;



err_lv2ent:

	free_pages((unsigned long)domain->lv2entcnt, 1);

	iommu_free_pages(domain->lv2entcnt, 1);

err_counter:

	free_pages((unsigned long)domain->pgtable, 2);

	iommu_free_pages(domain->pgtable, 2);

err_pgtable:

	kfree(domain);

	return NULL;
@@ -973,8 +975,8 @@ static void exynos_iommu_domain_free(struct iommu_domain *iommu_domain) 
					phys_to_virt(base));

		}



	free_pages((unsigned long)domain->pgtable, 2);

	free_pages((unsigned long)domain->lv2entcnt, 1);

	iommu_free_pages(domain->pgtable, 2);

	iommu_free_pages(domain->lv2entcnt, 1);

	kfree(domain);

}