Merge branch 'v2.6.34-rc7.iommu' of git://gitorious.org/~doyu/lk/mainline into omap-for-linus

4 files changed, 162 insertions, 111 deletions

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 4b9fc57770db..7d2cf0f714c0 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -89,10 +89,7 @@ obj-$(CONFIG_OMAP3_EMU)			+= emu.o
 obj-$(CONFIG_OMAP_MBOX_FWK)             += mailbox_mach.o
 mailbox_mach-objs                       := mailbox.o
 
-iommu-y                                 += iommu2.o
-iommu-$(CONFIG_ARCH_OMAP3)              += omap3-iommu.o
-
-obj-$(CONFIG_OMAP_IOMMU)                += $(iommu-y)
+obj-$(CONFIG_OMAP_IOMMU)                := iommu2.o omap-iommu.o
 
 i2c-omap-$(CONFIG_I2C_OMAP)             := i2c.o
 obj-y                                   += $(i2c-omap-m) $(i2c-omap-y)
diff --git a/arch/arm/mach-omap2/iommu2.c b/arch/arm/mach-omap2/iommu2.c
index 4f63dc6859a4..e82da680d908 100644
--- a/arch/arm/mach-omap2/iommu2.c
+++ b/arch/arm/mach-omap2/iommu2.c
@@ -147,6 +147,7 @@ static u32 omap2_iommu_fault_isr(struct iommu *obj, u32 *ra)
         printk("\n");
 
         iommu_write_reg(obj, stat, MMU_IRQSTATUS);
+        omap2_iommu_disable(obj);
         return stat;
 }
 
@@ -184,7 +185,7 @@ static struct cr_regs *omap2_alloc_cr(struct iommu *obj, struct iotlb_entry *e)
         if (!cr)
                 return ERR_PTR(-ENOMEM);
 
-        cr->cam = (e->da & MMU_CAM_VATAG_MASK) | e->prsvd | e->pgsz;
+        cr->cam = (e->da & MMU_CAM_VATAG_MASK) | e->prsvd | e->pgsz | e->valid;
         cr->ram = e->pa | e->endian | e->elsz | e->mixed;
 
         return cr;
@@ -212,7 +213,8 @@ static ssize_t omap2_dump_cr(struct iommu *obj, struct cr_regs *cr, char *buf)
         char *p = buf;
 
         /* FIXME: Need more detail analysis of cam/ram */
-        p += sprintf(p, "%08x %08x\n", cr->cam, cr->ram);
+        p += sprintf(p, "%08x %08x %01x\n", cr->cam, cr->ram,
+                                        (cr->cam & MMU_CAM_P) ? 1 : 0);
 
         return p - buf;
 }
