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

mb/google/zork: Prepare variants for v3 schematics 

This change updates variant_romstage_gpio_table() and
variant_wifi_romstage_gpio_table() to support v3 version of schematics
for dalboz and trembyle reference designs. gpio_set_stage_rom and
gpio_set_wifi are divided into two groups:
a) Pre-v3 (GPIO table for pre v3 schematics):
 * gpio_set_stage_rom_pre_v3
 * gpio_set_wifi_pre_v3
b) v3 (GPIO table for v3+ schematics):
 * gpio_set_stage_v3
 * gpio_set_wifi_v3

Currently, both _v3 is a copy of _pre_v3, but will be updated in
follow-up CLs to make it easier to identify what changed from _pre_v3
to _v3.

BUG=b:157088093, b:154676993, b:157098434, b:157165628, b:157744136, b:157743835
TEST=Compiles

Signed-off-by: Furquan Shaikh <furquan@google.com>
Change-Id: I444875d93100c2f2abdb6dec4312861fd89d9b78
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2251390
Commit-Queue: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Aaron Durbin <adurbin@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42721
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Furquan Shaikh 2020-06-18 01:00:38 -07:00
parent 624c1ca04e
commit 996fdc0057
3 changed files with 135 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mainboard/google/zork/Kconfig
View File

@ -137,4 +137,13 @@ config VARIANT_BOARD_VER_FW_CONFIG_VALID
help help
Which board version did FW_CONFIG become valid in CBI. Which board version did FW_CONFIG become valid in CBI.
config VARIANT_MIN_BOARD_ID_V3_SCHEMATICS
int
default 4 if BOARD_GOOGLE_TREMBYLE
default 3 if BOARD_GOOGLE_EZKINIL
default 3 if BOARD_GOOGLE_MORPHIUS
default 2 if BOARD_GOOGLE_BERKNIP
default 3 if BOARD_GOOGLE_DALBOZ
default 2 if BOARD_GOOGLE_VILBOZ
endif # BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ endif # BOARD_GOOGLE_BASEBOARD_TREMBYLE || BOARD_GOOGLE_BASEBOARD_DALBOZ

70
src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
View File

