From 9099a6bb4d1e1fc717cb090e3cd39b32f0045289 Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Wed, 9 Dec 2020 13:29:26 +0100
Subject: drivers/intel/fsp2_0: Support FSP-T in long mode

Call into FSP-T using the protected mode wrapper
and enter long mode in FSP-T support assembly code.

TEST: Booted on ibm/sbp1 in long mode.

Change-Id: Id6b9780b06b4bfbb952e32091ffbf3d0014f2090
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/81281
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/soc/intel/common/block/cpu/car/cache_as_ram_fsp.S | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/soc/intel')

diff --git a/src/soc/intel/common/block/cpu/car/cache_as_ram_fsp.S b/src/soc/intel/common/block/cpu/car/cache_as_ram_fsp.S
index 238a57e99f..c6d2a9c6da 100644
--- a/src/soc/intel/common/block/cpu/car/cache_as_ram_fsp.S
+++ b/src/soc/intel/common/block/cpu/car/cache_as_ram_fsp.S
@@ -1,8 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
-#include <device/pci_def.h>
+#include <cpu/x86/64bit/entry64.inc>
 #include <cpu/x86/cr.h>
 #include <cpu/x86/post_code.h>
+#include <device/pci_def.h>
 #include <intelblocks/post_codes.h>
 
 #define CBFS_FILE_MAGIC 0
@@ -15,6 +16,8 @@
 
 .extern	temp_ram_init_params
 
+.code32
+
 .global	bootblock_pre_c_entry
 bootblock_pre_c_entry:
 
@@ -88,10 +91,19 @@ CAR_init_done:
 	pop	%ecx
 	movl	%ecx, temp_memory_start
 
+#if ENV_X86_64
+	setup_longmode $PM4LE
+	movl	%ebp, %edi
+	shlq	$32, %rdi
+	movd	%mm1, %rsi
+	or	%rsi, %rdi
+	andl	$0xfffffff0, %esp
+#else
 	/* Restore the timestamp from bootblock_crt0.S (ebp:mm1) */
 	push	%ebp
 	movd	%mm1, %eax
 	push	%eax
+#endif
 
 	/* Copy .data section content to Cache-As-Ram */
 #include <cpu/x86/copy_data_section.inc>
-- 
cgit v1.2.3