summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2017-12-05 13:49:21 -0800
committerJulius Werner <jwerner@chromium.org>2017-12-07 01:19:38 +0000
commitf38a10f8d2550e28da47d8661622df69a621ee5d (patch)
tree7de73977afe40237eac91aa82ec07f396e6cab2e
parent96ed92d49dca18ca0d19de352831cf8df6f2e84c (diff)
downloadcoreboot-f38a10f8d2550e28da47d8661622df69a621ee5d.tar.xz
libpayload: Add SKU ID coreboot table support
This patch adds support to read the SKU ID entry from the coreboot table that was recently added in coreboot. Change-Id: I1c3b375da6119a4f8e8e7e25a11644becb90f927 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/22743 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--payloads/libpayload/include/coreboot_tables.h1
-rw-r--r--payloads/libpayload/include/sysinfo.h1
-rw-r--r--payloads/libpayload/libc/coreboot.c10
3 files changed, 12 insertions, 0 deletions
diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h
index 5bc56d0f6e..6b6d1b421e 100644
--- a/payloads/libpayload/include/coreboot_tables.h
+++ b/payloads/libpayload/include/coreboot_tables.h
@@ -239,6 +239,7 @@ struct cb_x86_rom_mtrr {
#define CB_TAG_BOARD_ID 0x0025
#define CB_TAG_RAM_CODE 0x0028
+#define CB_TAG_SKU_ID 0x002d
struct cb_strapping_id {
uint32_t tag;
uint32_t size;
diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h
index b46d4b1311..f221a15faa 100644
--- a/payloads/libpayload/include/sysinfo.h
+++ b/payloads/libpayload/include/sysinfo.h
@@ -112,6 +112,7 @@ struct sysinfo_t {
#define UNDEFINED_STRAPPING_ID (~0)
u32 board_id;
u32 ram_code;
+ u32 sku_id;
void *wifi_calibration;
uint64_t ramoops_buffer;
diff --git a/payloads/libpayload/libc/coreboot.c b/payloads/libpayload/libc/coreboot.c
index 1efde9a332..d831b96ba2 100644
--- a/payloads/libpayload/libc/coreboot.c
+++ b/payloads/libpayload/libc/coreboot.c
@@ -157,6 +157,12 @@ static void cb_parse_ram_code(unsigned char *ptr, struct sysinfo_t *info)
info->ram_code = ram_code->id_code;
}
+static void cb_parse_sku_id(unsigned char *ptr, struct sysinfo_t *info)
+{
+ struct cb_strapping_id *const sku_id = (struct cb_strapping_id *)ptr;
+ info->sku_id = sku_id->id_code;
+}
+
#if IS_ENABLED(CONFIG_LP_NVRAM)
static void cb_parse_optiontable(void *ptr, struct sysinfo_t *info)
{
@@ -280,6 +286,7 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
/* Initialize IDs as undefined in case they don't show up in table. */
info->board_id = UNDEFINED_STRAPPING_ID;
info->ram_code = UNDEFINED_STRAPPING_ID;
+ info->sku_id = UNDEFINED_STRAPPING_ID;
/* Now, walk the tables. */
ptr += header->header_bytes;
@@ -380,6 +387,9 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
case CB_TAG_RAM_CODE:
cb_parse_ram_code(ptr, info);
break;
+ case CB_TAG_SKU_ID:
+ cb_parse_sku_id(ptr, info);
+ break;
case CB_TAG_WIFI_CALIBRATION:
cb_parse_wifi_calibration(ptr, info);
break;