From 455e07e7f3f42b2ce866ae6a8f243361a77dd5e5 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 20 May 2021 17:22:28 -0600 Subject: [PATCH] mb/google/guybrush: Move variant_has_fpmcu() after eSPI init Currently variant_has_fpmcu() is called very early in bootblock, before eSPI is initialized. When checking CBI for its presence, that causes an error and nothing else can be read from CBI in bootblock. Moving it slightly later in bootblock doesn't hurt anything from a timing standpoint, and allows CBI to be read. BUG=None TEST=See CBI get read and the FPMCU field read correctly. Signed-off-by: Martin Roth Change-Id: I6de44119e92c8820b266f9f07287706c7d4eb505 Reviewed-on: https://review.coreboot.org/c/coreboot/+/54740 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/mainboard/google/guybrush/bootblock.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mainboard/google/guybrush/bootblock.c b/src/mainboard/google/guybrush/bootblock.c index 5b18d37cc6..46875ff43d 100644 --- a/src/mainboard/google/guybrush/bootblock.c +++ b/src/mainboard/google/guybrush/bootblock.c @@ -34,7 +34,11 @@ void bootblock_mainboard_early_init(void) dword = pm_read32(0x74); dword |= 3 << 10; pm_write32(0x74, dword); +} +void bootblock_mainboard_init(void) +{ + /* Put FPMCU check after EC initialization */ if (variant_has_fpmcu()) variant_fpmcu_reset(); }