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

iommu: Pull IOVA cookie management into the core 



Now that everyone has converged on iommu-dma for IOMMU_DOMAIN_DMA
support, we can abandon the notion of drivers being responsible for the
cookie type, and consolidate all the management into the core code.

CC: Yong Wu <yong.wu@mediatek.com>
CC: Chunyan Zhang <chunyan.zhang@unisoc.com>
CC: Maxime Ripard <mripard@kernel.org>
Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Tested-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: default avatarJean-Philippe Brucker <jean-philippe@linaro.org>
Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/46a2c0e7419c7d1d931762dc7b6a69fa082d199a.1628682048.git.robin.murphy@arm.com


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

drivers/iommu/iommu.c

+7 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#define pr_fmt(fmt)    "iommu: " fmt



#include <linux/device.h>

#include <linux/dma-iommu.h>

#include <linux/kernel.h>

#include <linux/bits.h>

#include <linux/bug.h>
@@ -1946,6 +1947,11 @@ static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus, 
	/* Assume all sizes by default; the driver may override this later */

	domain->pgsize_bitmap  = bus->iommu_ops->pgsize_bitmap;



	/* Temporarily avoid -EEXIST while drivers still get their own cookies */

	if (type == IOMMU_DOMAIN_DMA && !domain->iova_cookie && iommu_get_dma_cookie(domain)) {

		iommu_domain_free(domain);

		domain = NULL;

	}

	return domain;

}
@@ -1957,6 +1963,7 @@ EXPORT_SYMBOL_GPL(iommu_domain_alloc); 


void iommu_domain_free(struct iommu_domain *domain)

{

	iommu_put_dma_cookie(domain);

	domain->ops->domain_free(domain);

}

EXPORT_SYMBOL_GPL(iommu_domain_free);

include/linux/iommu.h

+2 −1
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ struct iommu_domain; 
struct notifier_block;

struct iommu_sva;

struct iommu_fault_event;

struct iommu_dma_cookie;



/* iommu fault flags */

#define IOMMU_FAULT_READ	0x0
@@ -86,7 +87,7 @@ struct iommu_domain { 
	iommu_fault_handler_t handler;

	void *handler_token;

	struct iommu_domain_geometry geometry;

	void *iova_cookie;

	struct iommu_dma_cookie *iova_cookie;

};



enum iommu_cap {