Change in coreboot[master]: mb/google/dedede: Fix crossystem wpsw_cur error

[Subrata Banik (Code Review)]

Subrata Banik has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40744 )

Change subject: mb/google/dedede: Fix crossystem wpsw_cur error
......................................................................

mb/google/dedede: Fix crossystem wpsw_cur error

Change-Id: Ie4ae1365a7611b8be3e795798c171e3f7ea9e417
Signed-off-by: Subrata Banik 
---
M src/mainboard/google/dedede/variants/baseboard/gpio.c
M src/mainboard/google/dedede/variants/baseboard/include/baseboard/gpio.h
2 files changed, 5 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/40744/1

diff --git a/src/mainboard/google/dedede/variants/baseboard/gpio.c b/src/mainboard/google/dedede/variants/baseboard/gpio.c
index a4ce97d..273601f 100644
--- a/src/mainboard/google/dedede/variants/baseboard/gpio.c
+++ b/src/mainboard/google/dedede/variants/baseboard/gpio.c
@@ -119,7 +119,7 @@
    /* C10 : GPP_C10/UART0_RTSB */
    PAD_NC(GPP_C10, NONE),
    /* C11 : AP_WP_OD */
-	PAD_NC(GPP_C11, NONE),
+	PAD_CFG_GPI(GPP_C11, NONE, DEEP),
    /* C12 : AP_PEN_DET_ODL */
    PAD_NC(GPP_C12, NONE),
    /* C13 : GPP_C13/UART1_TXD */
@@ -444,6 +444,8 @@
 }

static const struct cros_gpio cros_gpios[] = {
+	CROS_GPIO_REC_AL(CROS_GPIO_VIRTUAL, CROS_GPIO_DEVICE_NAME),
+	CROS_GPIO_WP_AH(GPIO_PCH_WP, CROS_GPIO_DEVICE_NAME),
 };

const struct cros_gpio *__weak variant_cros_gpios(size_t *num)
diff --git a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/gpio.h
index 98e4b27..fac8342 100644
--- a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/gpio.h
+++ b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/gpio.h
@@ -14,6 +14,8 @@
 /* eSPI virtual wire reporting */
 #define EC_SCI_GPI	GPE0_ESPI

+#define GPIO_PCH_WP	GPP_C11
+
 /* EC wake is LAN_WAKE# which is a special DeepSX wake pin */
 #define GPE_EC_WAKE	GPE0_LAN_WAK

[Subrata Banik (Code Review)]

Subrata Banik has uploaded a new patch set (#2). ( https://review.coreboot.org/c/coreboot/+/40744 )

Change subject: mb/google/dedede: Fix crossystem wpsw_cur error
......................................................................

mb/google/dedede: Fix crossystem wpsw_cur error

Change-Id: Ie4ae1365a7611b8be3e795798c171e3f7ea9e417
Signed-off-by: Subrata Banik 
---
M src/mainboard/google/dedede/chromeos.c
M src/mainboard/google/dedede/variants/baseboard/gpio.c
M src/mainboard/google/dedede/variants/baseboard/include/baseboard/gpio.h
3 files changed, 6 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/40744/2

[Subrata Banik (Code Review)]

Hello build bot (Jenkins),

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

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

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

Change subject: mb/google/dedede: Fix crossystem wpsw_cur error
......................................................................

mb/google/dedede: Fix crossystem wpsw_cur error

Change-Id: Ie4ae1365a7611b8be3e795798c171e3f7ea9e417
Signed-off-by: Subrata Banik 
---
M src/mainboard/google/dedede/chromeos.c
M src/mainboard/google/dedede/variants/baseboard/gpio.c
M src/mainboard/google/dedede/variants/baseboard/include/baseboard/gpio.h
3 files changed, 6 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/40744/3

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40744 )

Change subject: mb/google/dedede: Fix crossystem wpsw_cur error
......................................................................

Patch Set 3:

(1 comment)

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

https://review.coreboot.org/c/coreboot/+/40744/3//COMMIT_MSG@8 
PS3, Line 8: 
Please elaborate, what the error is.

[Subrata Banik (Code Review)]

Hello build bot (Jenkins), Karthik Ramasubramanian,

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

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

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

Change subject: mb/google/dedede: Fix crossystem wpsw_cur error
......................................................................

mb/google/dedede: Fix crossystem wpsw_cur error

Add GPIO_PCH_WP (GPP_C11) to associate GPP_PCH_WP with community
zero.

TEST=Build coreboot, flash, boot to
and log into kernel, execute "wp enable" in console,
execute "crossystem" at kernel prompt and verify that "wpsw_cur"
shows as being "1", Execute "wp disable" in console, execute
"crossystem" at kernel prompt and verify "wpsw_cur" is 0.

Change-Id: Ie4ae1365a7611b8be3e795798c171e3f7ea9e417
Signed-off-by: Subrata Banik 
---
M src/mainboard/google/dedede/chromeos.c
M src/mainboard/google/dedede/variants/baseboard/gpio.c
M src/mainboard/google/dedede/variants/baseboard/include/baseboard/gpio.h
3 files changed, 6 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/40744/4

[Subrata Banik (Code Review)]

Subrata Banik has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40744 )

Change subject: mb/google/dedede: Fix crossystem wpsw_cur error
......................................................................

Patch Set 4:

(1 comment)

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

