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 <patrick.delaunay@st.com>

diff --git a/arch/arm/cpu/armv7/psci-common.c b/arch/arm/cpu/armv7/psci-common.c
index 73f986bf729840df7a4c58a38ae90b47d937d35f..a328b2bc0e83987a039e07abca5df8a0cf86bca7 100644 (file)
--- 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 b41524106b547a954bfd152b4c926dc2b9194cbe..95f18e8cbcc9b3c01cfac6211ca699676c3665c8 100644 (file)
--- a/arch/arm/include/asm/psci.h
+++ b/arch/arm/include/asm/psci.h
@@ -93,10 +93,9 @@
 #ifndef __ASSEMBLY__
 #include <asm/types.h>
 
-/* 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);