diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2011-09-06 16:03:26 +0200 |
|---|---|---|
| committer | Hiroshi DOYU <hdoyu@nvidia.com> | 2012-01-23 11:11:35 +0200 |
| commit | 78062e1936961716a272b3c30bf5db231300dffa (patch) | |
| tree | 53b303610e6be1dc90fd7abdad6a05aa4eafd54c /include/linux/iommu.h | |
| parent | d27fe92f870a09254674a6b6a4f32a7725238248 (diff) | |
iommu/core: Add bus_type parameter to iommu_domain_alloc
This is necessary to store a pointer to the bus-specific
iommu_ops in the iommu-domain structure. It will be used
later to call into bus-specific iommu-ops.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Conflicts:
drivers/iommu/iommu.c
Change-Id: Iddbd561739552b663a4be293f1992314eb0f775a
Diffstat (limited to 'include/linux/iommu.h')
| -rw-r--r-- | include/linux/iommu.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 68965094027d..048653817af9 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -25,6 +25,7 @@ #define IOMMU_WRITE (2) #define IOMMU_CACHE (4) /* DMA cache coherency */ +struct iommu_ops; struct bus_type; struct device; struct iommu_domain; @@ -37,6 +38,7 @@ typedef int (*iommu_fault_handler_t)(struct iommu_domain *, struct device *, unsigned long, int); struct iommu_domain { + struct iommu_ops *ops; void *priv; iommu_fault_handler_t handler; }; @@ -64,7 +66,7 @@ struct iommu_ops { extern void register_iommu(struct iommu_ops *ops); extern int bus_set_iommu(struct bus_type *bus, struct iommu_ops *ops); extern bool iommu_found(void); -extern struct iommu_domain *iommu_domain_alloc(void); +extern struct iommu_domain *iommu_domain_alloc(struct bus_type *bus); extern void iommu_domain_free(struct iommu_domain *domain); extern int iommu_attach_device(struct iommu_domain *domain, struct device *dev); @@ -129,7 +131,7 @@ static inline bool iommu_found(void) return false; } -static inline struct iommu_domain *iommu_domain_alloc(void) +static inline struct iommu_domain *iommu_domain_alloc(struct bus_type *bus) { return NULL; } |