From dc2f0e39aea48ca008703b9c71708629911920e9 Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Fri, 15 Nov 2019 12:31:18 +0100 Subject: cpu/qemu-x86/car: Move long mode entry right before c entry This fixes non-emulation platforms as those are using 32bit code after the bootblock_crt0 entry, like setting up CAR and updating microcode, which isn't yet converted to support long mode. This is a noop for the only supported x86_64 platform and all x86_32 platforms. Change-Id: I45e56ed8db9a44c00cd61e962bb82f27926eb23f Signed-off-by: Patrick Rudolph Reviewed-on: https://review.coreboot.org/c/coreboot/+/37370 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/cpu/qemu-x86/cache_as_ram_bootblock.S | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/cpu/qemu-x86') diff --git a/src/cpu/qemu-x86/cache_as_ram_bootblock.S b/src/cpu/qemu-x86/cache_as_ram_bootblock.S index 415ed247df..148948ba31 100644 --- a/src/cpu/qemu-x86/cache_as_ram_bootblock.S +++ b/src/cpu/qemu-x86/cache_as_ram_bootblock.S @@ -27,6 +27,9 @@ cache_as_ram: /* Align the stack and keep aligned for call to bootblock_c_entry() */ and $0xfffffff0, %esp + /* entry64.inc preserves ebx. */ +#include + /* Restore the BIST result and timestamps. */ #if defined(__x86_64__) movd %mm2, %rdi -- cgit v1.2.3