Change in coreboot[master]: mb/google/zork: Fix GPIO table for v3.6 schematics

[Kane Chen (Code Review)]

Kane Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44655 )

Change subject: mb/google/zork: Fix GPIO table for v3.6 schematics
......................................................................

mb/google/zork: Fix GPIO table for v3.6 schematics

Add board version switch GPIO table on gpio.c.

BUG=b:165887084
BRANCH=None
TEST=emerge-zork coreboot

Signed-off-by: Kane Chen 
Change-Id: I661e16f7b4769e83450f41ff267c0d253441c4cd
---
M src/mainboard/google/zork/variants/woomax/gpio.c
1 file changed, 39 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/44655/1

diff --git a/src/mainboard/google/zork/variants/woomax/gpio.c b/src/mainboard/google/zork/variants/woomax/gpio.c
index 968c622..d70ef71 100644
--- a/src/mainboard/google/zork/variants/woomax/gpio.c
+++ b/src/mainboard/google/zork/variants/woomax/gpio.c
@@ -3,7 +3,7 @@
 #include <baseboard/variants.h>
 #include <soc/gpio.h>

-static const struct soc_amd_gpio woomax_gpio_set_stage_ram[] = {
+static const struct soc_amd_gpio woomax_bid0_gpio_set_stage_ram[] = {
    /* GPIO_4 NC */
    PAD_NC(GPIO_4),
    /* GPIO_5 NC */
@@ -30,8 +30,46 @@
    PAD_NC(GPIO_143),
 };

+static const struct soc_amd_gpio woomax_gpio_set_stage_ram[] = {
+	/* GPIO_4 NC */
+	PAD_NC(GPIO_4),
+	/* GPIO_5 NC */
+	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  */
+	PAD_NC(GPIO_84),
+	/* EN_DEV_BEEP_L */
+	PAD_GPO(GPIO_89, HIGH),
+	/* USI_RESET */
+	PAD_GPO(GPIO_140, HIGH),
+	/* GPIO_141 NC */
+	PAD_NC(GPIO_141),
+	/* GPIO_143 NC */
+	PAD_NC(GPIO_143),
+};
+
 const struct soc_amd_gpio *variant_override_gpio_table(size_t *size)
 {
+	uint32_t board_version;
+
+	/* If board version cannot be read, assume it is board_version 0. */
+	if (google_chromeec_cbi_get_board_version(&board_version))
+		board_version = 0;
+
+	if (board_version == 0) {
+	*size = ARRAY_SIZE(woomax_bid0_gpio_set_stage_ram);
+	return woomax_bid0_gpio_set_stage_ram;
+	}
    *size = ARRAY_SIZE(woomax_gpio_set_stage_ram);
    return woomax_gpio_set_stage_ram;
+
+	*size = 0;
+	return NULL;
 }

[build bot (Jenkins) (Code Review)]

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44655 )

Change subject: mb/google/zork: Fix GPIO table for v3.6 schematics
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/44655/1/src/mainboard/google/zork/v... 
File src/mainboard/google/zork/variants/woomax/gpio.c:

