diff options
| author | Kapil Porwal <kapilporwal@google.com> | 2023-04-12 16:16:36 +0530 |
|---|---|---|
| committer | Jakub Czapiga <jacz@semihalf.com> | 2023-04-14 09:46:16 +0000 |
| commit | 4e498e169e698f3654d6163a28e19fbd5e31820a (patch) | |
| tree | e35cbe69a3177a0ec4cee66f6dc02dbaafc006a5 | |
| parent | f43132e20cb746376b316185e9800a98ea4ffa20 (diff) | |
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>
| -rw-r--r-- | src/soc/intel/meteorlake/fsp_params.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/soc/intel/meteorlake/fsp_params.c b/src/soc/intel/meteorlake/fsp_params.c index 4127ff7628..3c14b759cc 100644 --- a/src/soc/intel/meteorlake/fsp_params.c +++ b/src/soc/intel/meteorlake/fsp_params.c @@ -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, |