mediatek: apsoc: move platform_mem_init into assembly helpers

This function is called before the C stack is set up,
which was resulted in hangs when TF‐A is compiled with
`-fno-omit-frame-pointer`, as is now the default on several major
Linux distributions.

Fixes: a36715b ("mediatek: add common files for APSoC platform")
Signed-off-by: Emily <hello@emily.moe>

Author: emilazy

plat/mediatek/apsoc_common/bl2/bl2_plat_setup.c

@@ -395,10 +395,6 @@ void plat_flush_next_bl_params(void)
 	flush_bl_params_desc();
 }
 
-void platform_mem_init(void)
-{
-}
-
 void bl2_el3_early_platform_setup(u_register_t arg0, u_register_t arg1,
 				  u_register_t arg2, u_register_t arg3)
 {

plat/mediatek/mt7622/aarch64/plat_helpers.S

@@ -8,6 +8,7 @@
 #include <asm_macros.S>
 #include <mt7622_def.h>
 
+	.globl	platform_mem_init
 	.globl	plat_secondary_cold_boot_setup
 	.globl	plat_report_exception
 	.globl	platform_is_primary_cpu
@@ -18,6 +19,17 @@
 	.globl	read_cpuectlr
 	.globl	write_cpuectlr
 
+	/* --------------------------------------------------------
+	 * void platform_mem_init (void);
+	 *
+	 * Any memory init, relocation to be done before the
+	 * platform boots. Called very early in the boot process.
+	 * --------------------------------------------------------
+	 */
+func platform_mem_init
+	ret
+endfunc platform_mem_init
+
 	/* -----------------------------------------------------
 	 * void plat_secondary_cold_boot_setup (void);
 	 *

plat/mediatek/mt7629/aarch32/plat_helpers.S

@@ -10,6 +10,7 @@
 #include <mt7629_def.h>
 #include <pll.h>
 
+	.globl	platform_mem_init
 	.globl	plat_secondary_cold_boot_setup
 	.globl	plat_report_exception
 	.globl	plat_is_my_cpu_primary
@@ -19,6 +20,17 @@
 	.globl	plat_crash_console_flush
 	.globl	plat_reset_handler
 
+	/* --------------------------------------------------------
+	 * void platform_mem_init (void);
+	 *
+	 * Any memory init, relocation to be done before the
+	 * platform boots. Called very early in the boot process.
+	 * --------------------------------------------------------
+	 */
+func platform_mem_init
+	bx	lr
+endfunc platform_mem_init
+
 	/* -----------------------------------------------------
 	 * void plat_secondary_cold_boot_setup (void);
 	 *
@@ -118,4 +130,4 @@ endfunc plat_crash_console_putc
 func plat_crash_console_flush
 	mov_imm	r0, UART_BASE
 	b	console_hsuart_core_flush
-endfunc plat_crash_console_flush
+endfunc plat_crash_console_flush

plat/mediatek/mt7981/aarch64/plat_helpers.S

@@ -8,6 +8,7 @@
 #include <asm_macros.S>
 #include <mt7981_def.h>
 
+	.globl	platform_mem_init
 	.globl	plat_secondary_cold_boot_setup
 	.globl	plat_report_exception
 	.globl	platform_is_primary_cpu
@@ -18,6 +19,17 @@
 	.globl	read_cpuectlr
 	.globl	write_cpuectlr
 
+	/* --------------------------------------------------------
+	 * void platform_mem_init (void);
+	 *
+	 * Any memory init, relocation to be done before the
+	 * platform boots. Called very early in the boot process.
+	 * --------------------------------------------------------
+	 */
+func platform_mem_init
+	ret
+endfunc platform_mem_init
+
 	/* -----------------------------------------------------
 	 * void plat_secondary_cold_boot_setup (void);
 	 *

plat/mediatek/mt7986/aarch64/plat_helpers.S

@@ -8,6 +8,7 @@
 #include <asm_macros.S>
 #include <mt7986_def.h>
 
+	.globl	platform_mem_init
 	.globl	plat_secondary_cold_boot_setup
 	.globl	plat_report_exception
 	.globl	platform_is_primary_cpu
@@ -18,6 +19,17 @@
 	.globl	read_cpuectlr
 	.globl	write_cpuectlr
 
+	/* --------------------------------------------------------
+	 * void platform_mem_init (void);
+	 *
+	 * Any memory init, relocation to be done before the
+	 * platform boots. Called very early in the boot process.
+	 * --------------------------------------------------------
+	 */
+func platform_mem_init
+	ret
+endfunc platform_mem_init
+
 	/* -----------------------------------------------------
 	 * void plat_secondary_cold_boot_setup (void);
 	 *

plat/mediatek/mt7987/aarch64/plat_helpers.S

@@ -8,6 +8,7 @@
 #include <asm_macros.S>
 #include <mt7987_def.h>
 
+	.globl	platform_mem_init
 	.globl	plat_secondary_cold_boot_setup
 	.globl	plat_report_exception
 	.globl	platform_is_primary_cpu
@@ -18,6 +19,17 @@
 	.globl	read_cpuectlr
 	.globl	write_cpuectlr
 
+	/* --------------------------------------------------------
+	 * void platform_mem_init (void);
+	 *
+	 * Any memory init, relocation to be done before the
+	 * platform boots. Called very early in the boot process.
+	 * --------------------------------------------------------
+	 */
+func platform_mem_init
+	ret
+endfunc platform_mem_init
+
 	/* -----------------------------------------------------
 	 * void plat_secondary_cold_boot_setup (void);
 	 *

plat/mediatek/mt7988/aarch64/plat_helpers.S

@@ -8,6 +8,7 @@
 #include <asm_macros.S>
 #include <mt7988_def.h>
 
+	.globl	platform_mem_init
 	.globl	plat_secondary_cold_boot_setup
 	.globl	plat_report_exception
 	.globl	platform_is_primary_cpu
@@ -18,6 +19,17 @@
 	.globl	read_cpuectlr
 	.globl	write_cpuectlr
 
+	/* --------------------------------------------------------
+	 * void platform_mem_init (void);
+	 *
+	 * Any memory init, relocation to be done before the
+	 * platform boots. Called very early in the boot process.
+	 * --------------------------------------------------------
+	 */
+func platform_mem_init
+	ret
+endfunc platform_mem_init
+
 	/* -----------------------------------------------------
 	 * void plat_secondary_cold_boot_setup (void);
 	 *