[coreboot-gerrit] Change in coreboot[master]: soc/intel/cannonlake: Forbid FSP from disabling HECI1

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/61455 )

Change subject: soc/intel/cannonlake: Forbid FSP from disabling HECI1
......................................................................

soc/intel/cannonlake: Forbid FSP from disabling HECI1

The functionality of disabling HECI1 device has been moved from the
FSP to coreboot (using `DISABLE_HECI1_AT_PRE_BOOT` config), hence,
always set the `Heci1Disabled` UPD to `0`.

BUG=none
TEST=Boot to OS, verify HECI1 is disabled on hatch system
using coreboot when mainboard selects DISABLE_HECI1_AT_PRE_BOOT config.

Signed-off-by: Subrata Banik 
Change-Id: Ia8908c080ca9991e7a71e795ccb8fc76d99514f8
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61455
Tested-by: build bot (Jenkins) 
Reviewed-by: Lean Sheng Tan 
---
M src/soc/intel/cannonlake/fsp_params.c
1 file changed, 6 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Lean Sheng Tan: Looks good to me, approved

diff --git a/src/soc/intel/cannonlake/fsp_params.c b/src/soc/intel/cannonlake/fsp_params.c
index af356d1..1726cd7 100644
--- a/src/soc/intel/cannonlake/fsp_params.c
+++ b/src/soc/intel/cannonlake/fsp_params.c
@@ -586,9 +586,12 @@
    params->ScsUfsEnabled = is_devfn_enabled(PCH_DEVFN_UFS);

params->Heci3Enabled = is_devfn_enabled(PCH_DEVFN_CSE_3);
-#if !CONFIG(HECI_DISABLE_USING_SMM)
-	params->Heci1Disabled = CONFIG(DISABLE_HECI1_AT_PRE_BOOT);
-#endif
+	/*
+	 * coreboot will handle disabling of HECI1 device if `DISABLE_HECI1_AT_PRE_BOOT`
+	 * config is selected hence, don't let FSP to disable the HECI1 device and set
+	 * the `Heci1Disabled` UPD to `0`.
+	 */
+	params->Heci1Disabled = 0;
    params->Device4Enable = config->Device4Enable;

/* Teton Glacier hybrid storage support */