From 3d7a7f79b43e6c6b4150434fb94797fe0720ff4a Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Fri, 28 Jun 2024 10:02:56 +0000 Subject: soc/intel/common: Skip ME version log for Lite SKU This change skips the ME firmware version logging in print_me_fw_version() if the ME firmware SKU is detected as Lite SKU. The reasoning is that the RO (BP1) and RW (BP2) versions are already logged by the cse_print_boot_partition_info() function for Lite SKUs, making the additional log redundant. The check for the Lite SKU has been moved to print_me_fw_version(), where the decision to print the version is made, instead of in get_me_fw_version(), where the version information is retrieved. TEST=Able to build and boot google/rex. w/o this patch: [DEBUG] ME: Version: Unavailable w/ this patch: Unable to see such debug msg. Change-Id: Ic3843109326153d5060c2c4c25936aaa6b4cddda Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/coreboot/+/83258 Tested-by: build bot (Jenkins) Reviewed-by: Dinesh Gehlot --- src/soc/intel/common/block/cse/cse.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/soc/intel/common') diff --git a/src/soc/intel/common/block/cse/cse.c b/src/soc/intel/common/block/cse/cse.c index 51241b20e7..ed07f69283 100644 --- a/src/soc/intel/common/block/cse/cse.c +++ b/src/soc/intel/common/block/cse/cse.c @@ -879,13 +879,6 @@ static enum cb_err get_me_fw_version(struct me_fw_ver_resp *resp) if (!is_cse_enabled()) return CB_ERR; - /* - * Ignore if ME Firmware SKU type is Lite since - * print_boot_partition_info() logs RO(BP1) and RW(BP2) versions. - */ - if (cse_is_hfs3_fw_sku_lite()) - return CB_ERR; - /* * Prerequisites: * 1) HFSTS1 Current Working State is Normal @@ -917,6 +910,13 @@ void print_me_fw_version(void *unused) if (!CONFIG(CONSOLE_SERIAL)) return; + /* + * Skip if ME firmware is Lite SKU, as RO/RW versions are + * already logged by `cse_print_boot_partition_info()` + */ + if (cse_is_hfs3_fw_sku_lite()) + return; + if (get_me_fw_version(&resp) == CB_SUCCESS) { printk(BIOS_DEBUG, "ME: Version: %d.%d.%d.%d\n", resp.code.major, resp.code.minor, resp.code.hotfix, resp.code.build); -- cgit v1.2.3