From 206b0bc212f7072e879596729764eba566356c28 Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Thu, 6 Jan 2022 09:34:43 +0000 Subject: soc/intel/apl: Use Kconfig to disable HECI1 This patch makes DISABLE_HECI1_AT_PRE_BOOT=y default for Apollo Lake and ensures disable_heci1() is guarded against this config. Signed-off-by: Subrata Banik Change-Id: I7ac0cad97fcd42b2c6386693319d863352356864 Reviewed-on: https://review.coreboot.org/c/coreboot/+/60835 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- src/soc/intel/apollolake/Kconfig | 3 +++ src/soc/intel/apollolake/cse.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/soc') diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index 45e21dd83a..d3f7332047 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -116,6 +116,9 @@ config CPU_SPECIFIC_OPTIONS # provide a custom media driver that facilitates mapping select X86_CUSTOM_BOOTMEDIA +config DISABLE_HECI1_AT_PRE_BOOT + default y + config MAX_CPUS int default 4 diff --git a/src/soc/intel/apollolake/cse.c b/src/soc/intel/apollolake/cse.c index 24fb41749d..29d0a5e3d8 100644 --- a/src/soc/intel/apollolake/cse.c +++ b/src/soc/intel/apollolake/cse.c @@ -206,7 +206,8 @@ void heci_cse_lockdown(void) * It is safe to disable HECI1 now since we won't be talking to the ME * anymore. */ - disable_heci1(); + if (CONFIG(DISABLE_HECI1_AT_PRE_BOOT)) + disable_heci1(); } BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_ENTRY, fpf_blown, NULL); -- cgit v1.2.3