drivers/intel/fsp2_0: Add limited to 32-bits FSP 2.4 support

Intel Firmware Support Package 2.4 specification (document 736809)
brings some significant changes compared to version 2.3 (document
644852):

1. It supports FSP-M multi-phase init. Some fields have been added to
   the FSP header data structure for this purpose.

2. The `FSPM_ARCH2_UPD' and `FSPS_ARCH2_UPD' data structures must be
   used in place of `FSPM_ARCH_UPD' and `FSPS_ARCH_UPD' respectively.

3. It support 64-bits FSP but 64-bits support will be provided by
   subsequent patch.

Note that similarly to what is done for silicon initialization,
timestamps and post-codes are used during the memory initialization
multi-phase.

[736809]
https://cdrdv2-public.intel.com/736809/736809_FSP_EAS_v2.4_Errata_A.pdf

[644852]
https://cdrdv2-public.intel.com/644852/644852_2.3_Firmware-Support-Package-External-Architecture-Specification.pdf

TEST=verified on Lunar Lake RVP board (lnlrvp)

Change-Id: I1c24d26e105c3dcbd9cca0e7197ab1362344aa97
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80275
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
Reviewed-by: Subrata Banik <subratabanik@google.com>
Reviewed-by: Dinesh Gehlot <digehlot@google.com>

7 files changed, 103 insertions, 19 deletions

diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig
index 274c3e5f24..754b04af41 100644
--- a/src/drivers/intel/fsp2_0/Kconfig
+++ b/src/drivers/intel/fsp2_0/Kconfig
@@ -39,6 +39,18 @@ config PLATFORM_USES_FSP2_3
 	  1. Added ExtendedImageRevision field in FSP_INFO_HEADER
 	  2. Added FSP_NON_VOLATILE_STORAGE_HOB2
 
+config PLATFORM_USES_FSP2_4
+	bool
+	default n
+	select PLATFORM_USES_FSP2_3
+	help
+	  Include FSP 2.4 wrappers and functionality.
+	  Features added into FSP 2.4 specification that impact coreboot are:
+	  1. FSP-M multi phase init support
+	  2. FSPM_ARCH2_UPD and FSPS_ARCH2_UPD data structures must be
+	     used in place of FSPM_ARCH_UPD and FSPS_ARCH_UPD respectively
+	  3. 64-bits support
+
 if PLATFORM_USES_FSP2_0
 
 config PLATFORM_USES_FSP2_X86_32
diff --git a/src/drivers/intel/fsp2_0/include/fsp/api.h b/src/drivers/intel/fsp2_0/include/fsp/api.h
index 40a64e68c8..971be0d207 100644
--- a/src/drivers/intel/fsp2_0/include/fsp/api.h
+++ b/src/drivers/intel/fsp2_0/include/fsp/api.h
@@ -48,6 +48,7 @@ void fsps_load(void);
 void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version);
 void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd);
 /* Callbacks for SoC/Mainboard specific overrides */
+void platform_fsp_memory_multi_phase_init_cb(uint32_t phase_index);
 void platform_fsp_silicon_multi_phase_init_cb(uint32_t phase_index);
 /* Check if MultiPhase Si Init is enabled */
 bool fsp_is_multi_phase_init_enabled(void);
diff --git a/src/drivers/intel/fsp2_0/include/fsp/info_header.h b/src/drivers/intel/fsp2_0/include/fsp/info_header.h
index fceebec7ed..f495822e19 100644
--- a/src/drivers/intel/fsp2_0/include/fsp/info_header.h
+++ b/src/drivers/intel/fsp2_0/include/fsp/info_header.h
@@ -37,6 +37,8 @@ struct fsp_header {
 	uint32_t  fsp_multi_phase_si_init_entry_offset;
 	uint16_t  extended_image_revision;
 	uint16_t  res4;
+	uint32_t  fsp_multi_phase_mem_init_entry_offset;
+	uint32_t  res5;
 }  __packed;
 #else
 #error You need to implement this struct for x86_64 FSP
diff --git a/src/drivers/intel/fsp2_0/include/fsp/util.h b/src/drivers/intel/fsp2_0/include/fsp/util.h
index acf337f661..bed4fcb29e 100644
--- a/src/drivers/intel/fsp2_0/include/fsp/util.h
+++ b/src/drivers/intel/fsp2_0/include/fsp/util.h
@@ -16,6 +16,14 @@
 
 #define FSP_VER_LEN	30
 
