bus: omap_l3_noc: switch over to relaxed variants of readl/writel

Currently we use __raw_readl and writel in this driver. Considering
there is no specific need for a memory barrier, replacing writel
with endian-neutral writel_relaxed and replacing __raw_readls with
the corresponding endian-neutral readl_relaxed allows us to have a
standard set of register operations for the driver.

While at it, simplify address computation using variables for
register.

Signed-off-by: Nishanth Menon <nm@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: Darren Etheridge <detheridge@ti.com>
Tested-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/drivers/bus/omap_l3_noc.c b/drivers/bus/omap_l3_noc.c
index 37d71b7150537e71f0d258a8d710ef6065167fd0..c8facb00bb533d3421a86e8ef19cbc0de90f96c3 100644 (file)
--- a/drivers/bus/omap_l3_noc.c
+++ b/drivers/bus/omap_l3_noc.c
@@ -55,6 +55,7 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
        int err_src = 0;
        u32 std_err_main, err_reg, clear, masterid;
        void __iomem *base, *l3_targ_base;
+       void __iomem *l3_targ_stderr, *l3_targ_slvofslsb, *l3_targ_mstaddr;
        char *target_name, *master_name = "UN IDENTIFIED";
 
        /* Get the Type of interrupt */
@@ -66,8 +67,8 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
                 * to determine the source
                 */
                base = l3->l3_base[i];
-               err_reg = __raw_readl(base + l3_flagmux[i] +
-                                       + L3_FLAGMUX_REGERR0 + (inttype << 3));
+               err_reg = readl_relaxed(base + l3_flagmux[i] +
+                                       L3_FLAGMUX_REGERR0 + (inttype << 3));
 
                /* Get the corresponding error and analyse */
                if (err_reg) {
@@ -76,10 +77,14 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
 
                        /* Read the stderrlog_main_source from clk domain */
                        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);
+                       l3_targ_stderr = l3_targ_base + L3_TARG_STDERRLOG_MAIN;
+                       l3_targ_slvofslsb = l3_targ_base +
+                                           L3_TARG_STDERRLOG_SLVOFSLSB;
+                       l3_targ_mstaddr = l3_targ_base +
+                                         L3_TARG_STDERRLOG_MSTADDR;
+
+                       std_err_main = readl_relaxed(l3_targ_stderr);
+                       masterid = readl_relaxed(l3_targ_mstaddr);
 
                        switch (std_err_main & CUSTOM_ERROR) {
                        case STANDARD_ERROR:
@@ -87,12 +92,10 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
                                        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));
+                                       readl_relaxed(l3_targ_slvofslsb));
                                /* clear the std error log*/
                                clear = std_err_main | CLEAR_STDERR_LOG;
-                               writel(clear, l3_targ_base +
-                                       L3_TARG_STDERRLOG_MAIN);
+                               writel_relaxed(clear, l3_targ_stderr);
                                break;
 
                        case CUSTOM_ERROR:
@@ -107,8 +110,7 @@ static irqreturn_t l3_interrupt_handler(int irq, void *_l3)
                                        master_name, target_name);
                                /* clear the std error log*/
                                clear = std_err_main | CLEAR_STDERR_LOG;
-                               writel(clear, l3_targ_base +
-                                       L3_TARG_STDERRLOG_MAIN);
+                               writel_relaxed(clear, l3_targ_stderr);
                                break;
 
                        default: