diff options
| author | Patrick Delaunay <patrick.delaunay@st.com> | 2018-04-16 10:15:10 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-07 11:52:55 -0400 |
| commit | 4f7dc2e6037c685a22a81148f0c87005b45181d9 (patch) | |
| tree | 55ea09074aa1546a265c789c03603f3fec95a16b /arch/arm | |
| parent | 4c6fe075ceb70eda19afaf3bfca9fea1b35c66a3 (diff) | |
uniphier: psci: save context id in cpu_on command
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-uniphier/arm32/psci.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c index 92ec7a9456..3f67edf26e 100644 --- a/arch/arm/mach-uniphier/arm32/psci.c +++ b/arch/arm/mach-uniphier/arm32/psci.c @@ -130,7 +130,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; @@ -138,9 +139,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; |