From 9ce751a6f5d6683b0fabd3cfc62da7e9f30bc57f Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Mon, 16 Apr 2018 10:15:12 +0200 Subject: [PATCH] psci: arm: remove armv7 function psci_save_target_pc This function is no more used, and replaced by psci_save which save also context id as requested by PSCI requirements. Even if the context id is not used by Linux, it should be saved and restored in r0 when the CPU_ON is performed. Signed-off-by: Patrick Delaunay --- arch/arm/cpu/armv7/psci-common.c | 7 ------- arch/arm/include/asm/psci.h | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/arm/cpu/armv7/psci-common.c b/arch/arm/cpu/armv7/psci-common.c index 73f986bf72..a328b2bc0e 100644 --- a/arch/arm/cpu/armv7/psci-common.c +++ b/arch/arm/cpu/armv7/psci-common.c @@ -27,13 +27,6 @@ static u32 psci_target_pc[CONFIG_ARMV7_PSCI_NR_CPUS] __secure_data = { 0 }; static u32 psci_context_id[CONFIG_ARMV7_PSCI_NR_CPUS] __secure_data = { 0 }; -void __secure psci_save_target_pc(int cpu, u32 pc) -{ - psci_target_pc[cpu] = pc; - psci_context_id[cpu] = 0; - dsb(); -} - void __secure psci_save(int cpu, u32 pc, u32 context_id) { psci_target_pc[cpu] = pc; diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h index b41524106b..95f18e8cbc 100644 --- a/arch/arm/include/asm/psci.h +++ b/arch/arm/include/asm/psci.h @@ -93,10 +93,9 @@ #ifndef __ASSEMBLY__ #include -/* These 4 helper functions assume cpu < CONFIG_ARMV7_PSCI_NR_CPUS */ +/* These 3 helper functions assume cpu < CONFIG_ARMV7_PSCI_NR_CPUS */ u32 psci_get_target_pc(int cpu); u32 psci_get_context_id(int cpu); -void psci_save_target_pc(int cpu, u32 pc); void psci_save(int cpu, u32 pc, u32 context_id); void psci_cpu_entry(void); -- 2.25.1