Change in ...coreboot[master]: ec/google/wilco: Support board_id with EC provided ID

[Duncan Laurie (Code Review)]

Duncan Laurie has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32276

Change subject: ec/google/wilco: Support board_id with EC provided ID
......................................................................

ec/google/wilco: Support board_id with EC provided ID

The EC can return a board ID value similar to the Chrome EC.
In order to use this for the board version returned by SMBIOS
this commit implements the board_id() function for mainboards
that use this EC.

BUG=b:123261132
TEST=Check /sys/class/dmi/id/board_version to see that it
is reflecting the value that the EC provides.

Change-Id: I3fbe0dc886701f37d2424fe7a2867fd860fa1ec0
Signed-off-by: Duncan Laurie 
---
M src/ec/google/wilco/Makefile.inc
A src/ec/google/wilco/boardid.c
M src/ec/google/wilco/commands.c
M src/ec/google/wilco/commands.h
4 files changed, 54 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/32276/1

diff --git a/src/ec/google/wilco/Makefile.inc b/src/ec/google/wilco/Makefile.inc
index fe8910c..3a7790c 100644
--- a/src/ec/google/wilco/Makefile.inc
+++ b/src/ec/google/wilco/Makefile.inc
@@ -1,8 +1,8 @@
 ifeq ($(CONFIG_EC_GOOGLE_WILCO),y)

bootblock-y += bootblock.c
-romstage-y += commands.c mailbox.c romstage.c
-ramstage-y += chip.c commands.c mailbox.c
-smm-y += commands.c mailbox.c smihandler.c
+romstage-y += commands.c mailbox.c romstage.c boardid.c
+ramstage-y += chip.c commands.c mailbox.c boardid.c
+smm-y += commands.c mailbox.c smihandler.c boardid.c

endif
diff --git a/src/ec/google/wilco/boardid.c b/src/ec/google/wilco/boardid.c
new file mode 100644
index 0000000..4ed15bb
--- /dev/null
+++ b/src/ec/google/wilco/boardid.c
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <boardid.h>
+#include "commands.h"
+
+uint32_t board_id(void)
+{
+	MAYBE_STATIC uint32_t id = BOARD_ID_INIT;
+
+	if (id == BOARD_ID_INIT) {
+		uint8_t ec_id;
+		if (wilco_ec_get_board_id(&ec_id) < 0)
+			id = BOARD_ID_UNKNOWN;
+		else
+			id = ec_id;
+	}
+
+	return id;
+}
diff --git a/src/ec/google/wilco/commands.c b/src/ec/google/wilco/commands.c
index da04e27..d0d572d 100644
--- a/src/ec/google/wilco/commands.c
+++ b/src/ec/google/wilco/commands.c
@@ -135,6 +135,12 @@
    return !!(pm.state[0] & EC_PM1_LID_OPEN);
 }

+int wilco_ec_get_board_id(uint8_t *id)
+{
+	return wilco_ec_mailbox(WILCO_EC_MSG_RAW, KB_BOARD_ID,
+				NULL, 0, id, sizeof(*id));
+}
+
 void wilco_ec_slp_en(void)
 {
    /* EC does not respond to this command */
diff --git a/src/ec/google/wilco/commands.h b/src/ec/google/wilco/commands.h
index 85f5feb..3077eee 100644
--- a/src/ec/google/wilco/commands.h
+++ b/src/ec/google/wilco/commands.h
@@ -38,6 +38,8 @@
    KB_EC_INFO = 0x38,
    /* Set ACPI mode on or off */
    KB_ACPI = 0x3a,
+	/* Board ID */
+	KB_BOARD_ID = 0x3d,
    /* Change ACPI wake up source */
    KB_ACPI_WAKEUP_CHANGE = 0x4a,
    /* Manage the EC power button passthru to the host */
@@ -267,6 +269,17 @@
  */
 int wilco_ec_get_lid_state(void);

+/**
+ * wilco_ec_get_board_id
+ *
+ * Retrieve the board ID value from the EC.
+ * @id:		Pointer to variable to store the ID read from the EC.
+ *
+ * Returns number of bytes transferred from the EC
+ * Returns -1 if the EC command failed
+ */
+int wilco_ec_get_board_id(uint8_t *id);
+
 enum ec_wake_change {
    WAKE_OFF = 0,
    WAKE_ON

[Furquan Shaikh (Code Review)]

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

Change subject: ec/google/wilco: Support board_id with EC provided ID
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/#/c/32276/1/src/ec/google/wilco/boardid.c 
File src/ec/google/wilco/boardid.c:

https://review.coreboot.org/#/c/32276/1/src/ec/google/wilco/boardid.c@25 
PS1, Line 25: <
<=? since 0 bytes returned would mean ec_id is uninitialized.

[Duncan Laurie (Code Review)]

Duncan Laurie has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32276 )

Change subject: ec/google/wilco: Support board_id with EC provided ID
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/#/c/32276/1/src/ec/google/wilco/boardid.c 
File src/ec/google/wilco/boardid.c:

https://review.coreboot.org/#/c/32276/1/src/ec/google/wilco/boardid.c@25 
PS1, Line 25: <
> <=? since 0 bytes returned would mean ec_id is uninitialized.

Done

[Duncan Laurie (Code Review)]

Hello build bot (Jenkins), Patrick Georgi, Martin Roth,

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

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

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

Change subject: ec/google/wilco: Support board_id with EC provided ID
......................................................................

ec/google/wilco: Support board_id with EC provided ID

The EC can return a board ID value similar to the Chrome EC.
In order to use this for the board version returned by SMBIOS
this commit implements the board_id() function for mainboards
that use this EC.

BUG=b:123261132
TEST=Check /sys/class/dmi/id/board_version to see that it
is reflecting the value that the EC provides.

Change-Id: I3fbe0dc886701f37d2424fe7a2867fd860fa1ec0
Signed-off-by: Duncan Laurie 
---
M src/ec/google/wilco/Makefile.inc
A src/ec/google/wilco/boardid.c
M src/ec/google/wilco/commands.c
M src/ec/google/wilco/commands.h
4 files changed, 54 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/32276/2

[Lijian Zhao (Code Review)]

Lijian Zhao has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32276 )

