[coreboot-gerrit] Change in coreboot[master]: mb/google/zork: Init fingerprint GPIOs for boot vs resume

[Martin Roth (Code Review)]

Martin Roth has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47308 )

Change subject: mb/google/zork: Init fingerprint GPIOs for boot vs resume
......................................................................

mb/google/zork: Init fingerprint GPIOs for boot vs resume

Add a function that initializes GPIOs based on the sleep type that
the system is coming back from.  This allows initialization of the
fingerprint GPIOs which need to be handled differently between wake
from S3 and boot from S5.

If fingerprint is disabled on the trembyle board, set the pins to
no-connect.  Dalboz doesn't have fingerprint and the GPIOS are
configured differently due to the FT5 chip having fewer GPIOS than
FP5, so nothing needs to be initialized there.

There were also a couple of trivial comment clean ups regarding the
FPMCU GPIOS.

BUG=b:171837716
TEST=Boot & Check GPIO states.
BRANCH=Zork

Signed-off-by: Martin Roth 
    Change-Id: Id40bc952b4f6b87493a637e0bf12a5579c736b87

Change-Id: I16a2e621145782e0a908bb3e49478586c09a0e0a
---
M src/mainboard/google/zork/bootblock.c
M src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
M src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
M src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
M src/mainboard/google/zork/variants/ezkinil/gpio.c
M src/mainboard/google/zork/variants/woomax/gpio.c
6 files changed, 47 insertions(+), 18 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/47308/1

diff --git a/src/mainboard/google/zork/bootblock.c b/src/mainboard/google/zork/bootblock.c
index a7636de..af071b2 100644
--- a/src/mainboard/google/zork/bootblock.c
+++ b/src/mainboard/google/zork/bootblock.c
@@ -2,12 +2,16 @@

#include <bootblock_common.h>
 #include <baseboard/variants.h>
+#include <acpi/acpi.h>

void bootblock_mainboard_early_init(void)
 {
    size_t num_gpios;
    const struct soc_amd_gpio *gpios;

+	gpios=variant_poweron_gpio_table(&num_gpios, acpi_get_sleep_type());
+	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/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
index 2398d07..e538aef 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
@@ -30,7 +30,7 @@
    PAD_NF(GPIO_8, ACP_I2S_LRCLK, PULL_NONE),
    /* TOUCHPAD_INT_ODL */
    PAD_SCI(GPIO_9, PULL_NONE, EDGE_LOW),
-	/* S0iX SLP - (unused - goes to EC & FPMCU */
+	/* S0iX SLP - (unused - goes to EC */
    PAD_NC(GPIO_10),
    /* EC_IN_RW_OD */
    PAD_GPI(GPIO_11, PULL_NONE),
@@ -291,6 +291,12 @@
    	wifi_power_reset_configure_pre_v3();
 }

+const __weak struct soc_amd_gpio *variant_poweron_gpio_table(size_t *size, int slp_typ)
+{
+	*size = 0;
+	return NULL;
+}
+
 static const struct soc_amd_gpio gpio_sleep_table[] = {
    /* PCIE_RST1_L */
    PAD_GPO(GPIO_27, LOW),
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 a436d1c..74e7ed2 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */

+#include <acpi/acpi.h>
 #include <baseboard/variants.h>
 #include <delay.h>
 #include <gpio.h>
@@ -32,8 +33,6 @@
    PAD_SCI(GPIO_9, PULL_NONE, EDGE_LOW),
    /* S0iX SLP - (unused - goes to EC & FPMCU */
    PAD_NC(GPIO_10),
-	/* FPMCU_RST_L */
-	PAD_GPO(GPIO_11, HIGH),
    /* USI_INT_ODL */
    PAD_GPI(GPIO_12, PULL_NONE),
    /* EN_PWR_TOUCHPAD_PS2 */
@@ -71,8 +70,6 @@
    PAD_NF(GPIO_30, ESPI_CS_L, PULL_NONE),
    /*  EC_AP_INT_ODL (Sensor Framesync) */
    PAD_GPI(GPIO_31, PULL_NONE),
-	/* EN_PWR_FP */
-	PAD_GPO(GPIO_32, HIGH),
    /* GPIO_33 - GPIO_39: Not available */
    /* NVME_AUX_RESET_L */
    PAD_GPO(GPIO_40, HIGH),
@@ -87,7 +84,7 @@
    PAD_GPO(GPIO_67, LOW), // Select Camera 1 Dmic
    /* EMMC_RESET_L */
    PAD_GPO(GPIO_68, HIGH),
-	/* FPMCU_BOOT0 - TODO: Check this */
+	/* FPMCU_BOOT0 */
    PAD_GPO(GPIO_69, LOW),
    /* EMMC_CLK */
    PAD_NF(GPIO_70, EMMC_CLK, PULL_NONE),
@@ -300,6 +297,34 @@
    	wifi_power_reset_configure_pre_v3();
 }

