MIPS: Netlogic: Initialization when !CONFIG_SMP

The core initialization and reset vector setup needs to be done
even when booting uniprocessor. Move this code from smp.c to setup.c

Signed-off-by: Jayachandran C <jchandra@broadcom.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/5428/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

2 files changed, 8 insertions, 1 deletions

diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c
index 7b6694998cdc..5bdd354fef48 100644
--- a/arch/mips/netlogic/xlp/setup.c
+++ b/arch/mips/netlogic/xlp/setup.c
@@ -98,11 +98,19 @@ void nlm_percpu_init(int hwcpuid)
 
 void __init prom_init(void)
 {
+        void *reset_vec;
+
         nlm_io_base = CKSEG1ADDR(XLP_DEFAULT_IO_BASE);
+        nlm_init_boot_cpu();
         xlp_mmu_init();
         nlm_node_init(0);
         xlp_dt_init((void *)(long)fw_arg0);
 
+        /* Update reset entry point with CPU init code */
+        reset_vec = (void *)CKSEG1ADDR(RESET_VEC_PHYS);
+        memcpy(reset_vec, (void *)nlm_reset_entry,
+                        (nlm_reset_entry_end - nlm_reset_entry));
+
 #ifdef CONFIG_SMP
         cpumask_setall(&nlm_cpumask);
         nlm_wakeup_secondary_cpus();
diff --git a/arch/mips/netlogic/xlp/wakeup.c b/arch/mips/netlogic/xlp/wakeup.c
index 1a7d529fcec0..abb3e08cc052 100644
--- a/arch/mips/netlogic/xlp/wakeup.c
+++ b/arch/mips/netlogic/xlp/wakeup.c
@@ -137,7 +137,6 @@ void xlp_wakeup_secondary_cpus()
          * In case of u-boot, the secondaries are in reset
          * first wakeup core 0 threads
          */
-        nlm_init_boot_cpu();
         xlp_boot_core0_siblings();
 
         /* now get other cores out of reset */