ARC: uncached base is hard constant for ARC, don't save it
authorVineet Gupta <vgupta@synopsys.com>
Thu, 16 Apr 2015 14:19:12 +0000 (19:49 +0530)
committerVineet Gupta <vgupta@synopsys.com>
Mon, 22 Jun 2015 08:36:54 +0000 (14:06 +0530)
ioremap already uses the hard define, just make sure BCR value matches
that

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
arch/arc/include/asm/arcregs.h
arch/arc/kernel/setup.c

index 3ab66fcd9df1d9772b1ee9ea74ba2091331c764e..336a9f694c2e617027064fb71a7e16f37efe4289 100644 (file)
@@ -320,7 +320,6 @@ struct cpuinfo_arc {
        struct bcr_isa isa;
        struct bcr_timer timers;
        unsigned int vec_base;
-       unsigned int uncached_base;
        struct cpuinfo_arc_ccm iccm, dccm;
        struct {
                unsigned int swap:1, norm:1, minmax:1, barrel:1, crc:1, pad1:3,
index c6e8b72ff29303a9a87e7e88202c7c4a03e9df58..96d44805ea56d98dbc484c22d1fc0b45358966a3 100644 (file)
@@ -54,7 +54,7 @@ static void read_arc_build_cfg_regs(void)
        cpu->vec_base = read_aux_reg(AUX_INTR_VEC_BASE);
 
        READ_BCR(ARC_REG_D_UNCACH_BCR, uncached_space);
-       cpu->uncached_base = uncached_space.start << 24;
+       BUG_ON((uncached_space.start << 24) != ARC_UNCACHED_ADDR_SPACE);
 
        READ_BCR(ARC_REG_MUL_BCR, cpu->extn_mpy);
 
@@ -218,7 +218,7 @@ static char *arc_extn_mumbojumbo(int cpu_id, char *buf, int len)
 
        n += scnprintf(buf + n, len - n,
                       "Vector Table\t: %#x\nUncached Base\t: %#x\n",
-                      cpu->vec_base, cpu->uncached_base);
+                      cpu->vec_base, ARC_UNCACHED_ADDR_SPACE);
 
        if (cpu->extn.fpu_sp || cpu->extn.fpu_dp)
                n += scnprintf(buf + n, len - n, "FPU\t\t: %s%s\n",