diff options
8 files changed, 123 insertions, 134 deletions
diff --git a/src/mainboard/google/zork/romstage.c b/src/mainboard/google/zork/romstage.c index 0e3b2da3c351..9d7b850ae62d 100644 --- a/src/mainboard/google/zork/romstage.c +++ b/src/mainboard/google/zork/romstage.c @@ -20,8 +20,7 @@ void mainboard_romstage_entry_s3(int s3_resume) gpios = variant_romstage_gpio_table(&num_gpios); program_gpios(gpios, num_gpios); - gpios = variant_wifi_romstage_gpio_table(&num_gpios); - program_gpios(gpios, num_gpios); + variant_pcie_power_reset_configure(); mainboard_ec_init(); diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c index 50c842b25262..35e1829f892c 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include <baseboard/variants.h> +#include <delay.h> +#include <gpio.h> #include <soc/gpio.h> #include <soc/smi.h> #include <stdlib.h> @@ -20,8 +22,6 @@ static const struct soc_amd_gpio gpio_set_stage_rom_pre_v3[] = { 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)*/ @@ -44,11 +44,6 @@ static const struct soc_amd_gpio gpio_set_stage_rom_pre_v3[] = { PAD_GPO(GPIO_142, HIGH), }; -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), @@ -62,8 +57,6 @@ static const struct soc_amd_gpio gpio_set_stage_rom_v3[] = { 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), - /* WIFI_AUX_RESET */ - PAD_GPO(GPIO_29, LOW), /* NVME_AUX_RESET_L */ PAD_GPO(GPIO_40, HIGH), /* EMMC_RESET - reset (default stuffing unused)*/ @@ -86,11 +79,6 @@ static const struct soc_amd_gpio gpio_set_stage_rom_v3[] = { PAD_GPO(GPIO_142, HIGH), }; -static const struct soc_amd_gpio gpio_set_wifi_v3[] = { - /* EN_PWR_WIFI */ - PAD_GPO(GPIO_42, HIGH), -}; - static const struct soc_amd_gpio gpio_set_stage_ram[] = { /* PWR_BTN_L */ @@ -219,21 +207,6 @@ struct soc_amd_gpio *variant_romstage_gpio_table(size_t *size) } const __weak -struct soc_amd_gpio *variant_wifi_romstage_gpio_table(size_t *size) -{ - uint32_t board_version; - - 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 struct soc_amd_gpio *variant_base_gpio_table(size_t *size) { *size = ARRAY_SIZE(gpio_set_stage_ram); @@ -251,3 +224,61 @@ const __weak struct sci_source *get_gpe_table(size_t *num) { return NULL; } + +static void wifi_power_reset_configure_v3(void) +{ + /* + * Configure WiFi GPIOs such that: + * - WIFI_AUX_RESET is configured first to assert PERST# to WiFi device. + * - Enable power to WiFi using EN_PWR_WIFI. + * - Wait for 50ms after power to WiFi is enabled. + * - Deassert PERST# to WiFi device by driving WIFI_AUX_RESET low. + */ + static const struct soc_amd_gpio v3_wifi_table[] = { + /* WIFI_AUX_RESET */ + PAD_GPO(GPIO_29, HIGH), + /* EN_PWR_WIFI */ + PAD_GPO(GPIO_42, HIGH), + }; + program_gpios(v3_wifi_table, ARRAY_SIZE(v3_wifi_table)); + + mdelay(50); + gpio_set(GPIO_29, 0); +} + +static void wifi_power_reset_configure_pre_v3(void) +{ + /* + * Configure WiFi GPIOs such that: + * - WIFI_AUX_RESET_L is configured first to assert PERST# to WiFi device. + * - Disable power to WiFi since GPIO_29 goes high on PWRGOOD but has a glitch on RESET# + * deassertion causing WiFi to enter a bad state. + * - Wait 10ms for WiFi power to go low. + * - Enable power to WiFi using EN_PWR_WIFI. + * - Wait for 50ms after power to WiFi is enabled. + * - Deassert WIFI_AUX_RESET_L. + */ + static const struct soc_amd_gpio pre_v3_wifi_table[] = { + /* WIFI_AUX_RESET_L */ + PAD_GPO(GPIO_42, LOW), + /* EN_PWR_WIFI */ + PAD_GPO(GPIO_29, LOW), + }; + program_gpios(pre_v3_wifi_table, ARRAY_SIZE(pre_v3_wifi_table)); + + mdelay(10); + gpio_set(GPIO_29, 1); + mdelay(50); + gpio_set(GPIO_42, 1); +} + +__weak void variant_pcie_power_reset_configure(void) +{ + uint32_t board_version; + + if (!google_chromeec_cbi_get_board_version(&board_version) && + (board_version >= CONFIG_VARIANT_MIN_BOARD_ID_V3_SCHEMATICS)) + wifi_power_reset_configure_v3(); + else + wifi_power_reset_configure_pre_v3(); +} diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c index d3f7ae3454c4..3f02f00e257c 100644 --- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c +++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0-or-later */ #include <baseboard/variants.h> +#include <delay.h> +#include <gpio.h> #include <soc/gpio.h> #include <soc/smi.h> #include <stdlib.h> @@ -20,8 +22,6 @@ static const struct soc_amd_gpio gpio_set_stage_rom_pre_v3[] = { 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)*/ @@ -42,11 +42,6 @@ static const struct soc_amd_gpio gpio_set_stage_rom_pre_v3[] = { PAD_GPO(GPIO_142, HIGH), }; -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), @@ -66,8 +61,6 @@ static const struct soc_amd_gpio gpio_set_stage_rom_v3[] = { PAD_GPO(GPIO_68, HIGH), /* EN_PWR_CAMERA - reset */ PAD_GPO(GPIO_76, LOW), - /* WIFI_AUX_RESET_L */ - PAD_GPO(GPIO_86, HIGH), /* CLK_REQ0_L - WIFI */ PAD_NF(GPIO_92, CLK_REQ0_L, PULL_UP), /* CLK_REQ1_L - SD Card */ @@ -82,11 +75,6 @@ static const struct soc_amd_gpio gpio_set_stage_rom_v3[] = { PAD_GPO(GPIO_142, HIGH), }; -static const struct soc_amd_gpio gpio_set_wifi_v3[] = { - /* EN_PWR_WIFI */ - PAD_GPO(GPIO_42, HIGH), -}; - static const struct soc_amd_gpio gpio_set_stage_ram[] = { /* PWR_BTN_L */ @@ -214,21 +202,6 @@ struct soc_amd_gpio *variant_romstage_gpio_table(size_t *size) } const __weak -struct soc_amd_gpio *variant_wifi_romstage_gpio_table(size_t *size) -{ - uint32_t board_version; - - 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 struct soc_amd_gpio *variant_base_gpio_table(size_t *size) { *size = ARRAY_SIZE(gpio_set_stage_ram); @@ -246,3 +219,61 @@ const __weak struct sci_source *get_gpe_table(size_t *num) { return NULL; } + +static void wifi_power_reset_configure_v3(void) +{ + /* + * Configure WiFi GPIOs such that: + * - WIFI_AUX_RESET_L is configured first to assert PERST# to WiFi device. + * - Enable power to WiFi using EN_PWR_WIFI. + * - Wait for 50ms after power to WiFi is enabled. + * - Deassert WIFI_AUX_RESET_L. + */ + static const struct soc_amd_gpio v3_wifi_table[] = { + /* WIFI_AUX_RESET_L */ + PAD_GPO(GPIO_86, LOW), + /* EN_PWR_WIFI */ + PAD_GPO(GPIO_42, HIGH), + }; + program_gpios(v3_wifi_table, ARRAY_SIZE(v3_wifi_table)); + + mdelay(50); + gpio_set(GPIO_86, 1); +} + +static void wifi_power_reset_configure_pre_v3(void) +{ + /* + * Configure WiFi GPIOs such that: + * - WIFI_AUX_RESET_L is configured first to assert PERST# to WiFi device. + * - Disable power to WiFi since GPIO_29 goes high on PWRGOOD but has a glitch on RESET# + * deassertion causing WiFi to enter a bad state. + * - Wait 10ms for WiFi power to go low. + * - Enable power to WiFi using EN_PWR_WIFI. + * - Wait for 50ms after power to WiFi is enabled. + * - Deassert WIFI_AUX_RESET_L. + */ + static const struct soc_amd_gpio pre_v3_wifi_table[] = { + /* WIFI_AUX_RESET_L */ + PAD_GPO(GPIO_42, LOW), + /* EN_PWR_WIFI */ + PAD_GPO(GPIO_29, LOW), + }; + program_gpios(pre_v3_wifi_table, ARRAY_SIZE(pre_v3_wifi_table)); + + mdelay(10); + gpio_set(GPIO_29, 1); + mdelay(50); + gpio_set(GPIO_42, 1); +} + +__weak void variant_pcie_power_reset_configure(void) +{ + uint32_t board_version; + + if (!google_chromeec_cbi_get_board_version(&board_version) && + (board_version >= CONFIG_VARIANT_MIN_BOARD_ID_V3_SCHEMATICS)) + wifi_power_reset_configure_v3(); + else + wifi_power_reset_configure_pre_v3(); +} diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h index 84a9e9c3d060..4f8f225ad119 100644 --- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h @@ -13,7 +13,6 @@ const struct sci_source *get_gpe_table(size_t *num); const struct soc_amd_gpio *variant_early_gpio_table(size_t *size); const struct soc_amd_gpio *variant_romstage_gpio_table(size_t *size); -const struct soc_amd_gpio *variant_wifi_romstage_gpio_table(size_t *size); /* * This function provides base GPIO configuration table. It is typically provided by * baseboard using a weak implementation. If GPIO configuration for a variant differs @@ -29,6 +28,8 @@ const struct soc_amd_gpio *variant_override_gpio_table(size_t *size); void variant_romstage_entry(void); /* Modify devictree settings during ramstage. */ void variant_devtree_update(void); +/* Configure PCIe power and reset lines as per variant sequencing requirements. */ +void variant_pcie_power_reset_configure(void); /* Per variant FSP-S initialization, default implementation in baseboard and * overrideable by the variant. */ diff --git a/src/mainboard/google/zork/variants/berknip/Makefile.inc b/src/mainboard/google/zork/variants/berknip/Makefile.inc index b1212bcbdd5d..57e7136ddc96 100644 --- a/src/mainboard/google/zork/variants/berknip/Makefile.inc +++ b/src/mainboard/google/zork/variants/berknip/Makefile.inc @@ -2,6 +2,4 @@ subdirs-y += ./spd -romstage-y += ./romstage.c - ramstage-y += gpio.c diff --git a/src/mainboard/google/zork/variants/berknip/romstage.c b/src/mainboard/google/zork/variants/berknip/romstage.c deleted file mode 100644 index 67ad31c6d8cc..000000000000 --- a/src/mainboard/google/zork/variants/berknip/romstage.c +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ - -#include <stddef.h> -#include <soc/romstage.h> -#include <baseboard/variants.h> -#include <ec/google/chromeec/ec.h> - -#include <gpio.h> -#include <soc/gpio.h> -#include <variant/gpio.h> - -void variant_romstage_entry(void) -{ - /* Power the wifi card */ - gpio_set(EN_PWR_WIFI, 1); -} - -static const struct soc_amd_gpio berknip_gpio_set_wifi[] = { - /* EN_PWR_WIFI - Power off. Pull high in romstage.c */ - PAD_GPO(GPIO_29, LOW), -}; - -const struct soc_amd_gpio *variant_wifi_romstage_gpio_table(size_t *size) -{ - *size = ARRAY_SIZE(berknip_gpio_set_wifi); - return berknip_gpio_set_wifi; -} diff --git a/src/mainboard/google/zork/variants/morphius/Makefile.inc b/src/mainboard/google/zork/variants/morphius/Makefile.inc index b1212bcbdd5d..57e7136ddc96 100644 --- a/src/mainboard/google/zork/variants/morphius/Makefile.inc +++ b/src/mainboard/google/zork/variants/morphius/Makefile.inc @@ -2,6 +2,4 @@ subdirs-y += ./spd -romstage-y += ./romstage.c - ramstage-y += gpio.c diff --git a/src/mainboard/google/zork/variants/morphius/romstage.c b/src/mainboard/google/zork/variants/morphius/romstage.c deleted file mode 100644 index 876b836adcf8..000000000000 --- a/src/mainboard/google/zork/variants/morphius/romstage.c +++ /dev/null @@ -1,42 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ - -#include <stddef.h> -#include <soc/romstage.h> -#include <baseboard/variants.h> -#include <ec/google/chromeec/ec.h> - -#include <gpio.h> -#include <soc/gpio.h> -#include <variant/gpio.h> -#include <delay.h> - -void variant_romstage_entry(void) -{ - //SET WIFI_PCIE_RESET_L HIGH - gpio_set(WIFI_PCIE_RESET_L, 1); - - /* Power the wifi card */ - /* wait 10ms to discharge EN_PWR_WIFI to 0V */ - mdelay(10); - gpio_set(EN_PWR_WIFI, 1); - - /* SET WIFI_PCIE_RESET_L LOW */ - gpio_set(WIFI_PCIE_RESET_L, 0); - - /* Qualcomm Atheros NFA344A needs at least 10ms delay */ - mdelay(10); - - /* SET WIFI_PCIE_RESET_L HIGH */ - gpio_set(WIFI_PCIE_RESET_L, 1); -} - -static const struct soc_amd_gpio morphius_gpio_set_wifi[] = { - /* EN_PWR_WIFI - Power off. Pull high in romstage.c */ - PAD_GPO(GPIO_29, LOW), -}; - -const struct soc_amd_gpio *variant_wifi_romstage_gpio_table(size_t *size) -{ - *size = ARRAY_SIZE(morphius_gpio_set_wifi); - return morphius_gpio_set_wifi; -} |