MIPS: Netlogic: Core wakeup improvements

Move wakeup to after early console. This will allow us to display error
messages when cores are not woken up.  Also reduce the wait time for core
to come up.

Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6303/

1 files changed, 8 insertions, 6 deletions

diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c
index 2a39bbeb45b0..c3af2d8772cf 100644
--- a/arch/mips/netlogic/xlp/setup.c
+++ b/arch/mips/netlogic/xlp/setup.c
@@ -96,6 +96,14 @@ static void __init xlp_init_mem_from_bars(void)
 
 void __init plat_mem_setup(void)
 {
+#ifdef CONFIG_SMP
+        nlm_wakeup_secondary_cpus();
+
+        /* update TLB size after waking up threads */
+        current_cpu_data.tlbsize = ((read_c0_config6() >> 16) & 0xffff) + 1;
+
+        register_smp_ops(&nlm_smp_ops);
+#endif
         panic_timeout   = 5;
         _machine_restart = (void (*)(char *))nlm_linux_exit;
         _machine_halt   = nlm_linux_exit;
@@ -172,11 +180,5 @@ void __init prom_init(void)
 
 #ifdef CONFIG_SMP
         cpumask_setall(&nlm_cpumask);
-        nlm_wakeup_secondary_cpus();
-
-        /* update TLB size after waking up threads */
-        current_cpu_data.tlbsize = ((read_c0_config6() >> 16) & 0xffff) + 1;
-
-        register_smp_ops(&nlm_smp_ops);
 #endif
 }