@ -7,7 +7,7 @@
#include <boardid.h> #include <boardid.h>
#include <variant/gpio.h> #include <variant/gpio.h>
static const struct soc_amd_gpio gpio_set_stage_rom[] = { static const struct soc_amd_gpio gpio_set_stage_rom_pre_v3[] = {
/* PEN_POWER_EN - reset */ /* PEN_POWER_EN - reset */
PAD_GPO(GPIO_5, LOW), PAD_GPO(GPIO_5, LOW),
/* EC_FCH_WAKE_L */ /* EC_FCH_WAKE_L */
@ -44,7 +44,49 @@ static const struct soc_amd_gpio gpio_set_stage_rom[] = {
PAD_GPO(GPIO_142, HIGH), PAD_GPO(GPIO_142, HIGH),
}; };
static const struct soc_amd_gpio gpio_set_wifi[] = { static const struct soc_amd_gpio gpio_set_wifi_pre_v3[] = {
/* EN_PWR_WIFI */
PAD_GPO(GPIO_29, HIGH),
};
static const struct soc_amd_gpio gpio_set_stage_rom_v3[] = {
/* PEN_POWER_EN - reset */
PAD_GPO(GPIO_5, LOW),
/* EC_FCH_WAKE_L */
PAD_GPI(GPIO_24, PULL_UP),
PAD_WAKE(GPIO_24, PULL_UP, EDGE_LOW, S3_S4_S5),
/* PCIE_RST0_L - Fixed timings */
/* TODO: Make sure this gets locked at end of post */
PAD_NF(GPIO_26, PCIE_RST_L, PULL_NONE),
/* PCIE_RST1_L - Variable timings (May remove) */
PAD_NF(GPIO_27, PCIE_RST1_L, PULL_NONE),
/* NVME_AUX_RESET_L */
PAD_GPO(GPIO_40, HIGH),
/* WIFI_AUX_RESET_L */
PAD_GPO(GPIO_42, HIGH),
/* EN_PWR_TOUCHPAD_PS2 - reset */
PAD_GPO(GPIO_67, LOW),
/* EMMC_RESET - reset (default stuffing unused)*/
PAD_GPO(GPIO_68, HIGH),
/* EN_PWR_CAMERA - reset */
PAD_GPO(GPIO_76, LOW),
/* CLK_REQ0_L - WIFI */
PAD_NF(GPIO_92, CLK_REQ0_L, PULL_UP),
/* CLK_REQ1_L - SD Card */
PAD_NF(GPIO_115, CLK_REQ1_L, PULL_UP),
/* CLK_REQ2_L - NVMe */
PAD_NF(GPIO_116, CLK_REQ2_L, PULL_UP),
/* BIOS_FLASH_WP_ODL */
PAD_GPI(GPIO_137, PULL_NONE),
/* USI_RESET - reset */
PAD_GPO(GPIO_140, HIGH),
/* USB_HUB_RST_L - reset*/
PAD_GPO(GPIO_141, LOW),
/* SD_AUX_RESET_L */
PAD_GPO(GPIO_142, HIGH),
};
static const struct soc_amd_gpio gpio_set_wifi_v3[] = {
/* EN_PWR_WIFI */ /* EN_PWR_WIFI */
PAD_GPO(GPIO_29, HIGH), PAD_GPO(GPIO_29, HIGH),
}; };
@ -164,15 +206,31 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
const __weak const __weak
struct soc_amd_gpio *variant_romstage_gpio_table(size_t *size) struct soc_amd_gpio *variant_romstage_gpio_table(size_t *size)
{ {
*size = ARRAY_SIZE(gpio_set_stage_rom); uint32_t board_version;
return gpio_set_stage_rom;
if (!google_chromeec_cbi_get_board_version(&board_version) &&
(board_version >= CONFIG_VARIANT_MIN_BOARD_ID_V3_SCHEMATICS)) {
*size = ARRAY_SIZE(gpio_set_stage_rom_v3);
return gpio_set_stage_rom_v3;
}
*size = ARRAY_SIZE(gpio_set_stage_rom_pre_v3);
return gpio_set_stage_rom_pre_v3;
} }
const __weak const __weak
struct soc_amd_gpio *variant_wifi_romstage_gpio_table(size_t *size) struct soc_amd_gpio *variant_wifi_romstage_gpio_table(size_t *size)
{ {
*size = ARRAY_SIZE(gpio_set_wifi); uint32_t board_version;
return gpio_set_wifi;
if (!google_chromeec_cbi_get_board_version(&board_version) &&
(board_version >= CONFIG_VARIANT_MIN_BOARD_ID_V3_SCHEMATICS)) {
*size = ARRAY_SIZE(gpio_set_wifi_v3);
return gpio_set_wifi_v3;
}
*size = ARRAY_SIZE(gpio_set_wifi_pre_v3);
return gpio_set_wifi_pre_v3;
} }
const __weak const __weak

68
src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
View File

@ -7,7 +7,7 @@
#include <boardid.h> #include <boardid.h>
#include <variant/gpio.h> #include <variant/gpio.h>
static const struct soc_amd_gpio gpio_set_stage_rom[] = { static const struct soc_amd_gpio gpio_set_stage_rom_pre_v3[] = {
/* PEN_POWER_EN - reset */ /* PEN_POWER_EN - reset */
PAD_GPO(GPIO_5, LOW), PAD_GPO(GPIO_5, LOW),
/* EC_FCH_WAKE_L */ /* EC_FCH_WAKE_L */
@ -42,7 +42,47 @@ static const struct soc_amd_gpio gpio_set_stage_rom[] = {
PAD_GPO(GPIO_142, HIGH), PAD_GPO(GPIO_142, HIGH),
}; };
static const struct soc_amd_gpio gpio_set_wifi[] = { static const struct soc_amd_gpio gpio_set_wifi_pre_v3[] = {
/* EN_PWR_WIFI */
PAD_GPO(GPIO_29, HIGH),
};
static const struct soc_amd_gpio gpio_set_stage_rom_v3[] = {
/* PEN_POWER_EN - reset */
PAD_GPO(GPIO_5, LOW),
/* EC_FCH_WAKE_L */
PAD_GPI(GPIO_24, PULL_UP),
PAD_WAKE(GPIO_24, PULL_UP, EDGE_LOW, S3_S4_S5),
/* PCIE_RST0_L - Fixed timings */
/* TODO: Make sure this gets locked at end of post */
PAD_NF(GPIO_26, PCIE_RST_L, PULL_NONE),
/* PCIE_RST1_L - Variable timings (May remove) */
PAD_NF(GPIO_27, PCIE_RST1_L, PULL_NONE),
/* NVME_AUX_RESET_L */
PAD_GPO(GPIO_40, HIGH),
/* WIFI_AUX_RESET_L */
PAD_GPO(GPIO_42, HIGH),
/* EN_PWR_TOUCHPAD_PS2 - reset */
PAD_GPO(GPIO_67, LOW),
/* EMMC_RESET - reset (default stuffing unused)*/
PAD_GPO(GPIO_68, HIGH),
/* EN_PWR_CAMERA - reset */
PAD_GPO(GPIO_76, LOW),
/* CLK_REQ0_L - WIFI */
PAD_NF(GPIO_92, CLK_REQ0_L, PULL_UP),
/* CLK_REQ1_L - SD Card */
PAD_NF(GPIO_115, CLK_REQ1_L, PULL_UP),
/* CLK_REQ4_L - SSD */
PAD_NF(GPIO_132, CLK_REQ4_L, PULL_UP),
/* BIOS_FLASH_WP_ODL */
PAD_GPI(GPIO_137, PULL_NONE),
/* USI_RESET - reset */
PAD_GPO(GPIO_140, HIGH),
/* SD_AUX_RESET_L */
PAD_GPO(GPIO_142, HIGH),
};
static const struct soc_amd_gpio gpio_set_wifi_v3[] = {
/* EN_PWR_WIFI */ /* EN_PWR_WIFI */
PAD_GPO(GPIO_29, HIGH), PAD_GPO(GPIO_29, HIGH),
}; };
@ -163,15 +203,31 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
const __weak const __weak
struct soc_amd_gpio *variant_romstage_gpio_table(size_t *size) struct soc_amd_gpio *variant_romstage_gpio_table(size_t *size)
{ {
*size = ARRAY_SIZE(gpio_set_stage_rom); uint32_t board_version;
return gpio_set_stage_rom;
if (!google_chromeec_cbi_get_board_version(&board_version) &&
(board_version >= CONFIG_VARIANT_MIN_BOARD_ID_V3_SCHEMATICS)) {
*size = ARRAY_SIZE(gpio_set_stage_rom_v3);
return gpio_set_stage_rom_v3;
}
*size = ARRAY_SIZE(gpio_set_stage_rom_pre_v3);
return gpio_set_stage_rom_pre_v3;
} }
const __weak const __weak
struct soc_amd_gpio *variant_wifi_romstage_gpio_table(size_t *size) struct soc_amd_gpio *variant_wifi_romstage_gpio_table(size_t *size)
{ {
*size = ARRAY_SIZE(gpio_set_wifi); uint32_t board_version;
return gpio_set_wifi;
if (!google_chromeec_cbi_get_board_version(&board_version) &&
(board_version >= CONFIG_VARIANT_MIN_BOARD_ID_V3_SCHEMATICS)) {
*size = ARRAY_SIZE(gpio_set_wifi_v3);
return gpio_set_wifi_v3;
}
*size = ARRAY_SIZE(gpio_set_wifi_pre_v3);
return gpio_set_wifi_pre_v3;
} }
const __weak const __weak