Kapil Porwal has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/74370 )
Change subject: soc/intel/meteorlake: Replace assert with error message ......................................................................
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 indentifying the issue.
BUG=none TEST=Boot to the OS on google/rex
Signed-off-by: Kapil Porwal kapilporwal@google.com Change-Id: I49a988b7eda009456d438ba7be0d2918826e1c36 --- M src/soc/intel/meteorlake/fsp_params.c 1 file changed, 23 insertions(+), 6 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/70/74370/1
diff --git a/src/soc/intel/meteorlake/fsp_params.c b/src/soc/intel/meteorlake/fsp_params.c index 4127ff7..d6bbcc8 100644 --- a/src/soc/intel/meteorlake/fsp_params.c +++ b/src/soc/intel/meteorlake/fsp_params.c @@ -565,12 +565,12 @@ 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"); + if (!s_cfg->CnviMode && s_cfg->CnviBtCore) + printk(BIOS_ERR, "CNVi BT is enabled without CNVi being enabled\n"); + if (!s_cfg->CnviBtCore && s_cfg->CnviBtAudioOffload) + printk(BIOS_ERR, "BT offload is enabled without CNVi BT being enabled\n"); }
static void fill_fsps_vmd_params(FSP_S_CONFIG *s_cfg,