+#if CONFIG(PLATFORM_USES_FSP2_4)
+#define FSPM_ARCHx_UPD FSPM_ARCH2_UPD
+#define FSPS_ARCHx_UPD FSPS_ARCH2_UPD
+#else
+#define FSPM_ARCHx_UPD FSPM_ARCH_UPD
+#define FSPS_ARCHx_UPD FSPS_ARCH_UPD
+#endif
+
 /* Macro for checking and loading array type configs into array type UPDs */
 #define FSP_ARRAY_LOAD(dst, src) \
 do { \
@@ -48,6 +56,11 @@ struct fsp_multi_phase_params {
 	void *multi_phase_param_ptr;
 };
 
+struct fsp_multi_phase_get_number_of_phases_params {
+	uint32_t number_of_phases;
+	uint32_t phases_executed;
+};
+
 struct hob_resource {
 	uint8_t owner_guid[16];
 	uint32_t type;
@@ -198,7 +211,7 @@ typedef asmlinkage uint32_t (*temp_ram_exit_fn)(void *param);
 typedef asmlinkage uint32_t (*fsp_memory_init_fn)
 				   (void *raminit_upd, void **hob_list);
 typedef asmlinkage uint32_t (*fsp_silicon_init_fn)(void *silicon_upd);
-typedef asmlinkage uint32_t (*fsp_multi_phase_si_init_fn)(struct fsp_multi_phase_params *);
+typedef asmlinkage uint32_t (*fsp_multi_phase_init_fn)(struct fsp_multi_phase_params *);
 typedef asmlinkage uint32_t (*fsp_notify_fn)(struct fsp_notify_params *);
 #include <fsp/debug.h>
 
diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index c096e86dfe..922bca2844 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -28,6 +28,12 @@
 #include <intelbasecode/ramtop.h>
 #endif
 
+/* Callbacks for SoC/Mainboard specific overrides */
+void __weak platform_fsp_memory_multi_phase_init_cb(uint32_t phase_index)
+{
+	/* Leave for the SoC/Mainboard to implement if necessary. */
+}
+
 static uint8_t temp_ram[CONFIG_FSP_TEMP_RAM_SIZE] __aligned(sizeof(uint64_t));
 
 /*
@@ -84,7 +90,7 @@ static void do_fsp_post_memory_init(bool s3wake, uint32_t version)
 	romstage_handoff_init(s3wake);
 }
 
-static void fsp_fill_mrc_cache(FSPM_ARCH_UPD *arch_upd, uint32_t version)
+static void fsp_fill_mrc_cache(FSPM_ARCHx_UPD *arch_upd, uint32_t version)
 {
 	void *data;
 	size_t mrc_size;
@@ -127,7 +133,7 @@ static enum cb_err check_region_overlap(const struct memranges *ranges,
 	return CB_SUCCESS;
 }
 
-static enum cb_err setup_fsp_stack_frame(FSPM_ARCH_UPD *arch_upd,
+static enum cb_err setup_fsp_stack_frame(FSPM_ARCHx_UPD *arch_upd,
 		const struct memranges *memmap)
 {
 	uintptr_t stack_begin;
@@ -148,7 +154,7 @@ static enum cb_err setup_fsp_stack_frame(FSPM_ARCH_UPD *arch_upd,
 	return CB_SUCCESS;
 }
 
-static enum cb_err fsp_fill_common_arch_params(FSPM_ARCH_UPD *arch_upd,
+static enum cb_err fsp_fill_common_arch_params(FSPM_ARCHx_UPD *arch_upd,
 					bool s3wake, uint32_t version,
 					const struct memranges *memmap)
 {
@@ -275,12 +281,68 @@ static uint32_t fsp_mrc_version(void)
 	return ver;
 }
 
+static void fspm_return_value_handler(const char *context, uint32_t status, bool die_on_error)
+{
+	if (status == FSP_SUCCESS)
+		return;
+
+	fsp_handle_reset(status);
+	if (die_on_error)
+		die_with_post_code(POSTCODE_RAM_FAILURE, "%s returned with error 0x%zx!\n",
+				   context, (size_t)status);
+
+	printk(BIOS_SPEW, "%s returned 0x%zx\n", context, (size_t)status);
+}
+
+static void fspm_multi_phase_init(const struct fsp_header *hdr)
+{
+	uint32_t status;
+	fsp_multi_phase_init_fn fsp_multi_phase_init;
+	struct fsp_multi_phase_params multi_phase_params;
+	struct fsp_multi_phase_get_number_of_phases_params multi_phase_get_number;
+
+	if (!hdr->fsp_multi_phase_mem_init_entry_offset)
+		return;
+
+	fsp_multi_phase_init = (fsp_multi_phase_init_fn)(uintptr_t)
+		(hdr->image_base + hdr->fsp_multi_phase_mem_init_entry_offset);
+
+	post_code(POSTCODE_FSP_MULTI_PHASE_MEM_INIT_ENTRY);
+	timestamp_add_now(TS_FSP_MULTI_PHASE_MEM_INIT_START);
+
+	/* Get number of phases */
+	multi_phase_params.multi_phase_action = GET_NUMBER_OF_PHASES;
+	multi_phase_params.phase_index = 0;
+	multi_phase_params.multi_phase_param_ptr = &multi_phase_get_number;
+	status = fsp_multi_phase_init(&multi_phase_params);
+	fspm_return_value_handler("FspMultiPhaseMemInit NumberOfPhases", status, false);
+
+	/* Execute all phases */
+	for (uint32_t i = 1; i <= multi_phase_get_number.number_of_phases; i++) {
+		printk(BIOS_SPEW, "Executing Phase %u of FspMultiPhaseMemInit\n", i);
+		/*
+		 * Give SoC/mainboard a chance to perform any operation before
+		 * Multi Phase Execution
+		 */
+		platform_fsp_memory_multi_phase_init_cb(i);
+
+		multi_phase_params.multi_phase_action = EXECUTE_PHASE;
+		multi_phase_params.phase_index = i;
+		multi_phase_params.multi_phase_param_ptr = NULL;
+		status = fsp_multi_phase_init(&multi_phase_params);
+		fspm_return_value_handler("FspMultiPhaseMemInit Execute", status, false);
+	}
+
+	post_code(POSTCODE_FSP_MULTI_PHASE_MEM_INIT_EXIT);
+	timestamp_add_now(TS_FSP_MULTI_PHASE_MEM_INIT_END);
+}
+
 static void do_fsp_memory_init(const struct fspm_context *context, bool s3wake)
 {
 	uint32_t status;
 	fsp_memory_init_fn fsp_raminit;
 	FSPM_UPD fspm_upd, *upd;
-	FSPM_ARCH_UPD *arch_upd;
+	FSPM_ARCHx_UPD *arch_upd;
 	uint32_t version;
 	const struct fsp_header *hdr = &context->header;
 	const struct memranges *memmap = &context->memmap;
@@ -371,11 +433,10 @@ static void do_fsp_memory_init(const struct fspm_context *context, bool s3wake)
 	timestamp_add_now(TS_FSP_MEMORY_INIT_END);
 
 	/* Handle any errors returned by FspMemoryInit */
-	fsp_handle_reset(status);
-	if (status != FSP_SUCCESS) {
-		die_with_post_code(POSTCODE_RAM_FAILURE,
-			"FspMemoryInit returned with error 0x%08x!\n", status);
-	}
+	fspm_return_value_handler("FspMemoryInit", status, true);
+
+	if (CONFIG(PLATFORM_USES_FSP2_4))
+		fspm_multi_phase_init(hdr);
 
 	do_fsp_post_memory_init(s3wake, version);
 
diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c
index 4be4b61c84..4da50982f2 100644
--- a/src/drivers/intel/fsp2_0/silicon_init.c
+++ b/src/drivers/intel/fsp2_0/silicon_init.c
@@ -21,11 +21,6 @@
 
 struct fsp_header fsps_hdr;
 
-struct fsp_multi_phase_get_number_of_phases_params {
-	uint32_t number_of_phases;
-	uint32_t phases_executed;
-};
-
 /* Callbacks for SoC/Mainboard specific overrides */
 void __weak platform_fsp_silicon_multi_phase_init_cb(uint32_t phase_index)
 {
@@ -84,7 +79,7 @@ bool fsp_is_multi_phase_init_enabled(void)
 static void fsp_fill_common_arch_params(FSPS_UPD *supd)
 {
 #if CONFIG(FSPS_HAS_ARCH_UPD)
-	FSPS_ARCH_UPD *s_arch_cfg = &supd->FspsArchUpd;
+	FSPS_ARCHx_UPD *s_arch_cfg = &supd->FspsArchUpd;
 	s_arch_cfg->EnableMultiPhaseSiliconInit = fsp_is_multi_phase_init_enabled();
 #endif
 }
@@ -94,7 +89,7 @@ static void do_silicon_init(struct fsp_header *hdr)
 	FSPS_UPD *upd, *supd;
 	fsp_silicon_init_fn silicon_init;
 	uint32_t status;
-	fsp_multi_phase_si_init_fn multi_phase_si_init;
+	fsp_multi_phase_init_fn multi_phase_si_init;
 	struct fsp_multi_phase_params multi_phase_params;
 	struct fsp_multi_phase_get_number_of_phases_params multi_phase_get_number;
 
diff --git a/src/drivers/intel/fsp2_0/upd_display.c b/src/drivers/intel/fsp2_0/upd_display.c
index 63d6e60fde..0883390a64 100644
--- a/src/drivers/intel/fsp2_0/upd_display.c
+++ b/src/drivers/intel/fsp2_0/upd_display.c
@@ -16,8 +16,8 @@ void fsp_display_upd_value(const char *name, size_t size, uint64_t old,
 	}
 }
 
-static void fspm_display_arch_params(const FSPM_ARCH_UPD *old,
-	const FSPM_ARCH_UPD *new)
+static void fspm_display_arch_params(const FSPM_ARCHx_UPD *old,
+	const FSPM_ARCHx_UPD *new)
 {
 	/* Display the architectural parameters for MemoryInit */
 	printk(BIOS_SPEW, "Architectural UPD values for MemoryInit at: %p\n",