Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm...

[cascardo/linux.git] / drivers / iommu / iommu.c

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index b972d43..d8f98b1 100644 (file)
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -204,6 +204,35 @@ again:
 }
 EXPORT_SYMBOL_GPL(iommu_group_alloc);
 
+struct iommu_group *iommu_group_get_by_id(int id)
+{
+       struct kobject *group_kobj;
+       struct iommu_group *group;
+       const char *name;
+
+       if (!iommu_group_kset)
+               return NULL;
+
+       name = kasprintf(GFP_KERNEL, "%d", id);
+       if (!name)
+               return NULL;
+
+       group_kobj = kset_find_obj(iommu_group_kset, name);
+       kfree(name);
+
+       if (!group_kobj)
+               return NULL;
+
+       group = container_of(group_kobj, struct iommu_group, kobj);
+       BUG_ON(group->id != id);
+
+       kobject_get(group->devices_kobj);
+       kobject_put(&group->kobj);
+
+       return group;
+}
+EXPORT_SYMBOL_GPL(iommu_group_get_by_id);
+
 /**
  * iommu_group_get_iommudata - retrieve iommu_data registered for a group
  * @group: the group
@@ -706,8 +735,7 @@ void iommu_detach_group(struct iommu_domain *domain, struct iommu_group *group)
 }
 EXPORT_SYMBOL_GPL(iommu_detach_group);
 
-phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain,
-                              unsigned long iova)
+phys_addr_t iommu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova)
 {
        if (unlikely(domain->ops->iova_to_phys == NULL))
                return 0;
@@ -854,12 +882,13 @@ EXPORT_SYMBOL_GPL(iommu_unmap);
 
 
 int iommu_domain_window_enable(struct iommu_domain *domain, u32 wnd_nr,
-                              phys_addr_t paddr, u64 size)
+                              phys_addr_t paddr, u64 size, int prot)
 {
        if (unlikely(domain->ops->domain_window_enable == NULL))
                return -ENODEV;
 
-       return domain->ops->domain_window_enable(domain, wnd_nr, paddr, size);
+       return domain->ops->domain_window_enable(domain, wnd_nr, paddr, size,
+                                                prot);
 }
 EXPORT_SYMBOL_GPL(iommu_domain_window_enable);