Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/41972 )
Change subject: soc/intel/common: Replace cse_bp and ME with cse_lite in all console logs ......................................................................
soc/intel/common: Replace cse_bp and ME with cse_lite in all console logs
Replace 'cse_bp'(cse boot partition) and 'ME' with 'cse_lite' in all log messages in the cse_lite.c.
TEST=Verified on hatch
Signed-off-by: Sridhar Siricilla sridhar.siricilla@intel.com Change-Id: I3fc677c9ec1962199c91cc310d7695dded4e0ba0 Reviewed-on: https://review.coreboot.org/c/coreboot/+/41972 Reviewed-by: Furquan Shaikh furquan@google.com Reviewed-by: V Sowmya v.sowmya@intel.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/intel/common/block/cse/cse_lite.c 1 file changed, 22 insertions(+), 20 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved V Sowmya: Looks good to me, approved
diff --git a/src/soc/intel/common/block/cse/cse_lite.c b/src/soc/intel/common/block/cse/cse_lite.c index 1f9e2ce..3077c7f 100644 --- a/src/soc/intel/common/block/cse/cse_lite.c +++ b/src/soc/intel/common/block/cse/cse_lite.c @@ -166,21 +166,23 @@ { const struct cse_bp_entry *cse_bp;
- printk(BIOS_DEBUG, "ME: Number of partitions = %d\n", cse_bp_info->total_number_of_bp); - printk(BIOS_DEBUG, "ME: Current partition = %s\n", GET_BP_STR(cse_bp_info->current_bp)); - printk(BIOS_DEBUG, "ME: Next partition = %s\n", GET_BP_STR(cse_bp_info->next_bp)); - printk(BIOS_DEBUG, "ME: Flags = 0x%x\n", cse_bp_info->flags); + printk(BIOS_DEBUG, "cse_lite: Number of partitions = %d\n", + cse_bp_info->total_number_of_bp); + printk(BIOS_DEBUG, "cse_lite: Current partition = %s\n", + GET_BP_STR(cse_bp_info->current_bp)); + printk(BIOS_DEBUG, "cse_lite: Next partition = %s\n", GET_BP_STR(cse_bp_info->next_bp)); + printk(BIOS_DEBUG, "cse_lite: Flags = 0x%x\n", cse_bp_info->flags);
/* Log version info of RO & RW partitions */ cse_bp = cse_get_bp_entry(RO, cse_bp_info); - printk(BIOS_DEBUG, "ME: %s version = %d.%d.%d.%d (Status=0x%x, Start=0x%x, End=0x%x)\n", + printk(BIOS_DEBUG, "cse_lite: %s version = %d.%d.%d.%d (Status=0x%x, Start=0x%x, End=0x%x)\n", GET_BP_STR(RO), cse_bp->fw_ver.major, cse_bp->fw_ver.minor, cse_bp->fw_ver.hotfix, cse_bp->fw_ver.build, cse_bp->status, cse_bp->start_offset, cse_bp->end_offset);
cse_bp = cse_get_bp_entry(RW, cse_bp_info); - printk(BIOS_DEBUG, "ME: %s version = %d.%d.%d.%d (Status=0x%x, Start=0x%x, End=0x%x)\n", + printk(BIOS_DEBUG, "cse_lite: %s version = %d.%d.%d.%d (Status=0x%x, Start=0x%x, End=0x%x)\n", GET_BP_STR(RW), cse_bp->fw_ver.major, cse_bp->fw_ver.minor, cse_bp->fw_ver.hotfix, cse_bp->fw_ver.build, cse_bp->status, cse_bp->start_offset, @@ -222,19 +224,19 @@ };
if (!cse_is_bp_cmd_info_possible()) { - printk(BIOS_ERR, "cse_bp: CSE does not meet prerequisites\n"); + printk(BIOS_ERR, "cse_lite: CSE does not meet prerequisites\n"); return false; }
size_t resp_size = sizeof(struct get_bp_info_rsp);
if (!heci_send_receive(&info_req, sizeof(info_req), bp_info_rsp, &resp_size)) { - printk(BIOS_ERR, "cse_bp: Could not get partition info\n"); + printk(BIOS_ERR, "cse_lite: Could not get partition info\n"); return false; }
if (bp_info_rsp->hdr.result) { - printk(BIOS_ERR, "cse_bp: Get partition info resp failed: %d\n", + printk(BIOS_ERR, "cse_lite: Get partition info resp failed: %d\n", bp_info_rsp->hdr.result); return false; } @@ -266,14 +268,14 @@ };
if (bp != RO && bp != RW) { - printk(BIOS_ERR, "cse_bp: Incorrect partition id(%d) is provided", bp); + printk(BIOS_ERR, "cse_lite: Incorrect partition id(%d) is provided", bp); return false; }
- printk(BIOS_INFO, "cse_bp: Set Boot Partition Info Command (%s)\n", GET_BP_STR(bp)); + printk(BIOS_INFO, "cse_lite: Set Boot Partition Info Command (%s)\n", GET_BP_STR(bp));
if (!cse_is_bp_cmd_info_possible()) { - printk(BIOS_ERR, "cse_bp: CSE does not meet prerequisites\n"); + printk(BIOS_ERR, "cse_lite: CSE does not meet prerequisites\n"); return false; }
@@ -284,7 +286,7 @@ return false;
if (switch_resp.result) { - printk(BIOS_ERR, "cse_bp: Set Boot Partition Info Response Failed: %d\n", + printk(BIOS_ERR, "cse_lite: Set Boot Partition Info Response Failed: %d\n", switch_resp.result); return false; } @@ -302,7 +304,7 @@
do_global_reset();
- die("cse_bp: Failed to reset system\n"); + die("cse_lite: Failed to reset system\n");
/* Control never reaches here */ return false; @@ -317,7 +319,7 @@
if (rw_bp->status == BP_STATUS_PARTITION_NOT_PRESENT || rw_bp->status == BP_STATUS_GENERAL_FAILURE) { - printk(BIOS_ERR, "cse_bp: RW BP (status:%u) is not valid\n", rw_bp->status); + printk(BIOS_ERR, "cse_lite: RW BP (status:%u) is not valid\n", rw_bp->status); return false; } return true; @@ -333,28 +335,28 @@ static struct get_bp_info_rsp cse_bp_info;
if (vboot_recovery_mode_enabled()) { - printk(BIOS_DEBUG, "cse_bp: Skip switching to RW in the recovery path\n"); + printk(BIOS_DEBUG, "cse_lite: Skip switching to RW in the recovery path\n"); return; }
/* If CSE SKU type is not Lite, skip enabling CSE Lite SKU */ if (!cse_is_hfs3_fw_sku_lite()) { - printk(BIOS_ERR, "cse_bp: Not a CSE Lite SKU\n"); + printk(BIOS_ERR, "cse_lite: Not a CSE Lite SKU\n"); return; }
if (!cse_get_bp_info(&cse_bp_info)) { - printk(BIOS_ERR, "cse_bp: Failed to get CSE boot partition info\n"); + printk(BIOS_ERR, "cse_lite: Failed to get CSE boot partition info\n"); cse_trigger_recovery(CSE_LITE_SKU_COMMUNICATION_ERROR); }
if (!cse_is_rw_info_valid(&cse_bp_info.bp_info)) { - printk(BIOS_ERR, "cse_bp: CSE RW partition is not valid\n"); + printk(BIOS_ERR, "cse_lite: CSE RW partition is not valid\n"); cse_trigger_recovery(CSE_LITE_SKU_RW_JUMP_ERROR); }
if (!cse_boot_to_rw(&cse_bp_info.bp_info)) { - printk(BIOS_ERR, "cse_bp: Failed to switch to RW\n"); + printk(BIOS_ERR, "cse_lite: Failed to switch to RW\n"); cse_trigger_recovery(CSE_LITE_SKU_RW_SWITCH_ERROR); } }