diff options
| author | Patrick Rudolph <patrick.rudolph@9elements.com> | 2020-12-01 10:08:38 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-12-05 08:19:34 +0000 |
| commit | 40beb36f073430b0efebf0c11b51fe46065fcaf0 (patch) | |
| tree | 45b9ab7f5fa349777f633e7ab9085f11b61cad4d /src/drivers/intel/fsp2_0/silicon_init.c | |
| parent | 7a359497cd83babdc5d3244a390cb775412105e6 (diff) | |
| download | coreboot-40beb36f073430b0efebf0c11b51fe46065fcaf0.tar.gz coreboot-40beb36f073430b0efebf0c11b51fe46065fcaf0.tar.bz2 coreboot-40beb36f073430b0efebf0c11b51fe46065fcaf0.zip | |
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 <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48202
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/drivers/intel/fsp2_0/silicon_init.c')
| -rw-r--r-- | src/drivers/intel/fsp2_0/silicon_init.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c index 0b6540e1ded3..a4ffbda4cc52 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 @@ static void do_silicon_init(struct fsp_header *hdr) 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); |