ARM: PSCI: Make psci_get_cpu_stack_top local to armv7/psci.S

Now that we have a secure data section for storing variables, there
should be no need for platform code to get the stack address.

Make psci_get_cpu_stack_top a local function, as it should only be
used in armv7/psci.S and only by psci_stack_setup.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/arch/arm/cpu/armv7/psci.S b/arch/arm/cpu/armv7/psci.S
index 50dfddb412af75e8a57434cb57512b6cb571c6f5..350b75ce20e888e3512c9f46f6dbe157f38aafb1 100644 (file)
--- a/arch/arm/cpu/armv7/psci.S
+++ b/arch/arm/cpu/armv7/psci.S
@@ -213,7 +213,7 @@ ENDPROC(psci_cpu_off_common)
 @ --------------------  __secure_stack_start
 @
 @ This expects CPU ID in r0 and returns stack top in r0
-ENTRY(psci_get_cpu_stack_top)
+LENTRY(psci_get_cpu_stack_top)
        @ stack top = __secure_stack_end - (cpuid << ARM_PSCI_STACK_SHIFT)
        ldr     r3, =__secure_stack_end
        sub     r0, r3, r0, LSL #ARM_PSCI_STACK_SHIFT

diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
index a0da02300700afea0bf9970dc924260228c726a1..7ba7ce306ab1f7d6e46a06b4f4c34401277aec46 100644 (file)
--- a/arch/arm/include/asm/psci.h
+++ b/arch/arm/include/asm/psci.h
@@ -60,7 +60,6 @@ void psci_save_target_pc(int cpu, u32 pc);
 
 void psci_cpu_entry(void);
 u32 psci_get_cpu_id(void);
-u32 psci_get_cpu_stack_top(int cpu);
 void psci_cpu_off_common(void);
 
 int psci_update_dt(void *fdt);