3 files changed, 19 insertions, 28 deletions

diff --git a/arch/arm64/include/asm/proc-fns.h b/arch/arm64/include/asm/proc-fns.h
index 0c657bb54597..9a8fd84f8fb2 100644
--- a/arch/arm64/include/asm/proc-fns.h
+++ b/arch/arm64/include/asm/proc-fns.h
@@ -32,6 +32,8 @@ extern void cpu_cache_off(void);
 extern void cpu_do_idle(void);
 extern void cpu_do_switch_mm(unsigned long pgd_phys, struct mm_struct *mm);
 extern void cpu_reset(unsigned long addr) __attribute__((noreturn));
+void cpu_soft_restart(phys_addr_t cpu_reset,
+                unsigned long addr) __attribute__((noreturn));
 extern void cpu_do_suspend(struct cpu_suspend_ctx *ptr);
 extern u64 cpu_do_resume(phys_addr_t ptr, u64 idmap_ttbr);
 
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 1309d64aa926..bf669228a59f 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -57,36 +57,10 @@ unsigned long __stack_chk_guard __read_mostly;
 EXPORT_SYMBOL(__stack_chk_guard);
 #endif
 
-static void setup_restart(void)
-{
-        /*
-         * Tell the mm system that we are going to reboot -
-         * we may need it to insert some 1:1 mappings so that
-         * soft boot works.
-         */
-        setup_mm_for_reboot();
-
-        /* Clean and invalidate caches */
-        flush_cache_all();
-
-        /* Turn D-cache off */
-        cpu_cache_off();
-
-        /* Push out any further dirty data, and ensure cache is empty */
-        flush_cache_all();
-}
-
 void soft_restart(unsigned long addr)
 {
-        typedef void (*phys_reset_t)(unsigned long);
-        phys_reset_t phys_reset;
-
-        setup_restart();
-
-        /* Switch to the identity mapping */
-        phys_reset = (phys_reset_t)virt_to_phys(cpu_reset);
-        phys_reset(addr);
-
+        setup_mm_for_reboot();
+        cpu_soft_restart(virt_to_phys(cpu_reset), addr);
         /* Should never get here */
         BUG();
 }
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index 7736779c9809..4e778b13291b 100644
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -76,6 +76,21 @@ ENTRY(cpu_reset)
         ret     x0
 ENDPROC(cpu_reset)
 
+ENTRY(cpu_soft_restart)
+        /* Save address of cpu_reset() and reset address */
+        mov     x19, x0
+        mov     x20, x1
+
+        /* Turn D-cache off */
+        bl      cpu_cache_off
+
+        /* Push out all dirty data, and ensure cache is empty */
+        bl      flush_cache_all
+
+        mov     x0, x20
+        ret     x19
+ENDPROC(cpu_soft_restart)
+
 /*
  *      cpu_do_idle()
  *