[U-Boot,6/6] psci: arm: remove armv7 function psci_save_target_pc

Message ID 1523866512-11112-6-git-send-email-patrick.delaunay@st.com
State Accepted
Commit 9ce751a6f5d6683b0fabd3cfc62da7e9f30bc57f
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot,1/6] ls102xa: psci: save context id in cpu_on command
Related show

Commit Message

Patrick DELAUNAY April 16, 2018, 8:15 a.m.
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>
---

 arch/arm/cpu/armv7/psci-common.c | 7 -------
 arch/arm/include/asm/psci.h      | 3 +--
 2 files changed, 1 insertion(+), 9 deletions(-)

Comments

Tom Rini May 8, 2018, 12:45 a.m. | #1
On Mon, Apr 16, 2018 at 10:15:12AM +0200, Patrick Delaunay wrote:

> 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>

Applied to u-boot/master, thanks!

Patch

diff --git a/arch/arm/cpu/armv7/psci-common.c b/arch/arm/cpu/armv7/psci-common.c
index 73f986b..a328b2b 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 b415241..95f18e8 100644
--- 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);