Change in coreboot[master]: soc/intel/alderlake: Add CNVi Bluetooth flag at devicetree entry

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/51350 )

Change subject: soc/intel/alderlake: Add CNVi Bluetooth flag at devicetree entry
......................................................................

soc/intel/alderlake: Add CNVi Bluetooth flag at devicetree entry

This change adds the corresponding CNVi BT Core enabling flag.
TEST: BT is checked using 'lsusb -d 8087:0026' from OS.

Change-Id: Iecc10c8946a450350adb34b984cf48ad988097ca
Signed-off-by: Cliff Huang 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51350
Reviewed-by: Furquan Shaikh 
Tested-by: build bot (Jenkins) 
---
M src/soc/intel/alderlake/chip.h
M src/soc/intel/alderlake/fsp_params.c
2 files changed, 8 insertions(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved

diff --git a/src/soc/intel/alderlake/chip.h b/src/soc/intel/alderlake/chip.h
index fa9fce2..e1ac015 100644
--- a/src/soc/intel/alderlake/chip.h
+++ b/src/soc/intel/alderlake/chip.h
@@ -206,6 +206,9 @@
    /* Enable Pch iSCLK */
    uint8_t pch_isclk;

+	/* CNVi BT Core Enable/Disable */
+	bool CnviBtCore;
+
    /* CNVi BT Audio Offload: Enable/Disable BT Audio Offload. */
    bool CnviBtAudioOffload;

diff --git a/src/soc/intel/alderlake/fsp_params.c b/src/soc/intel/alderlake/fsp_params.c
index fcfad98..19afbc4 100644
--- a/src/soc/intel/alderlake/fsp_params.c
+++ b/src/soc/intel/alderlake/fsp_params.c
@@ -247,13 +247,12 @@
    /* CNVi */
    dev = pcidev_path_on_root(PCH_DEVFN_CNVI_WIFI);
    params->CnviMode = is_dev_enabled(dev);
-
-	/* CNVi BT Core */
-	dev = pcidev_path_on_root(PCH_DEVFN_CNVI_BT);
-	params->CnviBtCore = is_dev_enabled(dev);
-
-	/* CNVi BT Audio Offload */
+	params->CnviBtCore = config->CnviBtCore;
    params->CnviBtAudioOffload = config->CnviBtAudioOffload;
+	/* Assert if CNVi BT is enabled without CNVi being enabled. */
+	assert(params->CnviMode || !params->CnviBtCore);
+	/* Assert if CNVi BT offload is enabled without CNVi BT being enabled. */
+	assert(params->CnviBtCore || !params->CnviBtAudioOffload);

/* VMD */
    dev = pcidev_path_on_root(SA_DEVFN_VMD);