From 0b370361551b34250ebc64ffc252f24b68207ba6 Mon Sep 17 00:00:00 2001 From: Raul Rangel Date: Mon, 8 May 2023 18:02:28 +0000 Subject: [PATCH] Revert "soc/amd/cezanne/romstage: Preload fspm.bin" This reverts commit d6e0a90aa0bd574b28b6c9b4b46289bf46a208db. Reason for revert: Not ready to land, blocked by ancestor CL Signed-off-by: Raul E Rangel Change-Id: Ic14e17db4aed2f998878920c66cdc16362920dcb Reviewed-on: https://review.coreboot.org/c/coreboot/+/75050 Reviewed-by: Shelley Chen Tested-by: build bot (Jenkins) --- src/soc/amd/cezanne/fsp_s_params.c | 6 ++++-- src/soc/amd/cezanne/romstage.c | 2 -- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/soc/amd/cezanne/fsp_s_params.c b/src/soc/amd/cezanne/fsp_s_params.c index a7ef95876f..60f3942802 100644 --- a/src/soc/amd/cezanne/fsp_s_params.c +++ b/src/soc/amd/cezanne/fsp_s_params.c @@ -18,8 +18,10 @@ void platform_fsp_silicon_init_params_cb(FSPS_UPD *supd) fsp_assign_vbios_upds(scfg); /* - * At this point FSP-S has been loaded into RAM. Since FSP-S takes a while to execute - * and performs no SPI operations, we can read the APOB while FSP-S executes. + * At this point FSP-S has been loaded into RAM. If we were to start loading the APOB + * before FSP-S was loaded, we would introduce contention onto the SPI bus and + * slow down the FSP-S read from SPI. Since FSP-S takes a while to execute and performs + * no SPI operations, we can read the APOB while FSP-S executes. */ start_apob_cache_read(); /* diff --git a/src/soc/amd/cezanne/romstage.c b/src/soc/amd/cezanne/romstage.c index c6bba7b81e..2bf5e230c9 100644 --- a/src/soc/amd/cezanne/romstage.c +++ b/src/soc/amd/cezanne/romstage.c @@ -18,8 +18,6 @@ void __noreturn romstage_main(void) /* Snapshot chipset state prior to any FSP call */ fill_chipset_state(); - preload_fspm(); - fsp_memory_init(acpi_is_wakeup_s3()); /* Fixup settings FSP-M should not be changing */