Merge branches 'x86/amd', 'x86/vt-d', 'arm/exynos', 'arm/mediatek', 'arm/msm', 'arm...

[karo-tx-linux.git] / drivers / iommu / iommu.c

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index 3000051f48b40c3e1b9e359e009023ce1e245c4c..b06d93594436984fa954982a0cb763206df268c0 100644 (file)
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -34,8 +34,7 @@
 #include <trace/events/iommu.h>
 
 static struct kset *iommu_group_kset;
-static struct ida iommu_group_ida;
-static struct mutex iommu_group_mutex;
+static DEFINE_IDA(iommu_group_ida);
 
 struct iommu_callback_data {
        const struct iommu_ops *ops;
@@ -144,9 +143,7 @@ static void iommu_group_release(struct kobject *kobj)
        if (group->iommu_data_release)
                group->iommu_data_release(group->iommu_data);
 
-       mutex_lock(&iommu_group_mutex);
-       ida_remove(&iommu_group_ida, group->id);
-       mutex_unlock(&iommu_group_mutex);
+       ida_simple_remove(&iommu_group_ida, group->id);
 
        if (group->default_domain)
                iommu_domain_free(group->default_domain);
@@ -186,26 +183,17 @@ struct iommu_group *iommu_group_alloc(void)
        INIT_LIST_HEAD(&group->devices);
        BLOCKING_INIT_NOTIFIER_HEAD(&group->notifier);
 
-       mutex_lock(&iommu_group_mutex);
-
-again:
-       if (unlikely(0 == ida_pre_get(&iommu_group_ida, GFP_KERNEL))) {
+       ret = ida_simple_get(&iommu_group_ida, 0, 0, GFP_KERNEL);
+       if (ret < 0) {
                kfree(group);
-               mutex_unlock(&iommu_group_mutex);
-               return ERR_PTR(-ENOMEM);
+               return ERR_PTR(ret);
        }
-
-       if (-EAGAIN == ida_get_new(&iommu_group_ida, &group->id))
-               goto again;
-
-       mutex_unlock(&iommu_group_mutex);
+       group->id = ret;
 
        ret = kobject_init_and_add(&group->kobj, &iommu_group_ktype,
                                   NULL, "%d", group->id);
        if (ret) {
-               mutex_lock(&iommu_group_mutex);
-               ida_remove(&iommu_group_ida, group->id);
-               mutex_unlock(&iommu_group_mutex);
+               ida_simple_remove(&iommu_group_ida, group->id);
                kfree(group);
                return ERR_PTR(ret);
        }
@@ -348,6 +336,9 @@ static int iommu_group_create_direct_mappings(struct iommu_group *group,
        list_for_each_entry(entry, &mappings, list) {
                dma_addr_t start, end, addr;
 
+               if (domain->ops->apply_dm_region)
+                       domain->ops->apply_dm_region(dev, domain, entry);
+
                start = ALIGN(entry->start, pg_size);
                end   = ALIGN(entry->start + entry->length, pg_size);
 
@@ -1483,9 +1474,6 @@ static int __init iommu_init(void)
 {
        iommu_group_kset = kset_create_and_add("iommu_groups",
                                               NULL, kernel_kobj);
-       ida_init(&iommu_group_ida);
-       mutex_init(&iommu_group_mutex);
-
        BUG_ON(!iommu_group_kset);
 
        return 0;