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(-)
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;