diff --git a/arch/arm/mach-omap2/omap-iommu.c b/arch/arm/mach-omap2/omap-iommu.c
new file mode 100644
index 000000000000..eb9bee73e0cb
--- /dev/null
+++ b/arch/arm/mach-omap2/omap-iommu.c
@@ -0,0 +1,157 @@
+/*
+ * omap iommu: omap device registration
+ *
+ * Copyright (C) 2008-2009 Nokia Corporation
+ *
+ * Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+
+#include <plat/iommu.h>
+#include <plat/irqs.h>
+
+struct iommu_device {
+        resource_size_t base;
+        int irq;
+        struct iommu_platform_data pdata;
+        struct resource res[2];
+};
+static struct iommu_device *devices;
+static int num_iommu_devices;
+
+#ifdef CONFIG_ARCH_OMAP3
+static struct iommu_device omap3_devices[] = {
+        {
+                .base = 0x480bd400,
+                .irq = 24,
+                .pdata = {
+                        .name = "isp",
+                        .nr_tlb_entries = 8,
+                        .clk_name = "cam_ick",
+                },
+        },
+#if defined(CONFIG_MPU_BRIDGE_IOMMU)
+        {
+                .base = 0x5d000000,
+                .irq = 28,
+                .pdata = {
+                        .name = "iva2",
+                        .nr_tlb_entries = 32,
+                        .clk_name = "iva2_ck",
+                },
+        },
+#endif
+};
+#define NR_OMAP3_IOMMU_DEVICES ARRAY_SIZE(omap3_devices)
+static struct platform_device *omap3_iommu_pdev[NR_OMAP3_IOMMU_DEVICES];
+#else
+#define omap3_devices           NULL
+#define NR_OMAP3_IOMMU_DEVICES  0
+#define omap3_iommu_pdev        NULL
+#endif
+
+#ifdef CONFIG_ARCH_OMAP4
+static struct iommu_device omap4_devices[] = {
+        {
+                .base = OMAP4_MMU1_BASE,
+                .irq = INT_44XX_DUCATI_MMU_IRQ,
+                .pdata = {
+                        .name = "ducati",
+                        .nr_tlb_entries = 32,
+                        .clk_name = "ducati_ick",
+                },
+        },
+#if defined(CONFIG_MPU_TESLA_IOMMU)
+        {
+                .base = OMAP4_MMU2_BASE,
+                .irq = INT_44XX_DSP_MMU,
+                .pdata = {
+                        .name = "tesla",
+                        .nr_tlb_entries = 32,
+                        .clk_name = "tesla_ick",
+                },
+        },
+#endif
+};
+#define NR_OMAP4_IOMMU_DEVICES ARRAY_SIZE(omap4_devices)
+static struct platform_device *omap4_iommu_pdev[NR_OMAP4_IOMMU_DEVICES];
+#else
+#define omap4_devices           NULL
+#define NR_OMAP4_IOMMU_DEVICES  0
+#define omap4_iommu_pdev        NULL
+#endif
+
+static struct platform_device **omap_iommu_pdev;
+
+static int __init omap_iommu_init(void)
+{
+        int i, err;
+        struct resource res[] = {
+                { .flags = IORESOURCE_MEM },
+                { .flags = IORESOURCE_IRQ },
+        };
+
+        if (cpu_is_omap34xx()) {
+                devices = omap3_devices;
+                omap_iommu_pdev = omap3_iommu_pdev;
+                num_iommu_devices = NR_OMAP3_IOMMU_DEVICES;
+        } else if (cpu_is_omap44xx()) {
+                devices = omap4_devices;
+                omap_iommu_pdev = omap4_iommu_pdev;
+                num_iommu_devices = NR_OMAP4_IOMMU_DEVICES;
+        } else
+                return -ENODEV;
+
+        for (i = 0; i < num_iommu_devices; i++) {
+                struct platform_device *pdev;
+                const struct iommu_device *d = &devices[i];
+
+                pdev = platform_device_alloc("omap-iommu", i);
+                if (!pdev) {
+                        err = -ENOMEM;
+                        goto err_out;
+                }
+
+                res[0].start = d->base;
+                res[0].end = d->base + MMU_REG_SIZE - 1;
+                res[1].start = res[1].end = d->irq;
+
+                err = platform_device_add_resources(pdev, res,
+                                                    ARRAY_SIZE(res));
+                if (err)
+                        goto err_out;
+                err = platform_device_add_data(pdev, &d->pdata,
+                                               sizeof(d->pdata));
+                if (err)
+                        goto err_out;
+                err = platform_device_add(pdev);
+                if (err)
+                        goto err_out;
+                omap_iommu_pdev[i] = pdev;
+        }
+        return 0;
+
+err_out:
+        while (i--)
+                platform_device_put(omap_iommu_pdev[i]);
+        return err;
+}
+module_init(omap_iommu_init);
+
+static void __exit omap_iommu_exit(void)
+{
+        int i;
+
+        for (i = 0; i < num_iommu_devices; i++)
+                platform_device_unregister(omap_iommu_pdev[i]);
+}
+module_exit(omap_iommu_exit);
+
+MODULE_AUTHOR("Hiroshi DOYU");
+MODULE_DESCRIPTION("omap iommu: omap device registration");
+MODULE_LICENSE("GPL v2");
diff --git a/arch/arm/mach-omap2/omap3-iommu.c b/arch/arm/mach-omap2/omap3-iommu.c
deleted file mode 100644
index fbbcb5c83367..000000000000
--- a/arch/arm/mach-omap2/omap3-iommu.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * omap iommu: omap3 device registration
- *
- * Copyright (C) 2008-2009 Nokia Corporation
- *
- * Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/platform_device.h>
-
-#include <plat/iommu.h>
-
-struct iommu_device {
-        resource_size_t base;
-        int irq;
-        struct iommu_platform_data pdata;
-        struct resource res[2];
-};
-
-static struct iommu_device devices[] = {
-        {
-                .base = 0x480bd400,
-                .irq = 24,
-                .pdata = {
-                        .name = "isp",
-                        .nr_tlb_entries = 8,
-                        .clk_name = "cam_ick",
-                },
-        },
-#if defined(CONFIG_MPU_BRIDGE_IOMMU)
-        {
-                .base = 0x5d000000,
-                .irq = 28,
-                .pdata = {
-                        .name = "iva2",
-                        .nr_tlb_entries = 32,
-                        .clk_name = "iva2_ck",
-                },
-        },
-#endif
-};
-#define NR_IOMMU_DEVICES ARRAY_SIZE(devices)
-
-static struct platform_device *omap3_iommu_pdev[NR_IOMMU_DEVICES];
-
-static int __init omap3_iommu_init(void)
-{
-        int i, err;
-        struct resource res[] = {
-                { .flags = IORESOURCE_MEM },
-                { .flags = IORESOURCE_IRQ },
-        };
-
-        for (i = 0; i < NR_IOMMU_DEVICES; i++) {
-                struct platform_device *pdev;
-                const struct iommu_device *d = &devices[i];
-
-                pdev = platform_device_alloc("omap-iommu", i);
-                if (!pdev) {
-                        err = -ENOMEM;
-                        goto err_out;
-                }
-
-                res[0].start = d->base;
-                res[0].end = d->base + MMU_REG_SIZE - 1;
-                res[1].start = res[1].end = d->irq;
-
-                err = platform_device_add_resources(pdev, res,
-                                                    ARRAY_SIZE(res));
-                if (err)
-                        goto err_out;
-                err = platform_device_add_data(pdev, &d->pdata,
-                                               sizeof(d->pdata));
-                if (err)
-                        goto err_out;
-                err = platform_device_add(pdev);
-                if (err)
-                        goto err_out;
-                omap3_iommu_pdev[i] = pdev;
-        }
-        return 0;
-
-err_out:
-        while (i--)
-                platform_device_put(omap3_iommu_pdev[i]);
-        return err;
-}
-module_init(omap3_iommu_init);
-
-static void __exit omap3_iommu_exit(void)
-{
-        int i;
-
-        for (i = 0; i < NR_IOMMU_DEVICES; i++)
-                platform_device_unregister(omap3_iommu_pdev[i]);
-}
-module_exit(omap3_iommu_exit);
-
-MODULE_AUTHOR("Hiroshi DOYU");
-MODULE_DESCRIPTION("omap iommu: omap3 device registration");
-MODULE_LICENSE("GPL v2");