From: Florian Fainelli Date: Thu, 4 Feb 2016 02:14:53 +0000 (-0800) Subject: MIPS: BMIPS: Fill in current_cpu_data.core X-Git-Tag: v4.7-rc1~122^2~265 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=f6cc0ee98b230b085e019f0c791af68a4f99e446;p=karo-tx-linux.git MIPS: BMIPS: Fill in current_cpu_data.core Read the core ID in bmips_smp_finish() for BMIPS5000 CPUs to get appropriate processor parenting in set_cpu_sibling_map(). Signed-off-by: Florian Fainelli Cc: john@phrozen.org Cc: cernekee@gmail.com Cc: jon.fraser@broadcom.com Cc: jaedon.shin@gmail.com Cc: dragan.stancevic@gmail.com Cc: jogo@openwrt.org Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/12380/ Signed-off-by: Ralf Baechle --- diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c index 78cf8c2f1de0..6d11788b4502 100644 --- a/arch/mips/kernel/smp-bmips.c +++ b/arch/mips/kernel/smp-bmips.c @@ -243,6 +243,7 @@ static void bmips_init_secondary(void) break; case CPU_BMIPS5000: write_c0_brcm_action(ACTION_CLR_IPI(smp_processor_id(), 0)); + current_cpu_data.core = (read_c0_brcm_config() >> 25) & 3; break; } }