sunxi: psci: save context id in cpu_on command
authorPatrick Delaunay <patrick.delaunay@st.com>
Mon, 16 Apr 2018 08:15:11 +0000 (10:15 +0200)
committerTom Rini <trini@konsulko.com>
Mon, 7 May 2018 15:52:55 +0000 (11:52 -0400)
Replace the psci_save_target_pc call by the new function
psci_save(cpu, pc,context_id)

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
arch/arm/cpu/armv7/sunxi/psci.c

index 97c4b62..f3e8f99 100644 (file)
@@ -242,14 +242,15 @@ out:
        cp15_write_scr(scr);
 }
 
-int __secure psci_cpu_on(u32 __always_unused unused, u32 mpidr, u32 pc)
+int __secure psci_cpu_on(u32 __always_unused unused, u32 mpidr, u32 pc,
+                        u32 context_id)
 {
        struct sunxi_cpucfg_reg *cpucfg =
                (struct sunxi_cpucfg_reg *)SUNXI_CPUCFG_BASE;
        u32 cpu = (mpidr & 0x3);
 
-       /* store target PC */
-       psci_save_target_pc(cpu, pc);
+       /* store target PC and context id */
+       psci_save(cpu, pc, context_id);
 
        /* Set secondary core power on PC */
        sunxi_set_entry_address(&psci_cpu_entry);