From 64d0ad347b5c9c698547f0ff15779e88a10014f4 Mon Sep 17 00:00:00 2001 From: Zheng Bao Date: Mon, 21 Dec 2020 13:56:22 +0800 Subject: soc/amd: Add an option to select if SOC supports ESPI sub decode Cezanne doesn't have eSPIx00034 register define in PPR. Currently only Picasso need this option. Change-Id: Icb8e8a1a59393849395125108bfaa884839ce10f Signed-off-by: Zheng Bao Reviewed-on: https://review.coreboot.org/c/coreboot/+/48842 Tested-by: build bot (Jenkins) Reviewed-by: Felix Held --- src/soc/amd/common/block/lpc/Kconfig | 5 +++++ src/soc/amd/common/block/lpc/espi_util.c | 3 ++- src/soc/amd/picasso/Kconfig | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/soc/amd/common/block/lpc/Kconfig b/src/soc/amd/common/block/lpc/Kconfig index 1ec8dd4668..3aaccf344d 100644 --- a/src/soc/amd/common/block/lpc/Kconfig +++ b/src/soc/amd/common/block/lpc/Kconfig @@ -24,3 +24,8 @@ config SOC_AMD_COMMON_BLOCK_USE_ESPI help Select this option if mainboard uses eSPI instead of LPC (if supported by platform). + +config SOC_AMD_COMMON_BLOCK_HAS_ESPI_SUB_DECODE + bool + depends on SOC_AMD_COMMON_BLOCK_HAS_ESPI + default n diff --git a/src/soc/amd/common/block/lpc/espi_util.c b/src/soc/amd/common/block/lpc/espi_util.c index 0878fb7663..7ee53862dc 100644 --- a/src/soc/amd/common/block/lpc/espi_util.c +++ b/src/soc/amd/common/block/lpc/espi_util.c @@ -916,7 +916,8 @@ int espi_setup(void) } /* Enable subtractive decode if configured */ - espi_setup_subtractive_decode(cfg); + if (CONFIG(SOC_AMD_COMMON_BLOCK_HAS_ESPI_SUB_DECODE)) + espi_setup_subtractive_decode(cfg); return 0; } diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig index da3903bfbd..93d2ef80c4 100644 --- a/src/soc/amd/picasso/Kconfig +++ b/src/soc/amd/picasso/Kconfig @@ -29,6 +29,7 @@ config CPU_SPECIFIC_OPTIONS select SOC_AMD_COMMON select SOC_AMD_COMMON_BLOCK_NONCAR select SOC_AMD_COMMON_BLOCK_HAS_ESPI + select SOC_AMD_COMMON_BLOCK_HAS_ESPI_SUB_DECODE select SOC_AMD_COMMON_BLOCK_IOMMU select SOC_AMD_COMMON_BLOCK_ACPIMMIO select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS -- cgit v1.2.3