https://review.coreboot.org/c/coreboot/+/44655/1/src/mainboard/google/zork/v... 
PS1, Line 66: 	if (board_version == 0) {
suspect code indent for conditional statements (8, 8)

[Kane Chen (Code Review)]

Hello build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/44655

to look at the new patch set (#2).

Change subject: mb/google/zork: Fix GPIO table for v3.6 schematics
......................................................................

mb/google/zork: Fix GPIO table for v3.6 schematics

Add board version switch GPIO table on gpio.c.

BUG=b:165887084
BRANCH=None
TEST=emerge-zork coreboot

Signed-off-by: Kane Chen 
Change-Id: I661e16f7b4769e83450f41ff267c0d253441c4cd
---
M src/mainboard/google/zork/variants/woomax/gpio.c
1 file changed, 39 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/44655/2

[Aaron Durbin (Code Review)]

Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44655 )

Change subject: mb/google/zork: Fix GPIO table for v3.6 schematics
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/44655/2/src/mainboard/google/zork/v... 
File src/mainboard/google/zork/variants/woomax/gpio.c:

https://review.coreboot.org/c/coreboot/+/44655/2/src/mainboard/google/zork/v... 
PS2, Line 72: 
            : 	*size = 0;
            : 	return NULL;
This should be removed.

[Kane Chen (Code Review)]

Hello build bot (Jenkins), Furquan Shaikh, Aaron Durbin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/44655

to look at the new patch set (#3).

Change subject: mb/google/zork: Fix GPIO table for v3.6 schematics
......................................................................

mb/google/zork: Fix GPIO table for v3.6 schematics

Add board version switch GPIO table on gpio.c.

BUG=b:165887084
BRANCH=None
TEST=emerge-zork coreboot

Signed-off-by: Kane Chen 
Change-Id: I661e16f7b4769e83450f41ff267c0d253441c4cd
---
M src/mainboard/google/zork/variants/woomax/gpio.c
1 file changed, 36 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/44655/3

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44655 )

Change subject: mb/google/zork: Fix GPIO table for v3.6 schematics
......................................................................

Patch Set 3: Code-Review+2

(2 comments)

https://review.coreboot.org/c/coreboot/+/44655/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/44655/3//COMMIT_MSG@7 
PS3, Line 7: Fix GPIO table for v3.6 schematics
Fix GPIO table for v3.6 schematics for woomax

https://review.coreboot.org/c/coreboot/+/44655/3//COMMIT_MSG@12 
PS3, Line 12: None
zork

Change in coreboot[master]: mb/google/zork: Fix GPIO table for v3.6 schematics for woomax

[Kane Chen (Code Review)]

Hello build bot (Jenkins), Furquan Shaikh, Aaron Durbin,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/44655

to look at the new patch set (#4).

Change subject: mb/google/zork: Fix GPIO table for v3.6 schematics for woomax
......................................................................

mb/google/zork: Fix GPIO table for v3.6 schematics for woomax

Add board version switch GPIO table on gpio.c.

BUG=b:165887084
BRANCH=Zork
TEST=emerge-zork coreboot

Signed-off-by: Kane Chen 
Change-Id: I661e16f7b4769e83450f41ff267c0d253441c4cd
---
M src/mainboard/google/zork/variants/woomax/gpio.c
1 file changed, 36 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/44655/4

Change in coreboot[master]: mb/google/zork: Fix GPIO table for v3.6 schematics for woomax

[Kane Chen (Code Review)]

Kane Chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44655 )

Change subject: mb/google/zork: Fix GPIO table for v3.6 schematics for woomax
......................................................................

Patch Set 4:

(3 comments)

https://review.coreboot.org/c/coreboot/+/44655/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/44655/3//COMMIT_MSG@7 
PS3, Line 7: Fix GPIO table for v3.6 schematics
> Fix GPIO table for v3. […]

Done

https://review.coreboot.org/c/coreboot/+/44655/3//COMMIT_MSG@12 
PS3, Line 12: None
> zork

Done

https://review.coreboot.org/c/coreboot/+/44655/2/src/mainboard/google/zork/v... 
File src/mainboard/google/zork/variants/woomax/gpio.c:

https://review.coreboot.org/c/coreboot/+/44655/2/src/mainboard/google/zork/v... 
PS2, Line 72: 
            : 	*size = 0;
            : 	return NULL;
> This should be removed.

Done

Change in coreboot[master]: mb/google/zork: Fix GPIO table for v3.6 schematics for woomax

[Aaron Durbin (Code Review)]

Aaron Durbin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44655 )

Change subject: mb/google/zork: Fix GPIO table for v3.6 schematics for woomax
......................................................................

Patch Set 5: Code-Review+2

Change in coreboot[master]: mb/google/zork: Fix GPIO table for v3.6 schematics for woomax

[Aaron Durbin (Code Review)]

