diff options
| author | Vineet Gupta <vgupta@synopsys.com> | 2015-04-16 19:49:12 +0530 |
|---|---|---|
| committer | Vineet Gupta <vgupta@synopsys.com> | 2015-06-22 14:06:54 +0530 |
| commit | 10d11e580c50f8a6718a58f92198dbc031e63b0a (patch) | |
| tree | 4ba4ab277c82b765c6d8a986859b3b4f732da12f | |
| parent | 5793e273a134331d05ed904e5be3b31ccfca54c1 (diff) | |
| download | blackbird-op-linux-10d11e580c50f8a6718a58f92198dbc031e63b0a.tar.gz blackbird-op-linux-10d11e580c50f8a6718a58f92198dbc031e63b0a.zip | |
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 { 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, 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) 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", |
