[coreboot-gerrit] Change in coreboot[master]: soc/amd: make configure_espi_with_mb_hook call conditional

[Felix Held (Code Review)]

Attention is currently required from: Jason Glenesk, Raul Rangel, Marshall Dawson.
Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/58339 )

Change subject: soc/amd: make configure_espi_with_mb_hook call conditional
......................................................................

soc/amd: make configure_espi_with_mb_hook call conditional

If a system doesn't use eSPI or has the eSPI interface already
configured in verstage on PSP, not calling configure_espi_with_mb_hook
from fch_pre_init makes it a bit more obvious that the eSPI interface
initialization will be skipped.

Signed-off-by: Felix Held 
Change-Id: Ia77b83d56a5dab1bac6cfbbd92d33aa60a9e8b89
---
M src/soc/amd/cezanne/early_fch.c
M src/soc/amd/common/block/include/amdblocks/espi.h
M src/soc/amd/picasso/early_fch.c
3 files changed, 13 insertions(+), 10 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/39/58339/1

diff --git a/src/soc/amd/cezanne/early_fch.c b/src/soc/amd/cezanne/early_fch.c
index f97f57c..f06d576 100644
--- a/src/soc/amd/cezanne/early_fch.c
+++ b/src/soc/amd/cezanne/early_fch.c
@@ -40,8 +40,12 @@
    enable_acpimmio_decode_pm04();
    /* Setup SPI base by calling lpc_early_init before setting up eSPI. */
    lpc_early_init();
-	/* Setup eSPI to enable port80 routing. */
-	configure_espi_with_mb_hook();
+
+	/* 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))
+		configure_espi_with_mb_hook();
+
    fch_spi_early_init();
    fch_smbus_init();
    fch_enable_cf9_io();
diff --git a/src/soc/amd/common/block/include/amdblocks/espi.h b/src/soc/amd/common/block/include/amdblocks/espi.h
index 0f8066b..e12b1b8 100644
--- a/src/soc/amd/common/block/include/amdblocks/espi.h
+++ b/src/soc/amd/common/block/include/amdblocks/espi.h
@@ -134,12 +134,8 @@
 /* Setup eSPI with any mainboard specific initialization. */
 static inline void configure_espi_with_mb_hook(void)
 {
-	/* If eSPI is setup in PSP Verstage, continue with that. Else setup eSPI to perform
-	   port80h routing as early as possible. */
-	if (!CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK) && CONFIG(SOC_AMD_COMMON_BLOCK_USE_ESPI)) {
-		mb_set_up_early_espi();
-		espi_setup();
-	}
+	mb_set_up_early_espi();
+	espi_setup();
 }

#endif /* AMD_BLOCK_ESPI_H */
diff --git a/src/soc/amd/picasso/early_fch.c b/src/soc/amd/picasso/early_fch.c
index 83b4ae4..2a1b5c9 100644
--- a/src/soc/amd/picasso/early_fch.c
+++ b/src/soc/amd/picasso/early_fch.c
@@ -47,8 +47,11 @@
    enable_acpimmio_decode_pm04();
    /* Setup SPI base by calling lpc_early_init before setting up eSPI. */
    lpc_early_init();
-	/* Setup eSPI to enable port80 routing. */
-	configure_espi_with_mb_hook();
+
+	/* 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))
+		configure_espi_with_mb_hook();

if (!CONFIG(SOC_AMD_COMMON_BLOCK_USE_ESPI))
    	lpc_configure_decodes();