+static const struct soc_amd_gpio gpio_fingerprint_poweron_table[] = {
+	/* FPMCU_RST_L */
+	PAD_GPO(GPIO_11, LOW),
+	/* EN_PWR_FP */
+	PAD_GPO(GPIO_32, LOW),
+};
+
+static const struct soc_amd_gpio gpio_no_fingerprint_poweron_table[] = {
+	/* FPMCU_RST_L */
+	PAD_NC(GPIO_11),
+	/* EN_PWR_FP */
+	PAD_NC(GPIO_32),
+};
+
+const __weak struct soc_amd_gpio *variant_poweron_gpio_table(size_t *size, int slp_typ)
+{
+	if (variant_init_fingerprint()) {
+		if (slp_typ != ACPI_S0) {
+			return NULL;
+		}
+		*size = ARRAY_SIZE(gpio_fingerprint_poweron_table);
+		return gpio_fingerprint_poweron_table;
+	}
+
+	*size = ARRAY_SIZE(gpio_no_fingerprint_poweron_table);
+	return gpio_no_fingerprint_poweron_table;
+}
+
 static const struct soc_amd_gpio gpio_sleep_table[] = {
    /* NVME_AUX_RESET_L */
    PAD_GPO(GPIO_40, LOW),
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 338b918..5c040d3 100644
--- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
@@ -25,6 +25,12 @@
 const struct soc_amd_gpio *variant_override_gpio_table(size_t *size);

/*
+ * This function provides GPIO table for the pads that need to be configured when
+ * powering on because of reset, powering on, or resuming from S3.
+ */
+const struct soc_amd_gpio *variant_poweron_gpio_table(size_t *size, int slp_typ);
+
+/*
  * This function provides GPIO table for the pads that need to be configured when entering
  * sleep.
  */
diff --git a/src/mainboard/google/zork/variants/ezkinil/gpio.c b/src/mainboard/google/zork/variants/ezkinil/gpio.c
index d2dd104..f86d926 100644
--- a/src/mainboard/google/zork/variants/ezkinil/gpio.c
+++ b/src/mainboard/google/zork/variants/ezkinil/gpio.c
@@ -37,8 +37,6 @@
    PAD_NC(GPIO_4),
    /* PEN_POWER_EN - Not connected */
    PAD_NC(GPIO_5),
-	/* FPMCU_RST_L Change NC */
-	PAD_NC(GPIO_11),
    /* DMIC_SEL */
    PAD_GPO(GPIO_13, LOW), // Select Camera 1 Dmic
    /* EN_PWR_WIFI */
@@ -62,8 +60,6 @@
    PAD_NC(GPIO_4),
    /* PEN_POWER_EN - Not connected */
    PAD_NC(GPIO_5),
-	/* FPMCU_RST_L Change NC */
-	PAD_NC(GPIO_11),
    /* FPMCU_BOOT0 Change NC */
    PAD_NC(GPIO_69),
    /* EN_DEV_BEEP_L */
diff --git a/src/mainboard/google/zork/variants/woomax/gpio.c b/src/mainboard/google/zork/variants/woomax/gpio.c
index cb98df7..329e7dd 100644
--- a/src/mainboard/google/zork/variants/woomax/gpio.c
+++ b/src/mainboard/google/zork/variants/woomax/gpio.c
@@ -10,10 +10,6 @@
    PAD_NC(GPIO_5),
    /* GPIO_6 NC */
    PAD_NC(GPIO_6),
-	/* GPIO_11 NC */
-	PAD_NC(GPIO_11),
-	/* GPIO_32 NC */
-	PAD_NC(GPIO_32),
    /* GPIO_69 NC */
    PAD_NC(GPIO_69),
    /* RAM_ID_4  */
@@ -37,10 +33,6 @@
    PAD_NC(GPIO_5),
    /* GPIO_6 NC */
    PAD_NC(GPIO_6),
-	/* GPIO_11 NC */
-	PAD_NC(GPIO_11),
-	/* GPIO_32 NC */
-	PAD_NC(GPIO_32),
    /* GPIO_69 NC */
    PAD_NC(GPIO_69),
    /* RAM_ID_4  */