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

iommu/ipmmu-vmsa: Drop IOVA cookie management 



The core code bakes its own cookies now.

Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/dc5513293942d81f84edf61b354b236e5ac51dc2.1628682048.git.robin.murphy@arm.com


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

drivers/iommu/ipmmu-vmsa.c

+4 −24
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 


#include <linux/bitmap.h>

#include <linux/delay.h>

#include <linux/dma-iommu.h>

#include <linux/dma-mapping.h>

#include <linux/err.h>

#include <linux/export.h>
@@ -564,10 +563,13 @@ static irqreturn_t ipmmu_irq(int irq, void *dev) 
 * IOMMU Operations

 */



static struct iommu_domain *__ipmmu_domain_alloc(unsigned type)

static struct iommu_domain *ipmmu_domain_alloc(unsigned type)

{

	struct ipmmu_vmsa_domain *domain;



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

		return NULL;



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

	if (!domain)

		return NULL;
@@ -577,27 +579,6 @@ static struct iommu_domain *__ipmmu_domain_alloc(unsigned type) 
	return &domain->io_domain;

}



static struct iommu_domain *ipmmu_domain_alloc(unsigned type)

{

	struct iommu_domain *io_domain = NULL;



	switch (type) {

	case IOMMU_DOMAIN_UNMANAGED:

		io_domain = __ipmmu_domain_alloc(type);

		break;



	case IOMMU_DOMAIN_DMA:

		io_domain = __ipmmu_domain_alloc(type);

		if (io_domain && iommu_get_dma_cookie(io_domain)) {

			kfree(io_domain);

			io_domain = NULL;

		}

		break;

	}



	return io_domain;

}



static void ipmmu_domain_free(struct iommu_domain *io_domain)

{

	struct ipmmu_vmsa_domain *domain = to_vmsa_domain(io_domain);
@@ -606,7 +587,6 @@ static void ipmmu_domain_free(struct iommu_domain *io_domain) 
	 * Free the domain resources. We assume that all devices have already

	 * been detached.

	 */

	iommu_put_dma_cookie(io_domain);

	ipmmu_domain_destroy_context(domain);

	free_io_pgtable_ops(domain->iop);

	kfree(domain);