[coreboot-gerrit] Change in coreboot[master]: soc/intel/tigerlake: Enable CNVi through dev_enabled

[Srinidhi N Kaushik (Code Review)]

Srinidhi N Kaushik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39465 )

Change subject: soc/intel/tigerlake: Enable CNVi through dev_enabled
......................................................................

soc/intel/tigerlake: Enable CNVi through dev_enabled

Check for dev enabled status for CNVi and update the
UPD accordingly.

BUG=none
BRANCH=none
TEST=Build and boot tglrvp

Signed-off-by: Srinidhi N Kaushik 
Change-Id: I15a03cc70f12e094badf942dd81f22bd09531051
---
M src/soc/intel/tigerlake/chip.h
M src/soc/intel/tigerlake/fsp_params_tgl.c
2 files changed, 5 insertions(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/39465/1

diff --git a/src/soc/intel/tigerlake/chip.h b/src/soc/intel/tigerlake/chip.h
index d23148a..93c8126 100644
--- a/src/soc/intel/tigerlake/chip.h
+++ b/src/soc/intel/tigerlake/chip.h
@@ -214,10 +214,6 @@
    /* Enable Pch iSCLK */
    uint8_t pch_isclk;

-	/* CNVi */
-	uint8_t CnviMode;
-	uint8_t CnviBtCore;
-
    /* CNVi BT Audio Offload: Enable/Disable BT Audio Offload. */
    enum {
    	FORCE_DISABLE,
diff --git a/src/soc/intel/tigerlake/fsp_params_tgl.c b/src/soc/intel/tigerlake/fsp_params_tgl.c
index 14997c5..7863fd9 100644
--- a/src/soc/intel/tigerlake/fsp_params_tgl.c
+++ b/src/soc/intel/tigerlake/fsp_params_tgl.c
@@ -150,8 +150,11 @@
    	params->PchLanEnable = dev->enabled;

/* CNVi */
-	params->CnviMode = config->CnviMode;
-	params->CnviBtCore = config->CnviBtCore;
+	dev = pcidev_path_on_root(PCH_DEVFN_CNVI_WIFI);
+	if (dev)
+		params->CnviMode = dev->enabled;
+	else
+		params->CnviMode = 0;

/* Legacy 8254 timer support */
    params->Enable8254ClockGating = !CONFIG_USE_LEGACY_8254_TIMER;