diff options
| author | Martin Roth <martinroth@chromium.org> | 2020-07-14 11:08:55 -0600 |
|---|---|---|
| committer | Aaron Durbin <adurbin@chromium.org> | 2020-07-16 22:20:53 +0000 |
| commit | b39e10dbaa4024560b5faa90ad8ef14135d51d69 (patch) | |
| tree | eacd8df9c390ae0f8b9a827c7c9a720a0eb555d6 /src | |
| parent | 37d1206c6ebd80c14f350d5eddfc1b17b6d9a705 (diff) | |
soc/amd/common: Don't get eSPI address from PCI if not on x86
Exclude lpc_get_spibase() on the PSP. This also simplifies the
espi_get_bar() function.
BUG=b:159811539
TEST=Build & boot trembyle; Verify address in PSP & x86
Signed-off-by: Martin Roth <martinroth@chromium.org>
Change-Id: I5927dd40610860b54bb35a7e5b03ddb731597745
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43468
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/soc/amd/common/block/lpc/espi_util.c | 10 | ||||
| -rw-r--r-- | src/soc/amd/picasso/include/soc/iomap.h | 1 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/soc/amd/common/block/lpc/espi_util.c b/src/soc/amd/common/block/lpc/espi_util.c index 3750a8b7f9..29028a4b72 100644 --- a/src/soc/amd/common/block/lpc/espi_util.c +++ b/src/soc/amd/common/block/lpc/espi_util.c @@ -19,14 +19,8 @@ void espi_update_static_bar(uintptr_t bar) static uintptr_t espi_get_bar(void) { - uintptr_t espi_spi_base; - - if (espi_bar) - return espi_bar; - - espi_spi_base = lpc_get_spibase(); - espi_update_static_bar(espi_spi_base + ESPI_OFFSET_FROM_BAR); - + if (ENV_X86 && !espi_bar) + espi_update_static_bar(lpc_get_spibase() + ESPI_OFFSET_FROM_BAR); return espi_bar; } diff --git a/src/soc/amd/picasso/include/soc/iomap.h b/src/soc/amd/picasso/include/soc/iomap.h index 295aa53089..cb845c44d3 100644 --- a/src/soc/amd/picasso/include/soc/iomap.h +++ b/src/soc/amd/picasso/include/soc/iomap.h @@ -6,7 +6,6 @@ /* MMIO Ranges */ /* IO_APIC_ADDR defined in arch/x86 0xfec00000 */ #define SPI_BASE_ADDRESS 0xfec10000 -#define ESPI_BASE_ADDRESS 0xfec20000 #if CONFIG(HPET_ADDRESS_OVERRIDE) #error HPET address override is not allowed and must be fixed at 0xfed00000 |