[coreboot-gerrit] [S] Change in coreboot[main]: mb/google/nissa/var/nivviks: Disable CNVi Bluetooth based on fw_config

[Subrata Banik (Code Review)]

Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83148?usp=email )

Change subject: mb/google/nissa/var/nivviks: Disable CNVi Bluetooth based on fw_config
......................................................................

mb/google/nissa/var/nivviks: Disable CNVi Bluetooth based on fw_config

When CNVi based Wifi6 is disabled, CNVi based Bluetooth must be turned
off, based on fw_config. Otherwise, when device boots without the cbi
settings for wifi6, boot may fail with assertion error for line 817 &
819 of file 'src/soc/intel/alderlake/fsp_params.c'.

BUG=b:345596420
BRANCH=NONE
TEST=Dut boots fine with both Wifi6 & Wifi7 based cbi settings, along
with enumeration of corresponding BT device.

Change-Id: I03fde02fa4b36f4e47d6f0e95675feddb3bee7cd
Signed-off-by: Poornima Tom 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83148
Tested-by: build bot (Jenkins) 
Reviewed-by: Kapil Porwal 
Reviewed-by: Eric Lai 
---
M src/mainboard/google/brya/variants/nivviks/fw_config.c
1 file changed, 10 insertions(+), 0 deletions(-)

Approvals:
  Kapil Porwal: Looks good to me, approved
  Eric Lai: Looks good to me, approved
  build bot (Jenkins): Verified

diff --git a/src/mainboard/google/brya/variants/nivviks/fw_config.c b/src/mainboard/google/brya/variants/nivviks/fw_config.c
index 5f00892..ae4baf3 100644
--- a/src/mainboard/google/brya/variants/nivviks/fw_config.c
+++ b/src/mainboard/google/brya/variants/nivviks/fw_config.c
@@ -110,6 +110,16 @@
    PAD_NC_LOCK(GPP_F15, NONE, LOCK_CONFIG),
 };

+void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config)
+{
+	if (!fw_config_probe(FW_CONFIG(WIFI_CATEGORY, WIFI_6))) {
+		printk(BIOS_INFO, "CNVi bluetooth disabled by fw_config\n");
+		config->cnvi_bt_core = false;
+		printk(BIOS_INFO, "CNVi bluetooth audio offload disabled by fw_config\n");
+		config->cnvi_bt_audio_offload = false;
+	}
+}
+
 void fw_config_gpio_padbased_override(struct pad_config *padbased_table)
 {
    if (!fw_config_probe(FW_CONFIG(DB_USB, DB_1C_LTE))) {