GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/amd/common: Allow runtime mapping of ACPIMMIO banks 

Future implementation of verstage running on PSP will have access
to some of the ACPIMMIO banks, but banks will be mapped runtime
at non-deterministic addresses. Provide preprocessor helpers to
accomplish this.

Change-Id: I8d50de60bb1ea1b3a521ab535a5637c4de8c3559
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42073
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Kyösti Mälkki 2020-06-04 13:36:53 +03:00 committed by Patrick Georgi
parent 5b672d5954
commit be1ff7eb72
3 changed files with 67 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/soc/amd/common/block/acpimmio/mmio_util.c
View File

@ -5,28 +5,40 @@
#include <amdblocks/acpimmio_map.h> #include <amdblocks/acpimmio_map.h>
#include <amdblocks/acpimmio.h> #include <amdblocks/acpimmio.h>
uint8_t *const acpimmio_sm_pci = ACPIMMIO_BASE(SM_PCI); #define ACPI_BANK_PTR(bank) \
uint8_t *const acpimmio_gpio_100 = ACPIMMIO_BASE(GPIO_100); (void *)(uintptr_t)(AMD_SB_ACPI_MMIO_ADDR + ACPIMMIO_ ## bank ## _BANK)
uint8_t *const acpimmio_smi = ACPIMMIO_BASE(SMI);
uint8_t *const acpimmio_pmio = ACPIMMIO_BASE(PMIO); #if CONSTANT_ACPIMMIO_BASE_ADDRESS
uint8_t *const acpimmio_pmio2 = ACPIMMIO_BASE(PMIO2); #define DECLARE_ACPIMMIO(ptr, bank) \
uint8_t *const acpimmio_biosram = ACPIMMIO_BASE(BIOSRAM); uint8_t *const ptr = ACPI_BANK_PTR(bank)
uint8_t *const acpimmio_cmosram = ACPIMMIO_BASE(CMOSRAM); #else
uint8_t *const acpimmio_cmos = ACPIMMIO_BASE(CMOS); #define DECLARE_ACPIMMIO(ptr, bank) uint8_t *ptr
uint8_t *const acpimmio_acpi = ACPIMMIO_BASE(ACPI); #endif
uint8_t *const acpimmio_asf = ACPIMMIO_BASE(ASF);
uint8_t *const acpimmio_smbus = ACPIMMIO_BASE(SMBUS); DECLARE_ACPIMMIO(acpimmio_sm_pci, SM_PCI);
uint8_t *const acpimmio_wdt = ACPIMMIO_BASE(WDT); DECLARE_ACPIMMIO(acpimmio_gpio_100, GPIO_100);
uint8_t *const acpimmio_hpet = ACPIMMIO_BASE(HPET); DECLARE_ACPIMMIO(acpimmio_smi, SMI);
uint8_t *const acpimmio_iomux = ACPIMMIO_BASE(IOMUX); DECLARE_ACPIMMIO(acpimmio_pmio, PMIO);
uint8_t *const acpimmio_misc = ACPIMMIO_BASE(MISC); DECLARE_ACPIMMIO(acpimmio_pmio2, PMIO2);
uint8_t *const acpimmio_dpvga = ACPIMMIO_BASE(DPVGA); DECLARE_ACPIMMIO(acpimmio_biosram, BIOSRAM);
uint8_t *const acpimmio_gpio0 = ACPIMMIO_BASE(GPIO0); DECLARE_ACPIMMIO(acpimmio_cmosram, CMOSRAM);
uint8_t *const acpimmio_gpio1 = ACPIMMIO_BASE(GPIO1); DECLARE_ACPIMMIO(acpimmio_cmos, CMOS);
uint8_t *const acpimmio_gpio2 = ACPIMMIO_BASE(GPIO2); DECLARE_ACPIMMIO(acpimmio_acpi, ACPI);
uint8_t *const acpimmio_xhci_pm = ACPIMMIO_BASE(XHCIPM); DECLARE_ACPIMMIO(acpimmio_asf, ASF);
uint8_t *const acpimmio_acdc_tmr = ACPIMMIO_BASE(ACDCTMR); DECLARE_ACPIMMIO(acpimmio_smbus, SMBUS);
uint8_t *const acpimmio_aoac = ACPIMMIO_BASE(AOAC); DECLARE_ACPIMMIO(acpimmio_wdt, WDT);
DECLARE_ACPIMMIO(acpimmio_hpet, HPET);
DECLARE_ACPIMMIO(acpimmio_iomux, IOMUX);
DECLARE_ACPIMMIO(acpimmio_misc, MISC);
DECLARE_ACPIMMIO(acpimmio_dpvga, DPVGA);
DECLARE_ACPIMMIO(acpimmio_gpio0, GPIO0);
DECLARE_ACPIMMIO(acpimmio_gpio1, GPIO1);
DECLARE_ACPIMMIO(acpimmio_gpio2, GPIO2);
DECLARE_ACPIMMIO(acpimmio_xhci_pm, XHCIPM);
DECLARE_ACPIMMIO(acpimmio_acdc_tmr, ACDCTMR);
DECLARE_ACPIMMIO(acpimmio_aoac, AOAC);
#undef DECLARE_ACPIMMIO
void enable_acpimmio_decode_pm24(void) void enable_acpimmio_decode_pm24(void)
{ {

55
src/soc/amd/common/block/include/amdblocks/acpimmio.h
View File

@ -23,28 +23,39 @@
#define PM_04_BIOSRAM_DECODE_EN BIT(0) #define PM_04_BIOSRAM_DECODE_EN BIT(0)
#define PM_04_ACPIMMIO_DECODE_EN BIT(1) #define PM_04_ACPIMMIO_DECODE_EN BIT(1)
extern uint8_t *const acpimmio_gpio_100; /* For x86 base is constant, while PSP does mapping runtime. */
extern uint8_t *const acpimmio_sm_pci; #define CONSTANT_ACPIMMIO_BASE_ADDRESS ENV_X86
extern uint8_t *const acpimmio_smi;
extern uint8_t *const acpimmio_pmio; #if CONSTANT_ACPIMMIO_BASE_ADDRESS
extern uint8_t *const acpimmio_pmio2; #define MAYBE_CONST const
extern uint8_t *const acpimmio_biosram; #else
extern uint8_t *const acpimmio_cmosram; #define MAYBE_CONST
extern uint8_t *const acpimmio_cmos; #endif
extern uint8_t *const acpimmio_acpi;
extern uint8_t *const acpimmio_asf; extern uint8_t *MAYBE_CONST acpimmio_gpio_100;
extern uint8_t *const acpimmio_smbus; extern uint8_t *MAYBE_CONST acpimmio_sm_pci;
extern uint8_t *const acpimmio_wdt; extern uint8_t *MAYBE_CONST acpimmio_smi;
extern uint8_t *const acpimmio_hpet; extern uint8_t *MAYBE_CONST acpimmio_pmio;
extern uint8_t *const acpimmio_iomux; extern uint8_t *MAYBE_CONST acpimmio_pmio2;
extern uint8_t *const acpimmio_misc; extern uint8_t *MAYBE_CONST acpimmio_biosram;
extern uint8_t *const acpimmio_dpvga; extern uint8_t *MAYBE_CONST acpimmio_cmosram;
extern uint8_t *const acpimmio_gpio0; extern uint8_t *MAYBE_CONST acpimmio_cmos;
extern uint8_t *const acpimmio_gpio1; extern uint8_t *MAYBE_CONST acpimmio_acpi;
extern uint8_t *const acpimmio_gpio2; extern uint8_t *MAYBE_CONST acpimmio_asf;
extern uint8_t *const acpimmio_xhci_pm; extern uint8_t *MAYBE_CONST acpimmio_smbus;
extern uint8_t *const acpimmio_acdc_tmr; extern uint8_t *MAYBE_CONST acpimmio_wdt;
extern uint8_t *const acpimmio_aoac; extern uint8_t *MAYBE_CONST acpimmio_hpet;
extern uint8_t *MAYBE_CONST acpimmio_iomux;
extern uint8_t *MAYBE_CONST acpimmio_misc;
extern uint8_t *MAYBE_CONST acpimmio_dpvga;
extern uint8_t *MAYBE_CONST acpimmio_gpio0;
extern uint8_t *MAYBE_CONST acpimmio_gpio1;
extern uint8_t *MAYBE_CONST acpimmio_gpio2;
extern uint8_t *MAYBE_CONST acpimmio_xhci_pm;
extern uint8_t *MAYBE_CONST acpimmio_acdc_tmr;
extern uint8_t *MAYBE_CONST acpimmio_aoac;
#undef MAYBE_CONST
/* For older discrete FCHs */ /* For older discrete FCHs */
void enable_acpimmio_decode_pm24(void); void enable_acpimmio_decode_pm24(void);

3
src/soc/amd/common/block/include/amdblocks/acpimmio_map.h
View File

@ -126,9 +126,6 @@
#define ACPIMMIO_ACDCTMR_BANK 0x1d00 #define ACPIMMIO_ACDCTMR_BANK 0x1d00
#define ACPIMMIO_AOAC_BANK 0x1e00 #define ACPIMMIO_AOAC_BANK 0x1e00
#define ACPIMMIO_BASE(x) \
(void *)(AMD_SB_ACPI_MMIO_ADDR + ACPIMMIO_ ## x ## _BANK)
/* FIXME: Passing host base for SMBUS is not long-term solution. */ /* FIXME: Passing host base for SMBUS is not long-term solution. */
#define ACPIMMIO_ASF_BASE (AMD_SB_ACPI_MMIO_ADDR + ACPIMMIO_ASF_BANK) #define ACPIMMIO_ASF_BASE (AMD_SB_ACPI_MMIO_ADDR + ACPIMMIO_ASF_BANK)
#define ACPIMMIO_SMBUS_BASE (AMD_SB_ACPI_MMIO_ADDR + ACPIMMIO_SMBUS_BANK) #define ACPIMMIO_SMBUS_BASE (AMD_SB_ACPI_MMIO_ADDR + ACPIMMIO_SMBUS_BANK)