Attention is currently required from: Andrey Petrov, Dinesh Gehlot, Eran Mitrani, Jakub Czapiga, Kapil Porwal, Nick Vaccaro, Ronak Kanabar, Subrata Banik, Tarun.
Jérémy Compostella has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/81094?usp=email )
Change subject: drivers/intel/fsp2_0: Add "silicon" to the multiphase callback ......................................................................
drivers/intel/fsp2_0: Add "silicon" to the multiphase callback
The `platform_fsp_multi_phase_init_cb' callback is specific to the FSP-S, let's rename it 'platform_fsp_silicon_multi_phase_init_cb' to avoid any confusion.
Change-Id: I86b69e2069f08023e6f48464f6df4593710aa9ee Signed-off-by: Jeremy Compostella jeremy.compostella@intel.com --- M src/drivers/intel/fsp2_0/include/fsp/api.h M src/drivers/intel/fsp2_0/silicon_init.c M src/soc/intel/alderlake/fsp_params.c M src/soc/intel/meteorlake/fsp_params.c M src/soc/intel/tigerlake/fsp_params.c 5 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/81094/1
diff --git a/src/drivers/intel/fsp2_0/include/fsp/api.h b/src/drivers/intel/fsp2_0/include/fsp/api.h index c035452..40a64e6 100644 --- a/src/drivers/intel/fsp2_0/include/fsp/api.h +++ b/src/drivers/intel/fsp2_0/include/fsp/api.h @@ -48,7 +48,7 @@ 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_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/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c index e543628..4be4b61 100644 --- a/src/drivers/intel/fsp2_0/silicon_init.c +++ b/src/drivers/intel/fsp2_0/silicon_init.c @@ -27,7 +27,7 @@ };
/* Callbacks for SoC/Mainboard specific overrides */ -void __weak platform_fsp_multi_phase_init_cb(uint32_t phase_index) +void __weak platform_fsp_silicon_multi_phase_init_cb(uint32_t phase_index) { /* Leave for the SoC/Mainboard to implement if necessary. */ } @@ -190,7 +190,7 @@ * Give SoC/mainboard a chance to perform any operation before * Multi Phase Execution */ - platform_fsp_multi_phase_init_cb(i); + platform_fsp_silicon_multi_phase_init_cb(i);
multi_phase_params.multi_phase_action = EXECUTE_PHASE; multi_phase_params.phase_index = i; diff --git a/src/soc/intel/alderlake/fsp_params.c b/src/soc/intel/alderlake/fsp_params.c index b432030..46555b0 100644 --- a/src/soc/intel/alderlake/fsp_params.c +++ b/src/soc/intel/alderlake/fsp_params.c @@ -1342,7 +1342,7 @@ * 1 | After TCSS initialization completed | for TCSS specific init * 2 | Before BIOS Reset CPL is set by FSP-S | for CPU specific init */ -void platform_fsp_multi_phase_init_cb(uint32_t phase_index) +void platform_fsp_silicon_multi_phase_init_cb(uint32_t phase_index) { switch (phase_index) { case 1: diff --git a/src/soc/intel/meteorlake/fsp_params.c b/src/soc/intel/meteorlake/fsp_params.c index 971fa33..a02d4b9 100644 --- a/src/soc/intel/meteorlake/fsp_params.c +++ b/src/soc/intel/meteorlake/fsp_params.c @@ -838,7 +838,7 @@ * 1 | After TCSS initialization completed | for TCSS specific init * 2 | Before BIOS Reset CPL is set by FSP-S | for CPU specific init */ -void platform_fsp_multi_phase_init_cb(uint32_t phase_index) +void platform_fsp_silicon_multi_phase_init_cb(uint32_t phase_index) { switch (phase_index) { case 1: diff --git a/src/soc/intel/tigerlake/fsp_params.c b/src/soc/intel/tigerlake/fsp_params.c index 358536e..3326935 100644 --- a/src/soc/intel/tigerlake/fsp_params.c +++ b/src/soc/intel/tigerlake/fsp_params.c @@ -659,7 +659,7 @@ * ------- + ------------------------------------------------ + ------------------------------- * 1 | After TCSS initialization completed | for TCSS specific init */ -void platform_fsp_multi_phase_init_cb(uint32_t phase_index) +void platform_fsp_silicon_multi_phase_init_cb(uint32_t phase_index) { switch (phase_index) { case 1: