xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu: Introduce domain_alloc and domain_free iommu_ops

Browse Source 
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>
This commit is contained in:
Joerg Roedel
2015-03-26 13:43:04 +01:00
parent e42391cd04
commit 938c470976
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/iommu/iommu.c
View File

@@ -900,25 +900,33 @@ EXPORT_SYMBOL_GPL(iommu_set_fault_handler);
struct iommu_domain *iommu_domain_alloc(struct bus_type *bus) struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)
{ {
const struct iommu_ops *ops;
struct iommu_domain *domain; struct iommu_domain *domain;
int ret;
if (bus == NULL || bus->iommu_ops == NULL) if (bus == NULL || bus->iommu_ops == NULL)
return NULL; return NULL;
ops = bus->iommu_ops;
if (ops->domain_alloc)
domain = ops->domain_alloc();
else
domain = kzalloc(sizeof(*domain), GFP_KERNEL); domain = kzalloc(sizeof(*domain), GFP_KERNEL);
if (!domain) if (!domain)
return NULL; return NULL;
domain->ops = bus->iommu_ops; domain->ops = bus->iommu_ops;
ret = domain->ops->domain_init(domain); if (ops->domain_init && domain->ops->domain_init(domain))
if (ret)
goto out_free; goto out_free;
return domain; return domain;
out_free: out_free:
if (ops->domain_free)
ops->domain_free(domain);
else
kfree(domain); kfree(domain);
return NULL; return NULL;
@@ -927,9 +935,14 @@ EXPORT_SYMBOL_GPL(iommu_domain_alloc);
void iommu_domain_free(struct iommu_domain *domain) void iommu_domain_free(struct iommu_domain *domain)
{ {
if (likely(domain->ops->domain_destroy != NULL)) const struct iommu_ops *ops = domain->ops;
domain->ops->domain_destroy(domain);
if (likely(ops->domain_destroy != NULL))
ops->domain_destroy(domain);
if (ops->domain_free)
ops->domain_free(domain);
else
kfree(domain); kfree(domain);
} }
EXPORT_SYMBOL_GPL(iommu_domain_free); EXPORT_SYMBOL_GPL(iommu_domain_free);

5
include/linux/iommu.h
View File

@@ -115,6 +115,11 @@ struct iommu_ops {
bool (*capable)(enum iommu_cap); bool (*capable)(enum iommu_cap);
int (*domain_init)(struct iommu_domain *domain); int (*domain_init)(struct iommu_domain *domain);
void (*domain_destroy)(struct iommu_domain *domain); void (*domain_destroy)(struct iommu_domain *domain);
/* Domain allocation and freeing by the iommu driver */
struct iommu_domain *(*domain_alloc)(void);
void (*domain_free)(struct iommu_domain *);
int (*attach_dev)(struct iommu_domain *domain, struct device *dev); int (*attach_dev)(struct iommu_domain *domain, struct device *dev);
void (*detach_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, int (*map)(struct iommu_domain *domain, unsigned long iova,