summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarthikeyan Ramasubramanian <kramasub@google.com>2022-08-04 14:11:07 -0600
committerMartin L Roth <gaumless@gmail.com>2022-08-07 19:44:15 +0000
commit8b1c6c6cb384c89659abbd043c2566df358d8f95 (patch)
treebb8cf47496e9f03167d71a51637b2ee1071bcb64
parent1c718519f468d8107b92d0a9ac540092ed08b1ea (diff)
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 <kramasub@google.com> Change-Id: I41c0b2816a106a6a547f3cb372693e1bb7f23734 Reviewed-on: https://review.coreboot.org/c/coreboot/+/66443 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
-rw-r--r--src/soc/amd/sabrina/early_fch.c6
1 files changed, 3 insertions, 3 deletions
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();