Message ID | 1523866512-11112-4-git-send-email-patrick.delaunay@st.com |
---|---|
State | Accepted |
Commit | 4f7dc2e6037c685a22a81148f0c87005b45181d9 |
Delegated to: | Tom Rini |
Headers | show |
Series | [U-Boot,1/6] ls102xa: psci: save context id in cpu_on command | expand |
2018-04-16 17:15 GMT+09:00 Patrick Delaunay <patrick.delaunay@st.com>: > 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> > --- > Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com>
On Mon, Apr 16, 2018 at 10:15:10AM +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> > Acked-by: Masahiro Yamada <yamada.masahiro@socionext.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c index efe7419..af33cd4 100644 --- a/arch/arm/mach-uniphier/arm32/psci.c +++ b/arch/arm/mach-uniphier/arm32/psci.c @@ -131,7 +131,8 @@ void psci_arch_init(void) u32 uniphier_psci_holding_pen_release __secure_data = 0xffffffff; -int __secure psci_cpu_on(u32 function_id, u32 cpuid, u32 entry_point) +int __secure psci_cpu_on(u32 function_id, u32 cpuid, u32 entry_point, + u32 context_id) { u32 cpu = cpuid & 0xff; @@ -139,9 +140,11 @@ int __secure psci_cpu_on(u32 function_id, u32 cpuid, u32 entry_point) debug_puth(cpuid); debug_puts(", entry_point="); debug_puth(entry_point); + debug_puts(", context_id="); + debug_puth(context_id); debug_puts("\n"); - psci_save_target_pc(cpu, entry_point); + psci_save(cpu, entry_point, context_id); /* We assume D-cache is off, so do not call flush_dcache() here */ uniphier_psci_holding_pen_release = cpu;
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/mach-uniphier/arm32/psci.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)