1 files changed, 29 insertions, 19 deletions

diff --git a/arch/arm64/kernel/suspend.c b/arch/arm64/kernel/suspend.c
index 55a99b9a97e0..13ad4dbb1615 100644
--- a/arch/arm64/kernel/suspend.c
+++ b/arch/arm64/kernel/suspend.c
@@ -9,22 +9,19 @@
 #include <asm/suspend.h>
 #include <asm/tlbflush.h>
 
-extern int __cpu_suspend(unsigned long);
+extern int __cpu_suspend_enter(unsigned long arg, int (*fn)(unsigned long));
 /*
- * This is called by __cpu_suspend() to save the state, and do whatever
+ * This is called by __cpu_suspend_enter() to save the state, and do whatever
  * flushing is required to ensure that when the CPU goes to sleep we have
  * the necessary data available when the caches are not searched.
  *
- * @arg: Argument to pass to suspend operations
- * @ptr: CPU context virtual address
- * @save_ptr: address of the location where the context physical address
- *            must be saved
+ * ptr: CPU context virtual address
+ * save_ptr: address of the location where the context physical address
+ *           must be saved
  */
-int __cpu_suspend_finisher(unsigned long arg, struct cpu_suspend_ctx *ptr,
-                           phys_addr_t *save_ptr)
+void notrace __cpu_suspend_save(struct cpu_suspend_ctx *ptr,
+                                phys_addr_t *save_ptr)
 {
-        int cpu = smp_processor_id();
-
         *save_ptr = virt_to_phys(ptr);
 
         cpu_do_suspend(ptr);
@@ -35,8 +32,6 @@ int __cpu_suspend_finisher(unsigned long arg, struct cpu_suspend_ctx *ptr,
          */
         __flush_dcache_area(ptr, sizeof(*ptr));
         __flush_dcache_area(save_ptr, sizeof(*save_ptr));
-
-        return cpu_ops[cpu]->cpu_suspend(arg);
 }
 
 /*
@@ -56,15 +51,15 @@ void __init cpu_suspend_set_dbg_restorer(void (*hw_bp_restore)(void *))
 }
 
 /**
- * cpu_suspend
+ * cpu_suspend() - function to enter a low-power state
+ * @arg: argument to pass to CPU suspend operations
  *
- * @arg: argument to pass to the finisher function
+ * Return: 0 on success, -EOPNOTSUPP if CPU suspend hook not initialized, CPU
+ * operations back-end error code otherwise.
  */
 int cpu_suspend(unsigned long arg)
 {
-        struct mm_struct *mm = current->active_mm;
-        int ret, cpu = smp_processor_id();
-        unsigned long flags;
+        int cpu = smp_processor_id();
 
         /*
          * If cpu_ops have not been registered or suspend
@@ -72,6 +67,21 @@ int cpu_suspend(unsigned long arg)
          */
         if (!cpu_ops[cpu] || !cpu_ops[cpu]->cpu_suspend)
                 return -EOPNOTSUPP;
+        return cpu_ops[cpu]->cpu_suspend(arg);
+}
+
+/*
+ * __cpu_suspend
+ *
+ * arg: argument to pass to the finisher function
+ * fn: finisher function pointer
+ *
+ */
+int __cpu_suspend(unsigned long arg, int (*fn)(unsigned long))
+{
+        struct mm_struct *mm = current->active_mm;
+        int ret;
+        unsigned long flags;
 
         /*
          * From this point debug exceptions are disabled to prevent
@@ -86,7 +96,7 @@ int cpu_suspend(unsigned long arg)
          * page tables, so that the thread address space is properly
          * set-up on function return.
          */
-        ret = __cpu_suspend(arg);
+        ret = __cpu_suspend_enter(arg, fn);
         if (ret == 0) {
                 cpu_switch_mm(mm->pgd, mm);
                 flush_tlb_all();
@@ -95,7 +105,7 @@ int cpu_suspend(unsigned long arg)
                  * Restore per-cpu offset before any kernel
                  * subsystem relying on it has a chance to run.
                  */
-                set_my_cpu_offset(per_cpu_offset(cpu));
+                set_my_cpu_offset(per_cpu_offset(smp_processor_id()));
 
                 /*
                  * Restore HW breakpoint registers to sane values