From 3c06f1e522df23a8c91620af540f7f6b2698403c Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Tue, 13 Jun 2023 02:12:30 +0530 Subject: 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 Reviewed-on: https://review.coreboot.org/c/coreboot/+/75768 Tested-by: build bot (Jenkins) Reviewed-by: Kangheui Won Reviewed-by: Kapil Porwal --- src/soc/intel/common/block/cse/cse_lite.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/soc') diff --git a/src/soc/intel/common/block/cse/cse_lite.c b/src/soc/intel/common/block/cse/cse_lite.c index 7063ecb80a..97f114c10c 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 @@ void cse_fw_sync(void) * 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 @@ static void ramstage_cse_misc_ops(void *unused) 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); -- cgit v1.2.3