summaryrefslogtreecommitdiff
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2015-03-26 13:43:04 +0100
committerJoerg Roedel <jroedel@suse.de>2015-03-31 15:31:23 +0200
commit938c470976192590b4adc921b2e10fa31237eddc (patch)
tree783d60eb23be6d6e0ec88c95c5eb32b5fdf81ad4 /drivers/iommu
parente42391cd048809d903291d07f86ed3934ce138e9 (diff)
iommu: Introduce domain_alloc and domain_free iommu_ops
These new call-backs defer the allocation and destruction of 'struct iommu_domain' to the iommu driver. This allows drivers to embed this struct into their private domain structures and to get rid of the domain_init and domain_destroy call-backs when all drivers have been converted. Tested-by: Thierry Reding <treding@nvidia.com> Tested-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Alex Williamson <alex.williamson@redhat.com> Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/iommu.c29
1 files changed, 21 insertions, 8 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 72e683df0731..11de2620bbf4 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -900,26 +900,34 @@ EXPORT_SYMBOL_GPL(iommu_set_fault_handler);
struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)
{
+ const struct iommu_ops *ops;
struct iommu_domain *domain;
- int ret;
if (bus == NULL || bus->iommu_ops == NULL)
return NULL;
- domain = kzalloc(sizeof(*domain), GFP_KERNEL);
+ ops = bus->iommu_ops;
+
+ if (ops->domain_alloc)
+ domain = ops->domain_alloc();
+ else
+ domain = kzalloc(sizeof(*domain), GFP_KERNEL);
+
if (!domain)
return NULL;
domain->ops = bus->iommu_ops;
- ret = domain->ops->domain_init(domain);
- if (ret)
+ if (ops->domain_init && domain->ops->domain_init(domain))
goto out_free;
return domain;
out_free:
- kfree(domain);
+ if (ops->domain_free)
+ ops->domain_free(domain);
+ else
+ kfree(domain);
return NULL;
}
@@ -927,10 +935,15 @@ EXPORT_SYMBOL_GPL(iommu_domain_alloc);
void iommu_domain_free(struct iommu_domain *domain)
{
- if (likely(domain->ops->domain_destroy != NULL))
- domain->ops->domain_destroy(domain);
+ const struct iommu_ops *ops = domain->ops;
- kfree(domain);
+ if (likely(ops->domain_destroy != NULL))
+ ops->domain_destroy(domain);
+
+ if (ops->domain_free)
+ ops->domain_free(domain);
+ else
+ kfree(domain);
}
EXPORT_SYMBOL_GPL(iommu_domain_free);