Commit 4a376d4a authored by Robin Murphy's avatar Robin Murphy Committed by Joerg Roedel
Browse files

iommu/exynos: Drop IOVA cookie management 



The core code bakes its own cookies now.

Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/12d88cbf44e57faa4f0512760e7ed3a9cba05ca8.1628682048.git.robin.murphy@arm.com


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

drivers/iommu/exynos-iommu.c

+4 −15
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/slab.h>

#include <linux/dma-iommu.h>



typedef u32 sysmmu_iova_t;

typedef u32 sysmmu_pte_t;
@@ -735,20 +734,16 @@ static struct iommu_domain *exynos_iommu_domain_alloc(unsigned type) 
	/* Check if correct PTE offsets are initialized */

	BUG_ON(PG_ENT_SHIFT < 0 || !dma_dev);



	if (type != IOMMU_DOMAIN_DMA && type != IOMMU_DOMAIN_UNMANAGED)

		return NULL;



	domain = kzalloc(sizeof(*domain), GFP_KERNEL);

	if (!domain)

		return NULL;



	if (type == IOMMU_DOMAIN_DMA) {

		if (iommu_get_dma_cookie(&domain->domain) != 0)

			goto err_pgtable;

	} else if (type != IOMMU_DOMAIN_UNMANAGED) {

		goto err_pgtable;

	}



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

	if (!domain->pgtable)

		goto err_dma_cookie;

		goto err_pgtable;



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

	if (!domain->lv2entcnt)
@@ -779,9 +774,6 @@ static struct iommu_domain *exynos_iommu_domain_alloc(unsigned type) 
	free_pages((unsigned long)domain->lv2entcnt, 1);

err_counter:

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

err_dma_cookie:

	if (type == IOMMU_DOMAIN_DMA)

		iommu_put_dma_cookie(&domain->domain);

err_pgtable:

	kfree(domain);

	return NULL;
@@ -809,9 +801,6 @@ static void exynos_iommu_domain_free(struct iommu_domain *iommu_domain) 


	spin_unlock_irqrestore(&domain->lock, flags);



	if (iommu_domain->type == IOMMU_DOMAIN_DMA)

		iommu_put_dma_cookie(iommu_domain);



	dma_unmap_single(dma_dev, virt_to_phys(domain->pgtable), LV1TABLE_SIZE,

			 DMA_TO_DEVICE);