| Message ID | 1523866512-11112-5-git-send-email-patrick.delaunay@st.com |
|---|---|
| State | Accepted |
| Commit | 9622c7e65d9b9fe4703d3bf35c472518aedba404 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot,1/6] ls102xa: psci: save context id in cpu_on command | expand |
On Mon, Apr 16, 2018 at 10:15:11AM +0200, Patrick Delaunay wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c index 18da9cb..11b21fe 100644 --- a/arch/arm/cpu/armv7/sunxi/psci.c +++ b/arch/arm/cpu/armv7/sunxi/psci.c @@ -243,14 +243,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);
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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)