https://review.coreboot.org/c/coreboot/+/40744/3//COMMIT_MSG@8 
PS3, Line 8:
> Please elaborate, what the error is.

Ack

[Usha P (Code Review)]

Usha P has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40744 )

Change subject: mb/google/dedede: Fix crossystem wpsw_cur error
......................................................................

Patch Set 4: Code-Review+1

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40744 )

Change subject: mb/google/dedede: Fix crossystem wpsw_cur error
......................................................................

Patch Set 4: Code-Review+1

[Maulik V Vaghela (Code Review)]

Maulik V Vaghela has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40744 )

Change subject: mb/google/dedede: Fix crossystem wpsw_cur error
......................................................................

Patch Set 4: Code-Review+2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40744 )

Change subject: mb/google/dedede: Fix crossystem wpsw_cur error
......................................................................

Patch Set 4: Code-Review+2

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/40744 )

Change subject: mb/google/dedede: Fix crossystem wpsw_cur error
......................................................................

Patch Set 4: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/40744 )

Change subject: mb/google/dedede: Fix crossystem wpsw_cur error
......................................................................

mb/google/dedede: Fix crossystem wpsw_cur error

Add GPIO_PCH_WP (GPP_C11) to associate GPP_PCH_WP with community
zero.

TEST=Build coreboot, flash, boot to
and log into kernel, execute "wp enable" in console,
execute "crossystem" at kernel prompt and verify that "wpsw_cur"
shows as being "1", Execute "wp disable" in console, execute
"crossystem" at kernel prompt and verify "wpsw_cur" is 0.

Change-Id: Ie4ae1365a7611b8be3e795798c171e3f7ea9e417
Signed-off-by: Subrata Banik 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40744
Reviewed-by: Usha P 
Reviewed-by: Maulik V Vaghela 
Reviewed-by: Angel Pons 
Reviewed-by: Karthik Ramasubramanian 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/dedede/chromeos.c
M src/mainboard/google/dedede/variants/baseboard/gpio.c
M src/mainboard/google/dedede/variants/baseboard/include/baseboard/gpio.h
3 files changed, 6 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Maulik V Vaghela: Looks good to me, approved
  Angel Pons: Looks good to me, approved
  Karthik Ramasubramanian: Looks good to me, approved
  Usha P: Looks good to me, but someone else must approve

diff --git a/src/mainboard/google/dedede/chromeos.c b/src/mainboard/google/dedede/chromeos.c
index a9cc602..3f0cad5 100644
--- a/src/mainboard/google/dedede/chromeos.c
+++ b/src/mainboard/google/dedede/chromeos.c
@@ -23,8 +23,7 @@

int get_write_protect_state(void)
 {
-	/* No write protect */
-	return 0;
+	return gpio_get(GPIO_PCH_WP);
 }

void mainboard_chromeos_acpi_generate(void)
diff --git a/src/mainboard/google/dedede/variants/baseboard/gpio.c b/src/mainboard/google/dedede/variants/baseboard/gpio.c
index 6adb35b..1b3e015 100644
--- a/src/mainboard/google/dedede/variants/baseboard/gpio.c
+++ b/src/mainboard/google/dedede/variants/baseboard/gpio.c
@@ -119,7 +119,7 @@
    /* C10 : GPP_C10/UART0_RTSB */
    PAD_NC(GPP_C10, NONE),
    /* C11 : AP_WP_OD */
-	PAD_NC(GPP_C11, NONE),
+	PAD_CFG_GPI(GPP_C11, NONE, DEEP),
    /* C12 : AP_PEN_DET_ODL */
    PAD_NC(GPP_C12, NONE),
    /* C13 : GPP_C13/UART1_TXD */
@@ -444,6 +444,8 @@
 }

static const struct cros_gpio cros_gpios[] = {
+	CROS_GPIO_REC_AL(CROS_GPIO_VIRTUAL, CROS_GPIO_COMM0_NAME),
+	CROS_GPIO_WP_AH(GPIO_PCH_WP, CROS_GPIO_COMM0_NAME),
 };

const struct cros_gpio *__weak variant_cros_gpios(size_t *num)
diff --git a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/gpio.h
index 98e4b27..fac8342 100644
--- a/src/mainboard/google/dedede/variants/baseboard/include/baseboard/gpio.h
+++ b/src/mainboard/google/dedede/variants/baseboard/include/baseboard/gpio.h
@@ -14,6 +14,8 @@
 /* eSPI virtual wire reporting */
 #define EC_SCI_GPI	GPE0_ESPI

+#define GPIO_PCH_WP	GPP_C11
+
 /* EC wake is LAN_WAKE# which is a special DeepSX wake pin */
 #define GPE_EC_WAKE	GPE0_LAN_WAK

[9elements QA (Code Review)]

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

Change subject: mb/google/dedede: Fix crossystem wpsw_cur error
......................................................................

Patch Set 5:

Automatic boot test returned (PASS/FAIL/TOTAL): 4/0/4
Emulation targets:
"QEMU x86 q35/ich9" using payload TianoCore : SUCCESS : https://lava.9esec.io/r/3024
"QEMU x86 q35/ich9" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/3023
"QEMU x86 i440fx/piix4" using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/3022
"QEMU AArch64" using payload LinuxBoot_u-root_kexec : SUCCESS : https://lava.9esec.io/r/3021

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