From 913f23b14b05a26499f68caf1173c5231c2a413b Mon Sep 17 00:00:00 2001 From: Joerg Roedel Date: Thu, 21 Jan 2010 16:32:27 +0100 Subject: [PATCH] --- yaml --- r: 190971 b: refs/heads/master c: 67651786948c360c3122b8a17cb1e59209d50880 h: refs/heads/master i: 190969: 2967456e90c6376f00f6510a0d5a6dbe2aac6453 190967: d080794ded61f733cc8eb7e61246437515d5a265 v: v3 --- [refs] | 2 +- trunk/drivers/base/iommu.c | 6 ++++++ trunk/include/linux/iommu.h | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 45c4224b1da1..9cda5d459c26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cefc53c7f494240d4813c80154c7617452d1904d +refs/heads/master: 67651786948c360c3122b8a17cb1e59209d50880 diff --git a/trunk/drivers/base/iommu.c b/trunk/drivers/base/iommu.c index cf7cbec116ed..55d37e4609eb 100644 --- a/trunk/drivers/base/iommu.c +++ b/trunk/drivers/base/iommu.c @@ -119,6 +119,9 @@ int iommu_map(struct iommu_domain *domain, unsigned long iova, BUG_ON((iova | paddr) & invalid_mask); + if (iommu_ops->map) + return iommu_ops->map(domain, iova, paddr, gfp_order, prot); + return iommu_ops->map_range(domain, iova, paddr, size, prot); } EXPORT_SYMBOL_GPL(iommu_map); @@ -133,6 +136,9 @@ int iommu_unmap(struct iommu_domain *domain, unsigned long iova, int gfp_order) BUG_ON(iova & invalid_mask); + if (iommu_ops->unmap) + return iommu_ops->unmap(domain, iova, gfp_order); + iommu_ops->unmap_range(domain, iova, size); return gfp_order; diff --git a/trunk/include/linux/iommu.h b/trunk/include/linux/iommu.h index 6d0035bb1a0c..5a7a3d888dac 100644 --- a/trunk/include/linux/iommu.h +++ b/trunk/include/linux/iommu.h @@ -36,6 +36,10 @@ struct iommu_ops { void (*domain_destroy)(struct iommu_domain *domain); int (*attach_dev)(struct iommu_domain *domain, struct device *dev); void (*detach_dev)(struct iommu_domain *domain, struct device *dev); + int (*map)(struct iommu_domain *domain, unsigned long iova, + phys_addr_t paddr, int gfp_order, int prot); + int (*unmap)(struct iommu_domain *domain, unsigned long iova, + int gfp_order); int (*map_range)(struct iommu_domain *domain, unsigned long iova, phys_addr_t paddr, size_t size, int prot); void (*unmap_range)(struct iommu_domain *domain, unsigned long iova,