diff options
| author | Eric Lai <ericr_lai@compal.corp-partner.google.com> | 2021-03-15 15:52:03 +0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-03-18 08:17:11 +0000 |
| commit | d807c806b39d26c24d51ae7542b6f9785070eb2c (patch) | |
| tree | b7d9aebc0a98d4c1c15321afac185a931f413a81 /src | |
| parent | a906918ae01ba1cb2fd876ef89e94a9b4fa9d6ec (diff) | |
mb/google/mancomb: Configure early GPIOs in earliest stage
Configure early GPIOs in verstage if it is run in PSP otherwise
configure them in bootblock.
BUG=b:182211161
TEST=builds
Signed-off-by: Eric Lai <ericr_lai@compal.corp-partner.google.com>
Change-Id: Ic1faeea59462319c1652c69034b4dde01669e13b
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51493
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Reviewed-by: Mathew King <mathewk@chromium.org>
Diffstat (limited to 'src')
5 files changed, 28 insertions, 10 deletions
diff --git a/src/mainboard/google/mancomb/bootblock.c b/src/mainboard/google/mancomb/bootblock.c index b57ab3c5bb..11391efd1e 100644 --- a/src/mainboard/google/mancomb/bootblock.c +++ b/src/mainboard/google/mancomb/bootblock.c @@ -7,6 +7,9 @@ void bootblock_mainboard_early_init(void) { size_t num_gpios; const struct soc_amd_gpio *gpios; - gpios = variant_bootblock_gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + + if (!CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)) { + gpios = variant_early_gpio_table(&num_gpios); + program_gpios(gpios, num_gpios); + } } diff --git a/src/mainboard/google/mancomb/variants/baseboard/Makefile.inc b/src/mainboard/google/mancomb/variants/baseboard/Makefile.inc index 9fb63f5f43..e8a05db2b7 100644 --- a/src/mainboard/google/mancomb/variants/baseboard/Makefile.inc +++ b/src/mainboard/google/mancomb/variants/baseboard/Makefile.inc @@ -1,3 +1,5 @@ bootblock-y += gpio.c ramstage-y += gpio.c + +verstage-y += gpio.c diff --git a/src/mainboard/google/mancomb/variants/baseboard/gpio.c b/src/mainboard/google/mancomb/variants/baseboard/gpio.c index 2d6bc7ae28..151c673027 100644 --- a/src/mainboard/google/mancomb/variants/baseboard/gpio.c +++ b/src/mainboard/google/mancomb/variants/baseboard/gpio.c @@ -163,9 +163,9 @@ static const struct soc_amd_gpio base_gpio_table[] = { PAD_NF(GPIO_148, I2C1_SDA, PULL_NONE), }; -/* Early GPIO configuration in bootblock */ -static const struct soc_amd_gpio bootblock_gpio_table[] = { - /* TODO: Fill bootblock gpio configuration */ +/* Early GPIO configuration */ +static const struct soc_amd_gpio early_gpio_table[] = { + /* TODO: Fill early gpio configuration */ }; const struct soc_amd_gpio *__weak variant_base_gpio_table(size_t *size) @@ -179,8 +179,8 @@ const struct soc_amd_gpio *__weak variant_override_gpio_table(size_t *size) return NULL; } -const struct soc_amd_gpio *__weak variant_bootblock_gpio_table(size_t *size) +const struct soc_amd_gpio *__weak variant_early_gpio_table(size_t *size) { - *size = ARRAY_SIZE(bootblock_gpio_table); - return bootblock_gpio_table; + *size = ARRAY_SIZE(early_gpio_table); + return early_gpio_table; } diff --git a/src/mainboard/google/mancomb/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/mancomb/variants/baseboard/include/baseboard/variants.h index 2946463f4b..677d4d7ac9 100644 --- a/src/mainboard/google/mancomb/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/mancomb/variants/baseboard/include/baseboard/variants.h @@ -18,7 +18,7 @@ const struct soc_amd_gpio *variant_base_gpio_table(size_t *size); */ const struct soc_amd_gpio *variant_override_gpio_table(size_t *size); -/* This function provides GPIO init in bootblock. */ -const struct soc_amd_gpio *variant_bootblock_gpio_table(size_t *size); +/* This function provides early GPIO init in bootblock or psp. */ +const struct soc_amd_gpio *variant_early_gpio_table(size_t *size); #endif /* __BASEBOARD_VARIANTS_H__ */ diff --git a/src/mainboard/google/mancomb/verstage.c b/src/mainboard/google/mancomb/verstage.c index ab079cad91..450681eb86 100644 --- a/src/mainboard/google/mancomb/verstage.c +++ b/src/mainboard/google/mancomb/verstage.c @@ -1,9 +1,22 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ +#include <amdblocks/gpio_banks.h> +#include <baseboard/variants.h> #include <security/vboot/vboot_common.h> +static void setup_gpio(void) +{ + const struct soc_amd_gpio *gpios; + size_t num_gpios; + if (CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)) { + gpios = variant_early_gpio_table(&num_gpios); + program_gpios(gpios, num_gpios); + } +} + void verstage_mainboard_early_init(void) { + setup_gpio(); } void verstage_mainboard_init(void) |