aboutsummaryrefslogtreecommitdiff
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2011-09-06 16:03:26 +0200
committerJoerg Roedel <joerg.roedel@amd.com>2011-10-21 14:37:19 +0200
commit905d66c1e5dc8149e111f04a32bb193f25da1d53 (patch)
tree3b4d55034f1ca58a7956c88cb71f6af8cda2b697 /drivers/iommu
parentff21776d12ff7993a6b236b8273ef62777d25dfb (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>
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/iommu.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 3343264f510..46e1c24f2f4 100644
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -16,6 +16,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <linux/device.h>
#include <linux/kernel.h>
#include <linux/bug.h>
#include <linux/types.h>
@@ -71,15 +72,26 @@ bool iommu_found(void)
}
EXPORT_SYMBOL_GPL(iommu_found);
-struct iommu_domain *iommu_domain_alloc(void)
+struct iommu_domain *iommu_domain_alloc(struct bus_type *bus)
{
struct iommu_domain *domain;
+ struct iommu_ops *ops;
int ret;
+ if (bus->iommu_ops)
+ ops = bus->iommu_ops;
+ else
+ ops = iommu_ops;
+
+ if (ops == NULL)
+ return NULL;
+
domain = kmalloc(sizeof(*domain), GFP_KERNEL);
if (!domain)
return NULL;
+ domain->ops = ops;
+
ret = iommu_ops->domain_init(domain);
if (ret)
goto out_free;