diff options
author | Vineet Gupta <vgupta@synopsys.com> | 2015-04-16 10:19:12 -0400 |
---|---|---|
committer | Vineet Gupta <vgupta@synopsys.com> | 2015-06-22 04:36:54 -0400 |
commit | 10d11e580c50f8a6718a58f92198dbc031e63b0a (patch) | |
tree | 4ba4ab277c82b765c6d8a986859b3b4f732da12f | |
parent | 5793e273a134331d05ed904e5be3b31ccfca54c1 (diff) |
ARC: uncached base is hard constant for ARC, don't save it
ioremap already uses the hard define, just make sure BCR value matches
that
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
-rw-r--r-- | arch/arc/include/asm/arcregs.h | 1 | ||||
-rw-r--r-- | arch/arc/kernel/setup.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arc/include/asm/arcregs.h b/arch/arc/include/asm/arcregs.h index 3ab66fcd9df1..336a9f694c2e 100644 --- a/arch/arc/include/asm/arcregs.h +++ b/arch/arc/include/asm/arcregs.h | |||
@@ -320,7 +320,6 @@ struct cpuinfo_arc { | |||
320 | struct bcr_isa isa; | 320 | struct bcr_isa isa; |
321 | struct bcr_timer timers; | 321 | struct bcr_timer timers; |
322 | unsigned int vec_base; | 322 | unsigned int vec_base; |
323 | unsigned int uncached_base; | ||
324 | struct cpuinfo_arc_ccm iccm, dccm; | 323 | struct cpuinfo_arc_ccm iccm, dccm; |
325 | struct { | 324 | struct { |
326 | unsigned int swap:1, norm:1, minmax:1, barrel:1, crc:1, pad1:3, | 325 | unsigned int swap:1, norm:1, minmax:1, barrel:1, crc:1, pad1:3, |
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c index c6e8b72ff293..96d44805ea56 100644 --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c | |||
@@ -54,7 +54,7 @@ static void read_arc_build_cfg_regs(void) | |||
54 | cpu->vec_base = read_aux_reg(AUX_INTR_VEC_BASE); | 54 | cpu->vec_base = read_aux_reg(AUX_INTR_VEC_BASE); |
55 | 55 | ||
56 | READ_BCR(ARC_REG_D_UNCACH_BCR, uncached_space); | 56 | READ_BCR(ARC_REG_D_UNCACH_BCR, uncached_space); |
57 | cpu->uncached_base = uncached_space.start << 24; | 57 | BUG_ON((uncached_space.start << 24) != ARC_UNCACHED_ADDR_SPACE); |
58 | 58 | ||
59 | READ_BCR(ARC_REG_MUL_BCR, cpu->extn_mpy); | 59 | READ_BCR(ARC_REG_MUL_BCR, cpu->extn_mpy); |
60 | 60 | ||
@@ -218,7 +218,7 @@ static char *arc_extn_mumbojumbo(int cpu_id, char *buf, int len) | |||
218 | 218 | ||
219 | n += scnprintf(buf + n, len - n, | 219 | n += scnprintf(buf + n, len - n, |
220 | "Vector Table\t: %#x\nUncached Base\t: %#x\n", | 220 | "Vector Table\t: %#x\nUncached Base\t: %#x\n", |
221 | cpu->vec_base, cpu->uncached_base); | 221 | cpu->vec_base, ARC_UNCACHED_ADDR_SPACE); |
222 | 222 | ||
223 | if (cpu->extn.fpu_sp || cpu->extn.fpu_dp) | 223 | if (cpu->extn.fpu_sp || cpu->extn.fpu_dp) |
224 | n += scnprintf(buf + n, len - n, "FPU\t\t: %s%s\n", | 224 | n += scnprintf(buf + n, len - n, "FPU\t\t: %s%s\n", |