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

soc/intel/meteorlake: Replace assert with error message 

Avoid asserts related to CNVi UPDs which are not boot critical.
Instead, add error messages which are more helpful in identifying
the issue.

BUG=none
TEST=Boot to the OS on google/rex

Signed-off-by: Kapil Porwal <kapilporwal@google.com>
Change-Id: I49a988b7eda009456d438ba7be0d2918826e1c36
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74370
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Subrata Banik <subratabanik@google.com>
This commit is contained in:
Kapil Porwal 2023-04-12 16:16:36 +05:30 committed by Jakub Czapiga
parent f43132e20c
commit 4e498e169e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/soc/intel/meteorlake/fsp_params.c
View File

@ -565,12 +565,19 @@ static void fill_fsps_cnvi_params(FSP_S_CONFIG *s_cfg,
s_cfg->CnviWifiCore = config->cnvi_wifi_core;
s_cfg->CnviBtCore = config->cnvi_bt_core;
s_cfg->CnviBtAudioOffload = config->cnvi_bt_audio_offload;
/* Assert if CNVi WiFi is enabled without CNVi being enabled. */
assert(s_cfg->CnviMode || !s_cfg->CnviWifiCore);
/* Assert if CNVi BT is enabled without CNVi being enabled. */
assert(s_cfg->CnviMode || !s_cfg->CnviBtCore);
/* Assert if CNVi BT offload is enabled without CNVi BT being enabled. */
assert(s_cfg->CnviBtCore || !s_cfg->CnviBtAudioOffload);
if (!s_cfg->CnviMode && s_cfg->CnviWifiCore) {
printk(BIOS_ERR, "CNVi WiFi is enabled without CNVi being enabled\n");
s_cfg->CnviWifiCore = 0;
}
if (!s_cfg->CnviBtCore && s_cfg->CnviBtAudioOffload) {
printk(BIOS_ERR, "BT offload is enabled without CNVi BT being enabled\n");
s_cfg->CnviBtAudioOffload = 0;
}
if (!s_cfg->CnviMode && s_cfg->CnviBtCore) {
printk(BIOS_ERR, "CNVi BT is enabled without CNVi being enabled\n");
s_cfg->CnviBtCore = 0;
s_cfg->CnviBtAudioOffload = 0;
}
}
static void fill_fsps_vmd_params(FSP_S_CONFIG *s_cfg,