From 8b1c6c6cb384c89659abbd043c2566df358d8f95 Mon Sep 17 00:00:00 2001 From: Karthikeyan Ramasubramanian Date: Thu, 4 Aug 2022 14:11:07 -0600 Subject: soc/amd/sabrina: Re-init eSPI in bootblock Currently bootblock does not initialize eSPI if it is already done in PSP verstage. But some other component is clobbering the eSPI configuration causing timeouts in EC communication after the boot flow hits x86. To workaround this issue, re-initialize eSPI in bootblock. BUG=b:217414563 TEST=Build and boot to OS in Skyrim with PSP verstage. Signed-off-by: Karthikeyan Ramasubramanian Change-Id: I41c0b2816a106a6a547f3cb372693e1bb7f23734 Reviewed-on: https://review.coreboot.org/c/coreboot/+/66443 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/soc/amd/sabrina/early_fch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/soc') diff --git a/src/soc/amd/sabrina/early_fch.c b/src/soc/amd/sabrina/early_fch.c index 45ba85c64c..f637e886ce 100644 --- a/src/soc/amd/sabrina/early_fch.c +++ b/src/soc/amd/sabrina/early_fch.c @@ -42,9 +42,9 @@ void fch_pre_init(void) /* Setup SPI base by calling lpc_early_init before setting up eSPI. */ lpc_early_init(); - /* Setup eSPI to enable port80 routing if the board is using eSPI and the eSPI - interface hasn't already been set up in verstage on PSP */ - if (CONFIG(SOC_AMD_COMMON_BLOCK_USE_ESPI) && !CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)) + /* Setup eSPI to enable port80 routing if the board is using eSPI. + TODO(b/241426419): Setup eSPI if it is not already done in verstage on PSP. */ + if (CONFIG(SOC_AMD_COMMON_BLOCK_USE_ESPI)) configure_espi_with_mb_hook(); fch_spi_early_init(); -- cgit v1.2.3