Aaron Durbin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44655 )

Change subject: mb/google/zork: Fix GPIO table for v3.6 schematics for woomax
......................................................................

mb/google/zork: Fix GPIO table for v3.6 schematics for woomax

Add board version switch GPIO table on gpio.c.

BUG=b:165887084
BRANCH=Zork
TEST=emerge-zork coreboot

Signed-off-by: Kane Chen 
Change-Id: I661e16f7b4769e83450f41ff267c0d253441c4cd
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44655
Tested-by: build bot (Jenkins) 
Reviewed-by: Aaron Durbin 
Reviewed-by: Furquan Shaikh 
---
M src/mainboard/google/zork/variants/woomax/gpio.c
1 file changed, 36 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Aaron Durbin: Looks good to me, approved
  Furquan Shaikh: Looks good to me, approved

diff --git a/src/mainboard/google/zork/variants/woomax/gpio.c b/src/mainboard/google/zork/variants/woomax/gpio.c
index 968c622..ebbcbea 100644
--- a/src/mainboard/google/zork/variants/woomax/gpio.c
+++ b/src/mainboard/google/zork/variants/woomax/gpio.c
@@ -3,7 +3,7 @@
 #include <baseboard/variants.h>
 #include <soc/gpio.h>

-static const struct soc_amd_gpio woomax_gpio_set_stage_ram[] = {
+static const struct soc_amd_gpio woomax_bid0_gpio_set_stage_ram[] = {
    /* GPIO_4 NC */
    PAD_NC(GPIO_4),
    /* GPIO_5 NC */
@@ -30,8 +30,43 @@
    PAD_NC(GPIO_143),
 };

+static const struct soc_amd_gpio woomax_gpio_set_stage_ram[] = {
+	/* GPIO_4 NC */
+	PAD_NC(GPIO_4),
+	/* GPIO_5 NC */
+	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  */
+	PAD_NC(GPIO_84),
+	/* EN_DEV_BEEP_L */
+	PAD_GPO(GPIO_89, HIGH),
+	/* USI_RESET */
+	PAD_GPO(GPIO_140, HIGH),
+	/* GPIO_141 NC */
+	PAD_NC(GPIO_141),
+	/* GPIO_143 NC */
+	PAD_NC(GPIO_143),
+};
+
 const struct soc_amd_gpio *variant_override_gpio_table(size_t *size)
 {
+	uint32_t board_version;
+
+	/* If board version cannot be read, assume it is board_version 0. */
+	if (google_chromeec_cbi_get_board_version(&board_version))
+		board_version = 0;
+
+	if (board_version == 0) {
+		*size = ARRAY_SIZE(woomax_bid0_gpio_set_stage_ram);
+		return woomax_bid0_gpio_set_stage_ram;
+	}
    *size = ARRAY_SIZE(woomax_gpio_set_stage_ram);
    return woomax_gpio_set_stage_ram;
 }

Change in coreboot[master]: mb/google/zork: Fix GPIO table for v3.6 schematics for woomax

[9elements QA (Code Review)]

9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/44655 )

Change subject: mb/google/zork: Fix GPIO table for v3.6 schematics for woomax
......................................................................

Patch Set 6:

Automatic boot test returned (PASS/FAIL/TOTAL): 6/1/7
"QEMU x86 q35/ich9" (x86_32) using payload TianoCore : SUCCESS : https://lava.9esec.io/r/16520
"QEMU x86 q35/ich9" (x86_32) using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/16519
"QEMU x86 i440fx/piix4" (x86_64) using payload SeaBIOS : FAIL : https://lava.9esec.io/r/16518
"QEMU x86 i440fx/piix4" (x86_32) using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/16517
"QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/16516
"HP Compaq 8200 Elite SFF PC" (x86_32) using payload TianoCore : SUCCESS : https://lava.9esec.io/r/16522
"HP Compaq 8200 Elite SFF PC" (x86_32) using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/16521

Please note: This test is under development and might not be accurate at all!