[S] Change in coreboot[master]: soc/intel/meteorlake: Replace assert with error message

[Jakub Czapiga (Code Review)]

Jakub Czapiga has submitted this change. ( 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 identifying
the issue.

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

Signed-off-by: Kapil Porwal 
Change-Id: I49a988b7eda009456d438ba7be0d2918826e1c36
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74370
Reviewed-by: Eric Lai 
Tested-by: build bot (Jenkins) 
Reviewed-by: Subrata Banik 
---
M src/soc/intel/meteorlake/fsp_params.c
1 file changed, 34 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Subrata Banik: Looks good to me, approved
  Eric Lai: Looks good to me, but someone else must approve

diff --git a/src/soc/intel/meteorlake/fsp_params.c b/src/soc/intel/meteorlake/fsp_params.c
index 4127ff7..3c14b75 100644
--- a/src/soc/intel/meteorlake/fsp_params.c
+++ b/src/soc/intel/meteorlake/fsp_params.c
@@ -565,12 +565,19 @@
    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,