From e563815e059ef5881a42e6f8b37094783771d5a7 Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <siro@das-labor.org>
Date: Sun, 9 Dec 2018 10:48:59 +0100
Subject: arch/x86/boot: Jump to payload in protected mode

*   On ARCH_RAMSTAGE_X86_64 jump to the payload in protected mode.
*   Add a helper function to jump to arbitrary code in protected mode,
    similar to the real mode call handler.
*   Doesn't affect existing x86_32 code.
*   Add a macro to cast pointer to uint32_t that dies if it would overflow
    on conversion

Tested on QEMU Q35 using SeaBIOS as payload.
Tested on Lenovo T410 with additional x86_64 patches.

Change-Id: I6552ac30f1b6205e08e16d251328e01ce3fbfd14
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/30118
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
---
 src/arch/x86/Makefile.inc             |  1 +
 src/arch/x86/boot.c                   | 10 +++++++++
 src/arch/x86/c_exit.S                 | 38 +++++++++++++++++++++++++++++++++++
 src/arch/x86/include/arch/boot/boot.h | 11 ++++++++++
 4 files changed, 60 insertions(+)
 create mode 100644 src/arch/x86/c_exit.S

(limited to 'src/arch/x86')

diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 5bba47f0b5..a5c330905a 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -245,6 +245,7 @@ ramstage-$(CONFIG_ACPI_BERT) += acpi_bert_storage.c
 ramstage-y += boot.c
 ramstage-y += post.c
 ramstage-y += c_start.S
+ramstage-y += c_exit.S
 ramstage-y += cpu.c
 ramstage-y += cpu_common.c
 ramstage-y += ebda.c
diff --git a/src/arch/x86/boot.c b/src/arch/x86/boot.c
index db9d69e74d..777a0b7d90 100644
--- a/src/arch/x86/boot.c
+++ b/src/arch/x86/boot.c
@@ -1,10 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
+#include <arch/boot/boot.h>
 #include <commonlib/helpers.h>
 #include <console/console.h>
 #include <program_loading.h>
 #include <ip_checksum.h>
 #include <symbols.h>
+#include <assert.h>
 
 int payload_arch_usable_ram_quirk(uint64_t start, uint64_t size)
 {
@@ -19,6 +21,13 @@ int payload_arch_usable_ram_quirk(uint64_t start, uint64_t size)
 
 void arch_prog_run(struct prog *prog)
 {
+#if ENV_RAMSTAGE && defined(__x86_64__)
+	const uint32_t arg = pointer_to_uint32_safe(prog_entry_arg(prog));
+	const uint32_t entry = pointer_to_uint32_safe(prog_entry(prog));
+
+	/* On x86 coreboot payloads expect to be called in protected mode */
+	protected_mode_jump(entry, arg);
+#else
 #ifdef __x86_64__
 	void (*doit)(void *arg);
 #else
@@ -27,4 +36,5 @@ void arch_prog_run(struct prog *prog)
 #endif
 	doit = prog_entry(prog);
 	doit(prog_entry_arg(prog));
+#endif
 }
diff --git a/src/arch/x86/c_exit.S b/src/arch/x86/c_exit.S
new file mode 100644
index 0000000000..e5b9bf8d74
--- /dev/null
+++ b/src/arch/x86/c_exit.S
@@ -0,0 +1,38 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <arch/ram_segs.h>
+#include <cpu/x86/msr.h>
+#include <cpu/x86/cr.h>
+
+
+#ifdef __x86_64__
+
+	/*
+	 * Functions to handle mode switches from long mode to protected
+	 * mode.
+	 */
+.text
+.code64
+	.section ".text.protected_mode_jump", "ax", @progbits
+	.globl protected_mode_jump
+protected_mode_jump:
+
+	push %rbp
+	mov %rsp, %rbp
+
+	/* Arguments to stack */
+	push	%rdi
+	push	%rsi
+
+	#include <cpu/x86/64bit/exit32.inc>
+
+	movl	-8(%ebp), %eax	/* Function to call */
+	movl	-16(%ebp), %ebx	/* Argument 0 */
+
+	/* Align the stack */
+	andl	$0xFFFFFFF0, %esp
+	subl	$12, %esp
+	pushl	%ebx	/* Argument 0 */
+
+	jmp	*%eax
+#endif
diff --git a/src/arch/x86/include/arch/boot/boot.h b/src/arch/x86/include/arch/boot/boot.h
index c73591579a..1ef927e0fb 100644
--- a/src/arch/x86/include/arch/boot/boot.h
+++ b/src/arch/x86/include/arch/boot/boot.h
@@ -7,4 +7,15 @@
 #define ELF_DATA	ELFDATA2LSB
 #define ELF_ARCH	EM_386
 
+#include <types.h>
+/*
+ * Jump to function in protected mode.
+ * @arg func_ptr           Function to jump to in protected mode
+ * @arg                    Argument to pass to called function
+ *
+ * @noreturn
+ */
+void protected_mode_jump(uint32_t func_ptr,
+			 uint32_t argument);
+
 #endif /* ASM_I386_BOOT_H */
-- 
cgit v1.2.3