[S] Change in coreboot[main]: mb/google/nissa/var/riven: Disable CNVi WIFI and BT based on fw_config

[David Wu (Code Review)]

David Wu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/83720?usp=email )

Change subject: mb/google/nissa/var/riven: Disable CNVi WIFI and BT based on fw_config
......................................................................

mb/google/nissa/var/riven: Disable CNVi WIFI and BT based on fw_config

Disable CNVi WIFI and BT based on fw_config.

BUG=b:337169542
TEST=Dut boots fine with both Wifi6e & Wifi7 based cbi settings.

Change-Id: Icb925c02c73d3630be8b78debf608270b08854fe
Signed-off-by: David Wu 
---
M src/mainboard/google/brya/variants/riven/fw_config.c
M src/mainboard/google/brya/variants/riven/overridetree.cb
2 files changed, 12 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/20/83720/1

diff --git a/src/mainboard/google/brya/variants/riven/fw_config.c b/src/mainboard/google/brya/variants/riven/fw_config.c
index b22463f..96fc781 100644
--- a/src/mainboard/google/brya/variants/riven/fw_config.c
+++ b/src/mainboard/google/brya/variants/riven/fw_config.c
@@ -65,6 +65,16 @@
    PAD_NC(GPP_I18, NONE),
 };

+void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config)
+{
+	if (!fw_config_probe(FW_CONFIG(WIFI_TYPE, WIFI_CNVI))) {
+		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_is_provisioned()) {
diff --git a/src/mainboard/google/brya/variants/riven/overridetree.cb b/src/mainboard/google/brya/variants/riven/overridetree.cb
index 301d72a..044d411 100644
--- a/src/mainboard/google/brya/variants/riven/overridetree.cb
+++ b/src/mainboard/google/brya/variants/riven/overridetree.cb
@@ -230,11 +230,10 @@
    		probe WFC WFC_MIPI_OVTI8856
    	end
    	device ref cnvi_wifi on
+			probe WIFI_TYPE WIFI_CNVI
    		chip drivers/wifi/generic
    			register "enable_cnvi_ddr_rfim" = "true"
-				device generic 0 on
-					probe WIFI_TYPE WIFI_CNVI
-				end
+				device generic 0 on end
    		end
    	end
    	device ref i2c1 on