From: Simon Glass <sjg@chromium.org>
Date: Thu, 2 May 2019 16:52:27 +0000 (-0600)
Subject: x86: Add a way to jump from TPL to SPL
X-Git-Tag: v2019.07-rc2~14^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=49dffb7a074e9b9d2c27a303798c0e6bc5eea3ba;p=platform%2Fkernel%2Fu-boot.git

x86: Add a way to jump from TPL to SPL

When TPL finishes it needs to jump to SPL with the stack set up correctly.
Add a function to handle this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---

diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S
index 30fa7de..4a82add 100644
--- a/arch/x86/cpu/start.S
+++ b/arch/x86/cpu/start.S
@@ -190,6 +190,19 @@ board_init_f_r_trampoline:
 	/* Re-enter U-Boot by calling board_init_f_r() */
 	call	board_init_f_r
 
+#ifdef CONFIG_TPL
+.globl jump_to_spl
+.type jump_to_spl, @function
+jump_to_spl:
+	/* Reset stack to the top of CAR space */
+	movl	$(CONFIG_SYS_CAR_ADDR + CONFIG_SYS_CAR_SIZE - 4), %esp
+#ifdef CONFIG_DCACHE_RAM_MRC_VAR_SIZE
+	subl	$CONFIG_DCACHE_RAM_MRC_VAR_SIZE, %esp
+#endif
+
+	jmp	*%eax
+#endif
+
 die:
 	hlt
 	jmp	die