sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/google/zork: Drop variant_romstage_gpio_table()

Browse Source 
gpio_set_stage_rom table is now configuring only PCIe related GPIOs in
romstage. This change moves the configuration of PCIe related GPIOs to
variant_pcie_gpio_configure() to keep all the configuration for WiFi and
non-WiFi PCIe pads in one place. It also drops the function
variant_romstage_gpio_table() as it is unused.

BUG=b:154351731

Signed-off-by: Furquan Shaikh <furquan@google.com>
Change-Id: Ib1c41ba141dce6b52b6e0a250a3aa07c296068aa
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43475
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Furquan Shaikh
2020-07-15 13:58:59 -07:00
committed by Aaron Durbin
parent 6a5c77cc84
commit 56f949cd0c
4 changed files with 37 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mainboard/google/zork/romstage.c
View File

@@ -7,10 +7,5 @@
void mainboard_romstage_entry_s3(int s3_resume) void mainboard_romstage_entry_s3(int s3_resume)
{ {
size_t num_gpios; variant_pcie_gpio_configure();
const struct soc_amd_gpio *gpios;
gpios = variant_romstage_gpio_table(&num_gpios);
program_gpios(gpios, num_gpios);
variant_pcie_power_reset_configure();
} }

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

@@ -9,21 +9,6 @@
#include <boardid.h> #include <boardid.h>
#include <variant/gpio.h> #include <variant/gpio.h>
static const struct soc_amd_gpio gpio_set_stage_rom[] = {
/* 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),
/* 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),
/* SD_AUX_RESET_L */
PAD_GPO(GPIO_142, HIGH),
};
static const struct soc_amd_gpio gpio_set_stage_ram[] = { static const struct soc_amd_gpio gpio_set_stage_ram[] = {
/* PWR_BTN_L */ /* PWR_BTN_L */
@@ -139,13 +124,6 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
PAD_GPO(GPIO_144, HIGH), PAD_GPO(GPIO_144, HIGH),
}; };
const __weak
struct soc_amd_gpio *variant_romstage_gpio_table(size_t *size)
{
*size = ARRAY_SIZE(gpio_set_stage_rom);
return gpio_set_stage_rom;
}
const __weak const __weak
struct soc_amd_gpio *variant_base_gpio_table(size_t *size) struct soc_amd_gpio *variant_base_gpio_table(size_t *size)
{ {
@@ -247,8 +225,25 @@ static void wifi_power_reset_configure_pre_v3(void)
gpio_set(GPIO_42, 1); gpio_set(GPIO_42, 1);
} }
__weak void variant_pcie_power_reset_configure(void) __weak void variant_pcie_gpio_configure(void)
{ {
static const struct soc_amd_gpio pcie_gpio_table[] = {
/* 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),
/* 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),
/* SD_AUX_RESET_L */
PAD_GPO(GPIO_142, HIGH),
};
program_gpios(pcie_gpio_table, ARRAY_SIZE(pcie_gpio_table));
/* Deassert PCIE_RST1_L */ /* Deassert PCIE_RST1_L */
gpio_set(GPIO_27, 1); gpio_set(GPIO_27, 1);

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

@@ -9,19 +9,6 @@
#include <boardid.h> #include <boardid.h>
#include <variant/gpio.h> #include <variant/gpio.h>
static const struct soc_amd_gpio gpio_set_stage_rom[] = {
/* NVME_AUX_RESET_L */
PAD_GPO(GPIO_40, HIGH),
/* 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),
/* SD_AUX_RESET_L */
PAD_GPO(GPIO_142, HIGH),
};
static const struct soc_amd_gpio gpio_set_stage_ram[] = { static const struct soc_amd_gpio gpio_set_stage_ram[] = {
/* PWR_BTN_L */ /* PWR_BTN_L */
@@ -135,13 +122,6 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
PAD_GPO(GPIO_144, HIGH), PAD_GPO(GPIO_144, HIGH),
}; };
const __weak
struct soc_amd_gpio *variant_romstage_gpio_table(size_t *size)
{
*size = ARRAY_SIZE(gpio_set_stage_rom);
return gpio_set_stage_rom;
}
const __weak const __weak
struct soc_amd_gpio *variant_base_gpio_table(size_t *size) struct soc_amd_gpio *variant_base_gpio_table(size_t *size)
{ {
@@ -243,8 +223,23 @@ static void wifi_power_reset_configure_pre_v3(void)
gpio_set(GPIO_42, 1); gpio_set(GPIO_42, 1);
} }
__weak void variant_pcie_power_reset_configure(void) __weak void variant_pcie_gpio_configure(void)
{ {
static const struct soc_amd_gpio pcie_gpio_table[] = {
/* NVME_AUX_RESET_L */
PAD_GPO(GPIO_40, HIGH),
/* 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),
/* SD_AUX_RESET_L */
PAD_GPO(GPIO_142, HIGH),
};
program_gpios(pcie_gpio_table, ARRAY_SIZE(pcie_gpio_table));
if (variant_uses_v3_schematics()) if (variant_uses_v3_schematics())
wifi_power_reset_configure_v3(); wifi_power_reset_configure_v3();
else else

5
src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
View File

@@ -12,7 +12,6 @@
const struct sci_source *variant_gpe_table(size_t *num); const struct sci_source *variant_gpe_table(size_t *num);
const struct soc_amd_gpio *variant_early_gpio_table(size_t *size); const struct soc_amd_gpio *variant_early_gpio_table(size_t *size);
const struct soc_amd_gpio *variant_romstage_gpio_table(size_t *size);
/* /*
* This function provides base GPIO configuration table. It is typically provided by * This function provides base GPIO configuration table. It is typically provided by
* baseboard using a weak implementation. If GPIO configuration for a variant differs * baseboard using a weak implementation. If GPIO configuration for a variant differs
@@ -36,8 +35,8 @@ const struct soc_amd_gpio *variant_sleep_gpio_table(size_t *size, int slp_typ);
void variant_devtree_update(void); void variant_devtree_update(void);
/* Update audio configuration in devicetree during ramstage. */ /* Update audio configuration in devicetree during ramstage. */
void variant_audio_update(void); void variant_audio_update(void);
/* Configure PCIe power and reset lines as per variant sequencing requirements. */ /* Configure PCIe GPIOs as per variant sequencing requirements. */
void variant_pcie_power_reset_configure(void); void variant_pcie_gpio_configure(void);
/* Per variant FSP-S initialization, default implementation in baseboard and /* Per variant FSP-S initialization, default implementation in baseboard and
* overrideable by the variant. */ * overrideable by the variant. */