2 files changed, 11 insertions, 9 deletions

diff --git a/arch/arc/kernel/head.S b/arch/arc/kernel/head.S
index 689dd867fdff..8b90d25a15cc 100644
--- a/arch/arc/kernel/head.S
+++ b/arch/arc/kernel/head.S
@@ -71,14 +71,14 @@ ENTRY(stext)
         GET_CPU_ID  r5
         cmp     r5, 0
         mov.nz  r0, r5
-#ifdef CONFIG_ARC_SMP_HALT_ON_RESET
-        ; Non-Master can proceed as system would be booted sufficiently
-        jnz     first_lines_of_secondary
-#else
+        bz      .Lmaster_proceed
+
         ; Non-Masters wait for Master to boot enough and bring them up
-        jnz     arc_platform_smp_wait_to_boot
-#endif
-        ; Master falls thru
+        ; when they resume, tail-call to entry point
+        mov     blink, @first_lines_of_secondary
+        j       arc_platform_smp_wait_to_boot
+
+.Lmaster_proceed:
 #endif
 
         ; Clear BSS before updating any globals
diff --git a/arch/arc/kernel/smp.c b/arch/arc/kernel/smp.c
index 88674d972c9d..44a0d21ed342 100644
--- a/arch/arc/kernel/smp.c
+++ b/arch/arc/kernel/smp.c
@@ -98,14 +98,16 @@ static void arc_default_smp_cpu_kick(int cpu, unsigned long pc)
 
 void arc_platform_smp_wait_to_boot(int cpu)
 {
+        /* for halt-on-reset, we've waited already */
+        if (IS_ENABLED(CONFIG_ARC_SMP_HALT_ON_RESET))
+                return;
+
         while (wake_flag != cpu)
                 ;
 
         wake_flag = 0;
-        __asm__ __volatile__("j @first_lines_of_secondary       \n");
 }
 
-
 const char *arc_platform_smp_cpuinfo(void)
 {
         return plat_smp_ops.info ? : "";