Change in coreboot[master]: soc/intel/apollolake: Use PCR write to disable HECI1

[Subrata Banik (Code Review)]

Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/61444 )

Change subject: soc/intel/apollolake: Use PCR write to disable HECI1
......................................................................

soc/intel/apollolake: Use PCR write to disable HECI1

Set the SOC_INTEL_COMMON_BLOCK_HECI1_DISABLE_USING_PCR config for
Apollo Lake to disable HECI1 device using PCR writes.

BUG=none
TEST=None

Signed-off-by: Subrata Banik 
Change-Id: I8df9544296f0bea095c5415805a596cb5b36885e
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61444
Tested-by: build bot (Jenkins) 
Reviewed-by: Lean Sheng Tan 
---
M src/soc/intel/apollolake/Kconfig
M src/soc/intel/apollolake/cse.c
2 files changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index d3f7332..cd0abf7 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -73,6 +73,7 @@
    select SOC_INTEL_COMMON_BLOCK_GPIO_ITSS_POL_CFG
    select SOC_INTEL_COMMON_BLOCK_GPIO_IOSTANDBY
    select SOC_INTEL_COMMON_BLOCK_GRAPHICS
+	select SOC_INTEL_COMMON_BLOCK_HECI1_DISABLE_USING_PCR if DISABLE_HECI1_AT_PRE_BOOT
    select SOC_INTEL_COMMON_BLOCK_ITSS
    select SOC_INTEL_COMMON_BLOCK_I2C
    select SOC_INTEL_COMMON_BLOCK_LPC
diff --git a/src/soc/intel/apollolake/cse.c b/src/soc/intel/apollolake/cse.c
index 29d0a5e..7d1e6e7 100644
--- a/src/soc/intel/apollolake/cse.c
+++ b/src/soc/intel/apollolake/cse.c
@@ -192,7 +192,7 @@
 #define PCR_PSFX_T0_SHDW_PCIEN		0x1C
 #define PCR_PSFX_T0_SHDW_PCIEN_FUNDIS	(1 << 8)

-static void disable_heci1(void)
+void soc_disable_heci1_using_pcr(void)
 {
    pcr_or32(PID_PSF3, PSF3_BASE_ADDRESS + PCR_PSFX_T0_SHDW_PCIEN,
    	 PCR_PSFX_T0_SHDW_PCIEN_FUNDIS);
@@ -207,7 +207,7 @@
     * anymore.
     */
    if (CONFIG(DISABLE_HECI1_AT_PRE_BOOT))
-		disable_heci1();
+		heci1_disable();
 }

BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, fpf_blown, NULL);