Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39037 )
Change subject: mainboard/google/volteer: Migrate onto SKU ID helpers ......................................................................
mainboard/google/volteer: Migrate onto SKU ID helpers
Leverage the common sku id space helper encoders. volteer uses the non-legacy SKU ID space.
BUG=b:149348474 BRANCH=none TEST=tested on hatch
Change-Id: Ic66908afb7abb34527b4177cfd07f03ad718317c Signed-off-by: Edward O'Callaghan quasisec@google.com --- M src/mainboard/google/volteer/Kconfig M src/mainboard/google/volteer/mainboard.c 2 files changed, 2 insertions(+), 28 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/39037/1
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig index 572a100..2c77b0e 100644 --- a/src/mainboard/google/volteer/Kconfig +++ b/src/mainboard/google/volteer/Kconfig @@ -14,6 +14,7 @@ select MAINBOARD_HAS_SPI_TPM_CR50 select MAINBOARD_HAS_TPM2 select SOC_INTEL_TIGERLAKE + select EC_GOOGLE_CHROMEEC_SKU_ID_MAX
if BOARD_GOOGLE_BASEBOARD_VOLTEER
diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c index 51cbc40..dcefb5d 100644 --- a/src/mainboard/google/volteer/mainboard.c +++ b/src/mainboard/google/volteer/mainboard.c @@ -17,36 +17,9 @@ #include <vendorcode/google/chromeos/chromeos.h> #include <variant/gpio.h>
-#define SKU_UNKNOWN 0xFFFFFFFF -#define SKU_MAX 0x7FFFFFFF - -static uint32_t get_board_sku(void) -{ - static uint32_t sku_id = SKU_UNKNOWN; - - if (sku_id != SKU_UNKNOWN) - return sku_id; - - if (google_chromeec_cbi_get_sku_id(&sku_id)) - sku_id = SKU_UNKNOWN; - - return sku_id; -} - const char *smbios_system_sku(void) { - static char sku_str[14]; /* sku{0..2147483647} */ - uint32_t sku_id = get_board_sku(); - - if ((sku_id == SKU_UNKNOWN) || (sku_id > SKU_MAX)) { - printk(BIOS_ERR, "%s: Unexpected SKU ID %u\n", - __func__, sku_id); - return ""; - } - - snprintf(sku_str, sizeof(sku_str), "sku%u", sku_id); - - return sku_str; + return google_chromeec_smbios_system_sku(); }
static void mainboard_init(struct device *dev)
Hello Jett Rink, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/39037
to look at the new patch set (#2).
Change subject: mainboard/google/volteer: Migrate onto SKU ID helpers ......................................................................
mainboard/google/volteer: Migrate onto SKU ID helpers
Leverage the common sku id space helper encoders. volteer uses the non-legacy SKU ID space.
BUG=b:149348474 BRANCH=none TEST=only tested on hatch
Change-Id: Ic66908afb7abb34527b4177cfd07f03ad718317c Signed-off-by: Edward O'Callaghan quasisec@google.com --- M src/mainboard/google/volteer/Kconfig M src/mainboard/google/volteer/mainboard.c 2 files changed, 3 insertions(+), 28 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/39037/2
Hello Jett Rink, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/39037
to look at the new patch set (#3).
Change subject: mainboard/google/volteer: Migrate onto SKU ID helpers ......................................................................
mainboard/google/volteer: Migrate onto SKU ID helpers
Leverage the common sku id space helper encoders. volteer uses the non-legacy SKU ID space.
BUG=b:149348474 BRANCH=none TEST=only tested on hatch
Change-Id: Ic66908afb7abb34527b4177cfd07f03ad718317c Signed-off-by: Edward O'Callaghan quasisec@google.com --- M src/mainboard/google/volteer/Kconfig M src/mainboard/google/volteer/mainboard.c 2 files changed, 4 insertions(+), 28 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/39037/3
Hello Jett Rink, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/39037
to look at the new patch set (#5).
Change subject: mainboard/google/volteer: Migrate onto SKU ID helpers ......................................................................
mainboard/google/volteer: Migrate onto SKU ID helpers
Leverage the common sku id space helper encoders. volteer uses the non-legacy SKU ID space.
BUG=b:149348474 BRANCH=none TEST=only tested on hatch
Change-Id: Ic66908afb7abb34527b4177cfd07f03ad718317c Signed-off-by: Edward O'Callaghan quasisec@google.com --- M src/mainboard/google/volteer/Kconfig M src/mainboard/google/volteer/mainboard.c 2 files changed, 2 insertions(+), 28 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/37/39037/5
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39037 )
Change subject: mainboard/google/volteer: Migrate onto SKU ID helpers ......................................................................
Patch Set 12: Code-Review+2
Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/coreboot/+/39037 )
Change subject: mainboard/google/volteer: Migrate onto SKU ID helpers ......................................................................
mainboard/google/volteer: Migrate onto SKU ID helpers
Leverage the common sku id space helper encoders. volteer uses the non-legacy SKU ID space.
BUG=b:149348474 BRANCH=none TEST=only tested on hatch
Change-Id: Ic66908afb7abb34527b4177cfd07f03ad718317c Signed-off-by: Edward O'Callaghan quasisec@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/39037 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Furquan Shaikh furquan@google.com --- M src/mainboard/google/volteer/Kconfig M src/mainboard/google/volteer/mainboard.c 2 files changed, 2 insertions(+), 28 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved
diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig index 572a100..699cdea 100644 --- a/src/mainboard/google/volteer/Kconfig +++ b/src/mainboard/google/volteer/Kconfig @@ -6,6 +6,7 @@ select DRIVERS_SPI_ACPI select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_BOARDID + select EC_GOOGLE_CHROMEEC_SKUID select EC_GOOGLE_CHROMEEC_LPC select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES diff --git a/src/mainboard/google/volteer/mainboard.c b/src/mainboard/google/volteer/mainboard.c index 51cbc40..dcefb5d 100644 --- a/src/mainboard/google/volteer/mainboard.c +++ b/src/mainboard/google/volteer/mainboard.c @@ -17,36 +17,9 @@ #include <vendorcode/google/chromeos/chromeos.h> #include <variant/gpio.h>
-#define SKU_UNKNOWN 0xFFFFFFFF -#define SKU_MAX 0x7FFFFFFF - -static uint32_t get_board_sku(void) -{ - static uint32_t sku_id = SKU_UNKNOWN; - - if (sku_id != SKU_UNKNOWN) - return sku_id; - - if (google_chromeec_cbi_get_sku_id(&sku_id)) - sku_id = SKU_UNKNOWN; - - return sku_id; -} - const char *smbios_system_sku(void) { - static char sku_str[14]; /* sku{0..2147483647} */ - uint32_t sku_id = get_board_sku(); - - if ((sku_id == SKU_UNKNOWN) || (sku_id > SKU_MAX)) { - printk(BIOS_ERR, "%s: Unexpected SKU ID %u\n", - __func__, sku_id); - return ""; - } - - snprintf(sku_str, sizeof(sku_str), "sku%u", sku_id); - - return sku_str; + return google_chromeec_smbios_system_sku(); }
static void mainboard_init(struct device *dev)
9elements QA has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39037 )
Change subject: mainboard/google/volteer: Migrate onto SKU ID helpers ......................................................................
Patch Set 13:
Automatic boot test returned (PASS/FAIL/TOTAL): 3/0/3 Emulation targets: EMULATION_QEMU_X86_Q35 using payload TianoCore : SUCCESS : https://lava.9esec.io/r/961 EMULATION_QEMU_X86_Q35 using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/960 EMULATION_QEMU_X86_I440FX using payload SeaBIOS : SUCCESS : https://lava.9esec.io/r/959
Please note: This test is under development and might not be accurate at all!
-
9elements QA (Code Review) -
Edward O'Callaghan (Code Review)
-
Furquan Shaikh (Code Review)