GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

soc/intel/common: Replace cse_bp and ME with cse_lite in all console logs

Browse source 
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>
This commit is contained in:
Sridhar Siricilla 2020-06-01 14:50:52 +05:30 committed by Patrick Georgi
parent 02cce9024e
commit 9f71b1713a
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/soc/intel/common/block/cse/cse_lite.c
View file

@ -166,21 +166,23 @@ static void cse_print_boot_partition_info(const struct cse_bp_info *cse_bp_info)
{ {
const struct cse_bp_entry *cse_bp; 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, "cse_lite: Number of partitions = %d\n",
printk(BIOS_DEBUG, "ME: Current partition = %s\n", GET_BP_STR(cse_bp_info->current_bp)); cse_bp_info->total_number_of_bp);
printk(BIOS_DEBUG, "ME: Next partition = %s\n", GET_BP_STR(cse_bp_info->next_bp)); printk(BIOS_DEBUG, "cse_lite: Current partition = %s\n",
printk(BIOS_DEBUG, "ME: Flags = 0x%x\n", cse_bp_info->flags); 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 */ /* Log version info of RO & RW partitions */
cse_bp = cse_get_bp_entry(RO, cse_bp_info); 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, 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->fw_ver.hotfix, cse_bp->fw_ver.build,
cse_bp->status, cse_bp->start_offset, cse_bp->status, cse_bp->start_offset,
cse_bp->end_offset); cse_bp->end_offset);
cse_bp = cse_get_bp_entry(RW, cse_bp_info); 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, 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->fw_ver.hotfix, cse_bp->fw_ver.build,
cse_bp->status, cse_bp->start_offset, cse_bp->status, cse_bp->start_offset,
@ -222,19 +224,19 @@ static bool cse_get_bp_info(struct get_bp_info_rsp *bp_info_rsp)
}; };
if (!cse_is_bp_cmd_info_possible()) { 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; return false;
} }
size_t resp_size = sizeof(struct get_bp_info_rsp); size_t resp_size = sizeof(struct get_bp_info_rsp);
if (!heci_send_receive(&info_req, sizeof(info_req), bp_info_rsp, &resp_size)) { 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; return false;
} }
if (bp_info_rsp->hdr.result) { 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); bp_info_rsp->hdr.result);
return false; return false;
} }
@ -266,14 +268,14 @@ static bool cse_set_next_boot_partition(enum boot_partition_id bp)
}; };
if (bp != RO && bp != RW) { 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; 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()) { 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; return false;
} }
@ -284,7 +286,7 @@ static bool cse_set_next_boot_partition(enum boot_partition_id bp)
return false; return false;
if (switch_resp.result) { 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); switch_resp.result);
return false; return false;
} }
@ -302,7 +304,7 @@ static bool cse_boot_to_rw(const struct cse_bp_info *cse_bp_info)
do_global_reset(); do_global_reset();
die("cse_bp: Failed to reset system\n"); die("cse_lite: Failed to reset system\n");
/* Control never reaches here */ /* Control never reaches here */
return false; return false;
@ -317,7 +319,7 @@ static bool cse_is_rw_status_valid(const struct cse_bp_info *cse_bp_info)
if (rw_bp->status == BP_STATUS_PARTITION_NOT_PRESENT || if (rw_bp->status == BP_STATUS_PARTITION_NOT_PRESENT ||
rw_bp->status == BP_STATUS_GENERAL_FAILURE) { 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 false;
} }
return true; return true;
@ -333,28 +335,28 @@ void cse_fw_sync(void *unused)
static struct get_bp_info_rsp cse_bp_info; static struct get_bp_info_rsp cse_bp_info;
if (vboot_recovery_mode_enabled()) { 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; return;
} }
/* If CSE SKU type is not Lite, skip enabling CSE Lite SKU */ /* If CSE SKU type is not Lite, skip enabling CSE Lite SKU */
if (!cse_is_hfs3_fw_sku_lite()) { 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; return;
} }
if (!cse_get_bp_info(&cse_bp_info)) { 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); cse_trigger_recovery(CSE_LITE_SKU_COMMUNICATION_ERROR);
} }
if (!cse_is_rw_info_valid(&cse_bp_info.bp_info)) { 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); cse_trigger_recovery(CSE_LITE_SKU_RW_JUMP_ERROR);
} }
if (!cse_boot_to_rw(&cse_bp_info.bp_info)) { 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); cse_trigger_recovery(CSE_LITE_SKU_RW_SWITCH_ERROR);
} }
} }