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

[Cliff Huang (Code Review)]

Cliff Huang has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/50897 )

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

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

FSP has added the Cnvi BT Core enabling in addition to the existing
CnviMode. This change adds the flag at the soc config side (i.e.
soc_intel_tigerlake_config for devicetree). Also, there is no longer PCI host
interface for BT. Therefore, BT core should not use the pci port status to turn
on/off.

TEST: BT enumeration is checked using 'lsusb -d 2cb7:0007' from OS to make
        sure BT is turned on.

Change-Id: I71c512fe884060e23ee26e7334c575c4c517b78d
Signed-off-by: Cliff Huang 
---
M src/soc/intel/tigerlake/chip.h
M src/soc/intel/tigerlake/fsp_params.c
2 files changed, 5 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/97/50897/1

diff --git a/src/soc/intel/tigerlake/chip.h b/src/soc/intel/tigerlake/chip.h
index cccf804..dd437f8 100644
--- a/src/soc/intel/tigerlake/chip.h
+++ b/src/soc/intel/tigerlake/chip.h
@@ -316,6 +316,9 @@
    	DEBUG_INTERFACE_TRACEHUB = (1 << 5),
    } debug_interface_flag;

+	/* CNVi BT Core Enable/Disable */
+	uint8_t CnviBtCore;
+
    /* CNVi BT Audio Offload: Enable/Disable BT Audio Offload. */
    enum {
    	FORCE_DISABLE,
diff --git a/src/soc/intel/tigerlake/fsp_params.c b/src/soc/intel/tigerlake/fsp_params.c
index 90d6805..d3378a7 100644
--- a/src/soc/intel/tigerlake/fsp_params.c
+++ b/src/soc/intel/tigerlake/fsp_params.c
@@ -94,8 +94,7 @@
    	disable_mask |= LPM_S0i3_3 | LPM_S0i3_4 | LPM_S0i2_2;

/* If CNVi or ISH is used, S0i3.2/S0i3.3/S0i3.4 cannot be achieved. */
-	if (is_dev_enabled(pcidev_path_on_root(PCH_DEVFN_CNVI_BT)) ||
-		is_dev_enabled(pcidev_path_on_root(PCH_DEVFN_CNVI_WIFI)) ||
+	if (is_dev_enabled(pcidev_path_on_root(PCH_DEVFN_CNVI_WIFI)) ||
    	is_dev_enabled(pcidev_path_on_root(PCH_DEVFN_ISH)))
    	disable_mask |= LPM_S0i3_2 | LPM_S0i3_3 | LPM_S0i3_4;

@@ -340,8 +339,7 @@
    params->CnviMode = is_dev_enabled(dev);

/* CNVi BT Core */
-	dev = pcidev_path_on_root(PCH_DEVFN_CNVI_BT);
-	params->CnviBtCore = is_dev_enabled(dev);
+	params->CnviBtCore = config->CnviBtCore;

/* CNVi BT Audio Offload */
    params->CnviBtAudioOffload = config->CnviBtAudioOffload;