Merge branch 'for_3_2/omap_misc' of git://gitorious.org/omap-sw-develoment/linux-omap-dev into l3

5 files changed, 322 insertions, 291 deletions

diff --git a/arch/arm/mach-omap2/omap_l3_noc.c b/arch/arm/mach-omap2/omap_l3_noc.c
index 7b9f1909ddb2..07a3d3ede768 100644
--- a/arch/arm/mach-omap2/omap_l3_noc.c
+++ b/arch/arm/mach-omap2/omap_l3_noc.c
@@ -1,25 +1,25 @@
 /*
-  * OMAP4XXX L3 Interconnect error handling driver
-  *
-  * Copyright (C) 2011 Texas Corporation
-  *     Santosh Shilimkar <santosh.shilimkar@ti.com>
-  *     Sricharan <r.sricharan@ti.com>
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation; either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  * USA
-  */
+ * OMAP4XXX L3 Interconnect error handling driver
+ *
+ * Copyright (C) 2011 Texas Corporation
+ *      Santosh Shilimkar <santosh.shilimkar@ti.com>
+ *      Sricharan <r.sricharan@ti.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA
+ */
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
@@ -55,12 +55,12 @@
 static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
 {
 
-        struct omap4_l3         *l3 = _l3;
-        int inttype, i, j;
+        struct omap4_l3 *l3 = _l3;
+        int inttype, i, k;
         int err_src = 0;
-        u32 std_err_main_addr, std_err_main, err_reg;
-        u32 base, slave_addr, clear;
-        char *source_name;
+        u32 std_err_main, err_reg, clear, masterid;
+        void __iomem *base, *l3_targ_base;
+        char *target_name, *master_name = "UN IDENTIFIED";
 
         /* Get the Type of interrupt */
         inttype = irq == l3->app_irq ? L3_APPLICATION_ERROR : L3_DEBUG_ERROR;
@@ -70,43 +70,50 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
                  * Read the regerr register of the clock domain
                  * to determine the source
                  */
-                base = (u32)l3->l3_base[i];
-                err_reg =  readl(base + l3_flagmux[i] + (inttype << 3));
+                base = l3->l3_base[i];
+                err_reg = __raw_readl(base + l3_flagmux[i] +
+                                        + L3_FLAGMUX_REGERR0 + (inttype << 3));
 
                 /* Get the corresponding error and analyse */
                 if (err_reg) {
                         /* Identify the source from control status register */
-                        for (j = 0; !(err_reg & (1 << j)); j++)
-                                                                        ;
+                        err_src = __ffs(err_reg);
 
-                        err_src = j;
                         /* Read the stderrlog_main_source from clk domain */
-                        std_err_main_addr = base + *(l3_targ[i] + err_src);
-                        std_err_main = readl(std_err_main_addr);
+                        l3_targ_base = base + *(l3_targ[i] + err_src);
+                        std_err_main =  __raw_readl(l3_targ_base +
+                                        L3_TARG_STDERRLOG_MAIN);
+                        masterid = __raw_readl(l3_targ_base +
+                                        L3_TARG_STDERRLOG_MSTADDR);
 
                         switch (std_err_main & CUSTOM_ERROR) {
                         case STANDARD_ERROR:
-                                source_name =
-                                l3_targ_stderrlog_main_name[i][err_src];
-
-                                slave_addr = std_err_main_addr +
-                                                L3_SLAVE_ADDRESS_OFFSET;
-                                WARN(true, "L3 standard error: SOURCE:%s at address 0x%x\n",
-                                        source_name, readl(slave_addr));
+                                target_name =
+                                        l3_targ_inst_name[i][err_src];
+                                WARN(true, "L3 standard error: TARGET:%s at address 0x%x\n",
+                                        target_name,
+                                        __raw_readl(l3_targ_base +
+                                                L3_TARG_STDERRLOG_SLVOFSLSB));
                                 /* clear the std error log*/
                                 clear = std_err_main | CLEAR_STDERR_LOG;
-                                writel(clear, std_err_main_addr);
+                                writel(clear, l3_targ_base +
+                                        L3_TARG_STDERRLOG_MAIN);
                                 break;
 
                         case CUSTOM_ERROR:
-                                source_name =
-                                l3_targ_stderrlog_main_name[i][err_src];
-
-                                WARN(true, "CUSTOM SRESP error with SOURCE:%s\n",
-                                                        source_name);
+                                target_name =
+                                        l3_targ_inst_name[i][err_src];
+                                for (k = 0; k < NUM_OF_L3_MASTERS; k++) {
+                                        if (masterid == l3_masters[k].id)
+                                                master_name =
+                                                        l3_masters[k].name;
+                                }
+                                WARN(true, "L3 custom error: MASTER:%s TARGET:%s\n",
+                                        master_name, target_name);
                                 /* clear the std error log*/
                                 clear = std_err_main | CLEAR_STDERR_LOG;
-                                writel(clear, std_err_main_addr);
+                                writel(clear, l3_targ_base +
+                                        L3_TARG_STDERRLOG_MAIN);
                                 break;
 
                         default:
@@ -122,10 +129,9 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
 
 static int __init omap4_l3_probe(struct platform_device *pdev)
 {
-        static struct omap4_l3          *l3;
-        struct resource         *res;
-        int                     ret;
-        int                     irq;
+        static struct omap4_l3 *l3;
+        struct resource *res;
+        int ret;
 
         l3 = kzalloc(sizeof(*l3), GFP_KERNEL);
         if (!l3)
@@ -177,27 +183,25 @@ static int __init omap4_l3_probe(struct platform_device *pdev)
         /*
          * Setup interrupt Handlers
          */
-        irq = platform_get_irq(pdev, 0);
-        ret = request_irq(irq,
+        l3->debug_irq = platform_get_irq(pdev, 0);
+        ret = request_irq(l3->debug_irq,
                         l3_interrupt_handler,
                         IRQF_DISABLED, "l3-dbg-irq", l3);
         if (ret) {
                 pr_crit("L3: request_irq failed to register for 0x%x\n",
-                                         OMAP44XX_IRQ_L3_DBG);
+                                                OMAP44XX_IRQ_L3_DBG);
                 goto err3;