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

iommu/rockchip: Drop IOVA cookie management 



The core code bakes its own cookies now.

Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
Acked-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/aff51e2da1e431987ae5fdafa62a6a7c4bd042dc.1628682048.git.robin.murphy@arm.com


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

drivers/iommu/rockchip-iommu.c

+1 −11
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/compiler.h>

#include <linux/delay.h>

#include <linux/device.h>

#include <linux/dma-iommu.h>

#include <linux/dma-mapping.h>

#include <linux/errno.h>

#include <linux/interrupt.h>
@@ -1074,10 +1073,6 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type) 
	if (!rk_domain)

		return NULL;



	if (type == IOMMU_DOMAIN_DMA &&

	    iommu_get_dma_cookie(&rk_domain->domain))

		goto err_free_domain;



	/*

	 * rk32xx iommus use a 2 level pagetable.

	 * Each level1 (dt) and level2 (pt) table has 1024 4-byte entries.
@@ -1085,7 +1080,7 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type) 
	 */

	rk_domain->dt = (u32 *)get_zeroed_page(GFP_KERNEL | GFP_DMA32);

	if (!rk_domain->dt)

		goto err_put_cookie;

		goto err_free_domain;



	rk_domain->dt_dma = dma_map_single(dma_dev, rk_domain->dt,

					   SPAGE_SIZE, DMA_TO_DEVICE);
@@ -1106,9 +1101,6 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type) 


err_free_dt:

	free_page((unsigned long)rk_domain->dt);

err_put_cookie:

	if (type == IOMMU_DOMAIN_DMA)

		iommu_put_dma_cookie(&rk_domain->domain);

err_free_domain:

	kfree(rk_domain);
@@ -1137,8 +1129,6 @@ static void rk_iommu_domain_free(struct iommu_domain *domain) 
			 SPAGE_SIZE, DMA_TO_DEVICE);

	free_page((unsigned long)rk_domain->dt);



	if (domain->type == IOMMU_DOMAIN_DMA)

		iommu_put_dma_cookie(&rk_domain->domain);

	kfree(rk_domain);

}