DL-Mirrors/kernel-tenderloin-3.0
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drivers: iommu: Add flags to iommu_domain_alloc

Browse Source 
Add the ability to pass flags into the iommu_domain_alloc
function to specify domain attributes.

Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
This commit is contained in:
Stepan Moskovchenko
2011-08-31 17:13:32 -07:00
committed by Bryan Huntsman
parent ab34ca44fc
commit ff2d366f21
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-msm/iommu.c
View File

@@ -264,7 +264,7 @@ static void __program_context(void __iomem *base, int ctx, int ncb,
mb(); mb();
} }
static int msm_iommu_domain_init(struct iommu_domain *domain) static int msm_iommu_domain_init(struct iommu_domain *domain, int flags)
{ {
struct msm_priv *priv = kzalloc(sizeof(*priv), GFP_KERNEL); struct msm_priv *priv = kzalloc(sizeof(*priv), GFP_KERNEL);

2
arch/arm/mach-msm/iommu_domains.c
View File

@@ -199,7 +199,7 @@ static int __init msm_subsystem_iommu_init(void)
int i; int i;
for (i = 0; i < (ARRAY_SIZE(msm_iommu_domains) - 1); i++) for (i = 0; i < (ARRAY_SIZE(msm_iommu_domains) - 1); i++)
msm_iommu_domains[i] = iommu_domain_alloc(); msm_iommu_domains[i] = iommu_domain_alloc(0);
for (i = 0; i < ARRAY_SIZE(msm_iommu_iova_pools); i++) { for (i = 0; i < ARRAY_SIZE(msm_iommu_iova_pools); i++) {
mutex_init(&msm_iommu_iova_pools[i].pool_mutex); mutex_init(&msm_iommu_iova_pools[i].pool_mutex);

4
drivers/base/iommu.c
View File

@@ -40,7 +40,7 @@ bool iommu_found(void)
} }
EXPORT_SYMBOL_GPL(iommu_found); EXPORT_SYMBOL_GPL(iommu_found);
struct iommu_domain *iommu_domain_alloc(void) struct iommu_domain *iommu_domain_alloc(int flags)
{ {
struct iommu_domain *domain; struct iommu_domain *domain;
int ret; int ret;
@@ -49,7 +49,7 @@ struct iommu_domain *iommu_domain_alloc(void)
if (!domain) if (!domain)
return NULL; return NULL;
ret = iommu_ops->domain_init(domain); ret = iommu_ops->domain_init(domain, flags);
if (ret) if (ret)
goto out_free; goto out_free;

6
include/linux/iommu.h
View File

@@ -37,7 +37,7 @@ struct iommu_domain {
#define IOMMU_CAP_INTR_REMAP 0x2 /* isolates device intrs */ #define IOMMU_CAP_INTR_REMAP 0x2 /* isolates device intrs */
struct iommu_ops { struct iommu_ops {
int (*domain_init)(struct iommu_domain *domain); int (*domain_init)(struct iommu_domain *domain, int flags);
void (*domain_destroy)(struct iommu_domain *domain); void (*domain_destroy)(struct iommu_domain *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);
@@ -59,7 +59,7 @@ struct iommu_ops {
extern void register_iommu(struct iommu_ops *ops); extern void register_iommu(struct iommu_ops *ops);
extern bool iommu_found(void); extern bool iommu_found(void);
extern struct iommu_domain *iommu_domain_alloc(void); extern struct iommu_domain *iommu_domain_alloc(int flags);
extern void iommu_domain_free(struct iommu_domain *domain); extern void iommu_domain_free(struct iommu_domain *domain);
extern int iommu_attach_device(struct iommu_domain *domain, extern int iommu_attach_device(struct iommu_domain *domain,
struct device *dev); struct device *dev);
@@ -89,7 +89,7 @@ static inline bool iommu_found(void)
return false; return false;
} }
static inline struct iommu_domain *iommu_domain_alloc(void) static inline struct iommu_domain *iommu_domain_alloc(int flags)
{ {
return NULL; return NULL;
} }

2
virt/kvm/iommu.c
View File

@@ -227,7 +227,7 @@ int kvm_iommu_map_guest(struct kvm *kvm)
return -ENODEV; return -ENODEV;
} }
kvm->arch.iommu_domain = iommu_domain_alloc(); kvm->arch.iommu_domain = iommu_domain_alloc(0);
if (!kvm->arch.iommu_domain) if (!kvm->arch.iommu_domain)
return -ENOMEM; return -ENOMEM;