4 files changed, 84 insertions, 41 deletions

diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
index bdea288dc185..a35e98ad9725 100644
--- a/drivers/iommu/amd_iommu_init.c
+++ b/drivers/iommu/amd_iommu_init.c
@@ -275,7 +275,7 @@ static void iommu_set_exclusion_range(struct amd_iommu *iommu)
 }
 
 /* Programs the physical address of the device table into the IOMMU hardware */
-static void __init iommu_set_device_table(struct amd_iommu *iommu)
+static void iommu_set_device_table(struct amd_iommu *iommu)
 {
         u64 entry;
 
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index c9c6053198d4..132f93b05154 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -48,8 +48,6 @@
 #define ROOT_SIZE               VTD_PAGE_SIZE
 #define CONTEXT_SIZE            VTD_PAGE_SIZE
 
-#define IS_BRIDGE_HOST_DEVICE(pdev) \
-                            ((pdev->class >> 8) == PCI_CLASS_BRIDGE_HOST)
 #define IS_GFX_DEVICE(pdev) ((pdev->class >> 16) == PCI_BASE_CLASS_DISPLAY)
 #define IS_ISA_DEVICE(pdev) ((pdev->class >> 8) == PCI_CLASS_BRIDGE_ISA)
 #define IS_AZALIA(pdev) ((pdev)->vendor == 0x8086 && (pdev)->device == 0x3a3e)
@@ -356,10 +354,18 @@ static int hw_pass_through = 1;
 /* si_domain contains mulitple devices */
 #define DOMAIN_FLAG_STATIC_IDENTITY     (1 << 2)
 
+/* define the limit of IOMMUs supported in each domain */
+#ifdef  CONFIG_X86
+# define        IOMMU_UNITS_SUPPORTED   MAX_IO_APICS
+#else
+# define        IOMMU_UNITS_SUPPORTED   64
+#endif
+
 struct dmar_domain {
         int     id;                     /* domain id */
         int     nid;                    /* node id */
-        unsigned long iommu_bmp;        /* bitmap of iommus this domain uses*/
+        DECLARE_BITMAP(iommu_bmp, IOMMU_UNITS_SUPPORTED);
+                                        /* bitmap of iommus this domain uses*/
 
         struct list_head devices;       /* all devices' list */
         struct iova_domain iovad;       /* iova's that belong to this domain */
@@ -571,7 +577,7 @@ static struct intel_iommu *domain_get_iommu(struct dmar_domain *domain)
         BUG_ON(domain->flags & DOMAIN_FLAG_VIRTUAL_MACHINE);
         BUG_ON(domain->flags & DOMAIN_FLAG_STATIC_IDENTITY);
 
-        iommu_id = find_first_bit(&domain->iommu_bmp, g_num_of_iommus);
+        iommu_id = find_first_bit(domain->iommu_bmp, g_num_of_iommus);
         if (iommu_id < 0 || iommu_id >= g_num_of_iommus)
                 return NULL;
 
@@ -584,7 +590,7 @@ static void domain_update_iommu_coherency(struct dmar_domain *domain)
 
         domain->iommu_coherency = 1;
 
-        for_each_set_bit(i, &domain->iommu_bmp, g_num_of_iommus) {
+        for_each_set_bit(i, domain->iommu_bmp, g_num_of_iommus) {
                 if (!ecap_coherent(g_iommus[i]->ecap)) {
                         domain->iommu_coherency = 0;
                         break;
@@ -598,7 +604,7 @@ static void domain_update_iommu_snooping(struct dmar_domain *domain)
 
         domain->iommu_snooping = 1;
 
-        for_each_set_bit(i, &domain->iommu_bmp, g_num_of_iommus) {
+        for_each_set_bit(i, domain->iommu_bmp, g_num_of_iommus) {
                 if (!ecap_sc_support(g_iommus[i]->ecap)) {
                         domain->iommu_snooping = 0;
                         break;
@@ -1241,7 +1247,7 @@ static int iommu_init_domains(struct intel_iommu *iommu)
         unsigned long nlongs;
 
         ndomains = cap_ndoms(iommu->cap);
-        pr_debug("IOMMU %d: Number of Domains supportd <%ld>\n", iommu->seq_id,
+        pr_debug("IOMMU %d: Number of Domains supported <%ld>\n", iommu->seq_id,
                         ndomains);
         nlongs = BITS_TO_LONGS(ndomains);
 
@@ -1334,7 +1340,7 @@ static struct dmar_domain *alloc_domain(void)
                 return NULL;
 
         domain->nid = -1;
-        memset(&domain->iommu_bmp, 0, sizeof(unsigned long));
+        memset(domain->iommu_bmp, 0, sizeof(domain->iommu_bmp));
         domain->flags = 0;
 
         return domain;
@@ -1360,7 +1366,7 @@ static int iommu_attach_domain(struct dmar_domain *domain,
 
         domain->id = num;
         set_bit(num, iommu->domain_ids);
-        set_bit(iommu->seq_id, &domain->iommu_bmp);
+        set_bit(iommu->seq_id, domain->iommu_bmp);
         iommu->domains[num] = domain;
         spin_unlock_irqrestore(&iommu->lock, flags);
 
@@ -1385,7 +1391,7 @@ static void iommu_detach_domain(struct dmar_domain *domain,
 
         if (found) {
                 clear_bit(num, iommu->domain_ids);
-                clear_bit(iommu->seq_id, &domain->iommu_bmp);
+                clear_bit(iommu->seq_id, domain->iommu_bmp);
                 iommu->domains[num] = NULL;
         }
         spin_unlock_irqrestore(&iommu->lock, flags);
@@ -1527,7 +1533,7 @@ static void domain_exit(struct dmar_domain *domain)
         dma_pte_free_pagetable(domain, 0, DOMAIN_MAX_PFN(domain->gaw));
 
         for_each_active_iommu(iommu, drhd)
-                if (test_bit(iommu->seq_id, &domain->iommu_bmp))
+                if (test_bit(iommu->seq_id, domain->iommu_bmp))
                         iommu_detach_domain(domain, iommu);
 
         free_domain_mem(domain);
@@ -1653,7 +1659,7 @@ static int domain_context_mapping_one(struct dmar_domain *domain, int segment,
         spin_unlock_irqrestore(&iommu->lock, flags);
 
         spin_lock_irqsave(&domain->iommu_lock, flags);
-        if (!test_and_set_bit(iommu->seq_id, &domain->iommu_bmp)) {
+        if (!test_and_set_bit(iommu->seq_id, domain->iommu_bmp)) {
                 domain->iommu_count++;
                 if (domain->iommu_count == 1)
                         domain->nid = iommu->node;
@@ -2369,18 +2375,18 @@ static int __init iommu_prepare_static_identity_mapping(int hw)
                 return -EFAULT;
 
         for_each_pci_dev(pdev) {
-                /* Skip Host/PCI Bridge devices */
-                if (IS_BRIDGE_HOST_DEVICE(pdev))
-                        continue;
                 if (iommu_should_identity_map(pdev, 1)) {
-                        printk(KERN_INFO "IOMMU: %s identity mapping for device %s\n",
-                               hw ? "hardware" : "software", pci_name(pdev));
-
                         ret = domain_add_dev_info(si_domain, pdev,
-                                                     hw ? CONTEXT_TT_PASS_THROUGH :
-                                                     CONTEXT_TT_MULTI_LEVEL);
-                        if (ret)
+                                             hw ? CONTEXT_TT_PASS_THROUGH :
+                                                  CONTEXT_TT_MULTI_LEVEL);
+                        if (ret) {
+                                /* device not associated with an iommu */
+                                if (ret == -ENODEV)
+                                        continue;
                                 return ret;
+                        }
+                        pr_info("IOMMU: %s identity mapping for device %s\n",
+                                hw ? "hardware" : "software", pci_name(pdev));
                 }
         }
 
@@ -2402,12 +2408,17 @@ static int __init init_dmars(void)
          * endfor
          */
         for_each_drhd_unit(drhd) {
-                g_num_of_iommus++;
                 /*
                  * lock not needed as this is only incremented in the single
                  * threaded kernel __init code path all other access are read
                  * only
                  */
+                if (g_num_of_iommus < IOMMU_UNITS_SUPPORTED) {
+                        g_num_of_iommus++;
+                        continue;
+                }
+                printk_once(KERN_ERR "intel-iommu: exceeded %d IOMMUs\n",
+                          IOMMU_UNITS_SUPPORTED);
         }
 
         g_iommus = kcalloc(g_num_of_iommus, sizeof(struct intel_iommu *),
@@ -3748,7 +3759,7 @@ static void domain_remove_one_dev_info(struct dmar_domain *domain,
         if (found == 0) {
                 unsigned long tmp_flags;
                 spin_lock_irqsave(&domain->iommu_lock, tmp_flags);
-                clear_bit(iommu->seq_id, &domain->iommu_bmp);
+                clear_bit(iommu->seq_id, domain->iommu_bmp);
                 domain->iommu_count--;
                 domain_update_iommu_cap(domain);
                 spin_unlock_irqrestore(&domain->iommu_lock, tmp_flags);
@@ -3790,7 +3801,7 @@ static void vm_domain_remove_all_dev_info(struct dmar_domain *domain)
                  */
                 spin_lock_irqsave(&domain->iommu_lock, flags2);
                 if (test_and_clear_bit(iommu->seq_id,
-                                       &domain->iommu_bmp)) {
+                                       domain->iommu_bmp)) {
                         domain->iommu_count--;
                         domain_update_iommu_cap(domain);
                 }
@@ -3815,7 +3826,7 @@ static struct dmar_domain *iommu_alloc_vm_domain(void)
 
         domain->id = vm_domid++;
         domain->nid = -1;
-        memset(&domain->iommu_bmp, 0, sizeof(unsigned long));
+        memset(domain->iommu_bmp, 0, sizeof(domain->iommu_bmp));
         domain->flags = DOMAIN_FLAG_VIRTUAL_MACHINE;
 
         return domain;
diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c
index 288da5c1499d..103dbd92e256 100644
--- a/drivers/iommu/omap-iommu-debug.c
+++ b/drivers/iommu/omap-iommu-debug.c
@@ -44,7 +44,8 @@ static ssize_t debug_read_ver(struct file *file, char __user *userbuf,
 static ssize_t debug_read_regs(struct file *file, char __user *userbuf,
                                size_t count, loff_t *ppos)
 {
-        struct omap_iommu *obj = file->private_data;
+        struct device *dev = file->private_data;
+        struct omap_iommu *obj = dev_to_omap_iommu(dev);
         char *p, *buf;
         ssize_t bytes;
 
@@ -67,7 +68,8 @@ static ssize_t debug_read_regs(struct file *file, char __user *userbuf,
 static ssize_t debug_read_tlb(struct file *file, char __user *userbuf,
                               size_t count, loff_t *ppos)
 {
-        struct omap_iommu *obj = file->private_data;
+        struct device *dev = file->private_data;
+        struct omap_iommu *obj = dev_to_omap_iommu(dev);
         char *p, *buf;
         ssize_t bytes, rest;
 
@@ -97,7 +99,8 @@ static ssize_t debug_write_pagetable(struct file *file,
         struct iotlb_entry e;
         struct cr_regs cr;
         int err;
-        struct omap_iommu *obj = file->private_data;
+        struct device *dev = file->private_data;
+        struct omap_iommu *obj = dev_to_omap_iommu(dev);
         char buf[MAXCOLUMN], *p = buf;
 
         count = min(count, sizeof(buf));
@@ -184,7 +187,8 @@ out:
 static ssize_t debug_read_pagetable(struct file *file, char __user *userbuf,
                                     size_t count, loff_t *ppos)
 {
-        struct omap_iommu *obj = file->private_data;
+        struct device *dev = file->private_data;
+        struct omap_iommu *obj = dev_to_omap_iommu(dev);
         char *p, *buf;
         size_t bytes;
 
@@ -212,7 +216,8 @@ static ssize_t debug_read_pagetable(struct file *file, char __user *userbuf,
 static ssize_t debug_read_mmap(struct file *file, char __user *userbuf,
                                size_t count, loff_t *ppos)
 {
-        struct omap_iommu *obj = file->private_data;
+        struct device *dev = file->private_data;
+        struct omap_iommu *obj = dev_to_omap_iommu(dev);
         char *p, *buf;
         struct iovm_struct *tmp;
         int uninitialized_var(i);
@@ -254,7 +259,7 @@ static ssize_t debug_read_mmap(struct file *file, char __user *userbuf,
 static ssize_t debug_read_mem(struct file *file, char __user *userbuf,
                               size_t count, loff_t *ppos)
 {
-        struct omap_iommu *obj = file->private_data;
+        struct device *dev = file->private_data;
         char *p, *buf;
         struct iovm_struct *area;
         ssize_t bytes;
@@ -268,8 +273,8 @@ static ssize_t debug_read_mem(struct file *file, char __user *userbuf,
 
         mutex_lock(&iommu_debug_lock);
 
-        area = omap_find_iovm_area(obj, (u32)ppos);
-        if (IS_ERR(area)) {
+        area = omap_find_iovm_area(dev, (u32)ppos);
+        if (!area) {
                 bytes = -EINVAL;
                 goto err_out;
         }
@@ -287,7 +292,7 @@ err_out:
 static ssize_t debug_write_mem(struct file *file, const char __user *userbuf,
                                size_t count, loff_t *ppos)
 {
-        struct omap_iommu *obj = file->private_data;
+        struct device *dev = file->private_data;
         struct iovm_struct *area;
         char *p, *buf;
 
@@ -305,8 +310,8 @@ static ssize_t debug_write_mem(struct file *file, const char __user *userbuf,
                 goto err_out;
         }
 
-        area = omap_find_iovm_area(obj, (u32)ppos);
-        if (IS_ERR(area)) {
+        area = omap_find_iovm_area(dev, (u32)ppos);
+        if (!area) {
                 count = -EINVAL;
                 goto err_out;
         }
@@ -350,7 +355,7 @@ DEBUG_FOPS(mem);
         {                                                               \
                 struct dentry *dent;                                    \
                 dent = debugfs_create_file(#attr, mode, parent,         \
-                                           obj, &debug_##attr##_fops);  \
+                                           dev, &debug_##attr##_fops);  \
                 if (!dent)                                              \
                         return -ENOMEM;                                 \
         }
@@ -362,20 +367,29 @@ static int iommu_debug_register(struct device *dev, void *data)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct omap_iommu *obj = platform_get_drvdata(pdev);
+        struct omap_iommu_arch_data *arch_data;
         struct dentry *d, *parent;
 
         if (!obj || !obj->dev)
                 return -EINVAL;
 
+        arch_data = kzalloc(sizeof(*arch_data), GFP_KERNEL);
+        if (!arch_data)
+                return -ENOMEM;
+
+        arch_data->iommu_dev = obj;
+
+        dev->archdata.iommu = arch_data;
+
         d = debugfs_create_dir(obj->name, iommu_debug_root);
         if (!d)
-                return -ENOMEM;
+                goto nomem;
         parent = d;
 
         d = debugfs_create_u8("nr_tlb_entries", 400, parent,
                               (u8 *)&obj->nr_tlb_entries);
         if (!d)
-                return -ENOMEM;
+                goto nomem;
 
         DEBUG_ADD_FILE_RO(ver);
         DEBUG_ADD_FILE_RO(regs);
@@ -385,6 +399,22 @@ static int iommu_debug_register(struct device *dev, void *data)
         DEBUG_ADD_FILE(mem);
 
         return 0;
+
+nomem:
+        kfree(arch_data);
+        return -ENOMEM;
+}
+
+static int iommu_debug_unregister(struct device *dev, void *data)
+{
+        if (!dev->archdata.iommu)
+                return 0;
+
+        kfree(dev->archdata.iommu);
+
+        dev->archdata.iommu = NULL;
+
+        return 0;
 }
 
 static int __init iommu_debug_init(void)
@@ -411,6 +441,7 @@ module_init(iommu_debug_init)
 static void __exit iommu_debugfs_exit(void)
 {
         debugfs_remove_recursive(iommu_debug_root);
+        omap_foreach_iommu_device(NULL, iommu_debug_unregister);
 }
 module_exit(iommu_debugfs_exit)
 
diff --git a/drivers/iommu/omap-iommu.c b/drivers/iommu/omap-iommu.c
index d8edd979d01b..6899dcd02dfa 100644
--- a/drivers/iommu/omap-iommu.c
+++ b/drivers/iommu/omap-iommu.c
@@ -1223,7 +1223,8 @@ static int __init omap_iommu_init(void)
 
         return platform_driver_register(&omap_iommu_driver);
 }
-module_init(omap_iommu_init);
+/* must be ready before omap3isp is probed */
+subsys_initcall(omap_iommu_init);
 
 static void __exit omap_iommu_exit(void)
 {