[coreboot-gerrit] Change in coreboot[master]: drivers/intel/fsp2_0/memory_init: Wrap calls into FSP

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48202 )

Change subject: drivers/intel/fsp2_0/memory_init: Wrap calls into FSP
......................................................................

drivers/intel/fsp2_0/memory_init: Wrap calls into FSP

Use a wrapper code that does nothing on x86_32, but drops to protected
mode to call into FSP when running on x86_64.

Tested on Intel Skylake when running in long mode. Successfully run the
FSP-M which is compiled for x86_32 and then continued booting in
long mode.

Change-Id: I9fb37019fb0d04f74d00733ce2e365f484d97d66
Signed-off-by: Patrick Rudolph 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48202
Reviewed-by: Arthur Heymans 
Tested-by: build bot (Jenkins) 
---
M src/drivers/intel/fsp2_0/memory_init.c
M src/drivers/intel/fsp2_0/notify.c
M src/drivers/intel/fsp2_0/silicon_init.c
3 files changed, 22 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Arthur Heymans: Looks good to me, approved

diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index 27e34fe..bddd07f 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -22,6 +22,7 @@
 #include <security/tpm/tspi.h>
 #include <vb2_api.h>
 #include <types.h>
+#include <mode_switch.h>

static uint8_t temp_ram[CONFIG_FSP_TEMP_RAM_SIZE] __aligned(sizeof(uint64_t));

@@ -296,7 +297,13 @@

post_code(POST_FSP_MEMORY_INIT);
    timestamp_add_now(TS_FSP_MEMORY_INIT_START);
-	status = fsp_raminit(&fspm_upd, fsp_get_hob_list_ptr());
+	if (ENV_X86_64)
+		status = protected_mode_call_2arg(fsp_raminit,
+						  (uintptr_t)&fspm_upd,
+						  (uintptr_t)fsp_get_hob_list_ptr());
+	else
+		status = fsp_raminit(&fspm_upd, fsp_get_hob_list_ptr());
+
    post_code(POST_FSP_MEMORY_EXIT);
    timestamp_add_now(TS_FSP_MEMORY_INIT_END);

diff --git a/src/drivers/intel/fsp2_0/notify.c b/src/drivers/intel/fsp2_0/notify.c
index ee04630..8a51c0b 100644
--- a/src/drivers/intel/fsp2_0/notify.c
+++ b/src/drivers/intel/fsp2_0/notify.c
@@ -5,6 +5,7 @@
 #include <cpu/x86/mtrr.h>
 #include <fsp/util.h>
 #include <timestamp.h>
+#include <mode_switch.h>

static void fsp_notify(enum fsp_notify_phase phase)
 {
@@ -30,7 +31,10 @@
    	post_code(POST_FSP_NOTIFY_BEFORE_END_OF_FIRMWARE);
    }

-	ret = fspnotify(&notify_params);
+	if (ENV_X86_64)
+		ret = protected_mode_call_1arg(fspnotify, (uintptr_t)&notify_params);
+	else
+		ret = fspnotify(&notify_params);

if (phase == AFTER_PCI_ENUM) {
    	timestamp_add_now(TS_FSP_AFTER_ENUMERATE);
diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c
index 0b6540e..a4ffbda 100644
--- a/src/drivers/intel/fsp2_0/silicon_init.c
+++ b/src/drivers/intel/fsp2_0/silicon_init.c
@@ -13,6 +13,7 @@
 #include <string.h>
 #include <timestamp.h>
 #include <types.h>
+#include <mode_switch.h>

struct fsp_header fsps_hdr;

@@ -117,7 +118,14 @@

timestamp_add_now(TS_FSP_SILICON_INIT_START);
    post_code(POST_FSP_SILICON_INIT);
-	status = silicon_init(upd);
+
+	if (ENV_X86_64)
+		status = protected_mode_call_1arg(silicon_init, (uintptr_t)upd);
+	else
+		status = silicon_init(upd);
+
+	printk(BIOS_ERR, "FSPS returned %x\n", status);
+
    timestamp_add_now(TS_FSP_SILICON_INIT_END);
    post_code(POST_FSP_SILICON_EXIT);