From: David Daney <ddaney@caviumnetworks.com>
Date: Mon, 26 Jul 2010 21:29:37 +0000 (-0700)
Subject: MIPS: Decode core number for R2 CPUs.
X-Git-Tag: v2.6.36-rc1~563^2~19
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0c2f4551df3880083e4733b5d928d2758b71162c;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

MIPS: Decode core number for R2 CPUs.

The struct cpuinfo_mips.core field should be populated with the
physical core number.  For R2 CPUs, this is carried in the low 10 bits
of Ebase.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/1505/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
---

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 9b663317..b1b304e 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -761,6 +761,9 @@ static void __cpuinit decode_configs(struct cpuinfo_mips *c)
 		ok = decode_config4(c);
 
 	mips_probe_watch_registers(c);
+
+	if (cpu_has_mips_r2)
+		c->core = read_c0_ebase() & 0x3ff;
 }
 
 static inline void cpu_probe_mips(struct cpuinfo_mips *c, unsigned int cpu)