Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/75768?usp=email )
(
4 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: soc/intel/cmn/cse: Always save CSE RW version to CBMEM ......................................................................
soc/intel/cmn/cse: Always save CSE RW version to CBMEM
This patch renames `cse_store_rw_fw_version` function that store currently running CSE RW FW version inside CBMEM.
Additionally, perform the CSE RW FW storing operation unconditionally.
TEST=Able to build and boot google/marasov.
Change-Id: Iba85807b7d9e6f067b5b628c6fa062fab5c485e0 Signed-off-by: Subrata Banik subratabanik@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/75768 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Kangheui Won khwon@chromium.org Reviewed-by: Kapil Porwal kapilporwal@google.com --- M src/soc/intel/common/block/cse/cse_lite.c 1 file changed, 5 insertions(+), 5 deletions(-)
Approvals: Kapil Porwal: Looks good to me, approved build bot (Jenkins): Verified Kangheui Won: Looks good to me, but someone else must approve
diff --git a/src/soc/intel/common/block/cse/cse_lite.c b/src/soc/intel/common/block/cse/cse_lite.c index 7063ecb..97f114c 100644 --- a/src/soc/intel/common/block/cse/cse_lite.c +++ b/src/soc/intel/common/block/cse/cse_lite.c @@ -1175,7 +1175,7 @@ * Helper function that stores current CSE firmware version to CBMEM memory, * except during recovery mode. */ -static void store_cse_rw_fw_version(void) +static void cse_store_rw_fw_version(void) { if (vboot_recovery_mode_enabled()) return; @@ -1303,15 +1303,15 @@ if (CONFIG(SOC_INTEL_CSE_LITE_SYNC_IN_RAMSTAGE)) cse_fw_sync();
+ /* Store the CSE RW Firmware Version into CBMEM */ + cse_store_rw_fw_version(); /* - * Store the CSE/ISH RW Firmware Version into CBMEM if ISH partition + * Store the ISH RW Firmware Version into CBMEM if ISH partition * is available */ if (CONFIG(SOC_INTEL_STORE_ISH_FW_VERSION) && - soc_is_ish_partition_enabled()) { - store_cse_rw_fw_version(); + soc_is_ish_partition_enabled()) store_ish_version(); - } }
BOOT_STATE_INIT_ENTRY(BS_PRE_DEVICE, BS_ON_EXIT, ramstage_cse_misc_ops, NULL);