Change subject: ec/google/wilco: Support board_id with EC provided ID
......................................................................

Patch Set 3: Code-Review+2

[Paul Menzel (Code Review)]

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

Change subject: ec/google/wilco: Support board_id with EC provided ID
......................................................................

Patch Set 3: Code-Review+1

[Duncan Laurie (Code Review)]

Duncan Laurie has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32276 )

Change subject: ec/google/wilco: Support board_id with EC provided ID
......................................................................

ec/google/wilco: Support board_id with EC provided ID

The EC can return a board ID value similar to the Chrome EC.
In order to use this for the board version returned by SMBIOS
this commit implements the board_id() function for mainboards
that use this EC.

BUG=b:123261132
TEST=Check /sys/class/dmi/id/board_version to see that it
is reflecting the value that the EC provides.

Change-Id: I3fbe0dc886701f37d2424fe7a2867fd860fa1ec0
Signed-off-by: Duncan Laurie 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32276
Reviewed-by: Lijian Zhao 
Reviewed-by: Paul Menzel 
Tested-by: build bot (Jenkins) 
---
M src/ec/google/wilco/Makefile.inc
A src/ec/google/wilco/boardid.c
M src/ec/google/wilco/commands.c
M src/ec/google/wilco/commands.h
4 files changed, 54 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Lijian Zhao: Looks good to me, approved

diff --git a/src/ec/google/wilco/Makefile.inc b/src/ec/google/wilco/Makefile.inc
index fe8910c..3a7790c 100644
--- a/src/ec/google/wilco/Makefile.inc
+++ b/src/ec/google/wilco/Makefile.inc
@@ -1,8 +1,8 @@
 ifeq ($(CONFIG_EC_GOOGLE_WILCO),y)

bootblock-y += bootblock.c
-romstage-y += commands.c mailbox.c romstage.c
-ramstage-y += chip.c commands.c mailbox.c
-smm-y += commands.c mailbox.c smihandler.c
+romstage-y += commands.c mailbox.c romstage.c boardid.c
+ramstage-y += chip.c commands.c mailbox.c boardid.c
+smm-y += commands.c mailbox.c smihandler.c boardid.c

endif
diff --git a/src/ec/google/wilco/boardid.c b/src/ec/google/wilco/boardid.c
new file mode 100644
index 0000000..e602e6e
--- /dev/null
+++ b/src/ec/google/wilco/boardid.c
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2019 Google LLC
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <boardid.h>
+#include "commands.h"
+
+uint32_t board_id(void)
+{
+	MAYBE_STATIC uint32_t id = BOARD_ID_INIT;
+
+	if (id == BOARD_ID_INIT) {
+		uint8_t ec_id;
+		if (wilco_ec_get_board_id(&ec_id) <= 0)
+			id = BOARD_ID_UNKNOWN;
+		else
+			id = ec_id;
+	}
+
+	return id;
+}
diff --git a/src/ec/google/wilco/commands.c b/src/ec/google/wilco/commands.c
index da04e27..d0d572d 100644
--- a/src/ec/google/wilco/commands.c
+++ b/src/ec/google/wilco/commands.c
@@ -135,6 +135,12 @@
    return !!(pm.state[0] & EC_PM1_LID_OPEN);
 }

+int wilco_ec_get_board_id(uint8_t *id)
+{
+	return wilco_ec_mailbox(WILCO_EC_MSG_RAW, KB_BOARD_ID,
+				NULL, 0, id, sizeof(*id));
+}
+
 void wilco_ec_slp_en(void)
 {
    /* EC does not respond to this command */
diff --git a/src/ec/google/wilco/commands.h b/src/ec/google/wilco/commands.h
index 85f5feb..3077eee 100644
--- a/src/ec/google/wilco/commands.h
+++ b/src/ec/google/wilco/commands.h
@@ -38,6 +38,8 @@
    KB_EC_INFO = 0x38,
    /* Set ACPI mode on or off */
    KB_ACPI = 0x3a,
+	/* Board ID */
+	KB_BOARD_ID = 0x3d,
    /* Change ACPI wake up source */
    KB_ACPI_WAKEUP_CHANGE = 0x4a,
    /* Manage the EC power button passthru to the host */
@@ -267,6 +269,17 @@
  */
 int wilco_ec_get_lid_state(void);

+/**
+ * wilco_ec_get_board_id
+ *
+ * Retrieve the board ID value from the EC.
+ * @id:		Pointer to variable to store the ID read from the EC.
+ *
+ * Returns number of bytes transferred from the EC
+ * Returns -1 if the EC command failed
+ */
+int wilco_ec_get_board_id(uint8_t *id);
+
 enum ec_wake_change {
    WAKE_OFF = 0,
    WAKE_ON