diff options
| -rw-r--r-- | payloads/libpayload/arch/arm/coreboot.c | 15 | ||||
| -rw-r--r-- | payloads/libpayload/arch/arm64/coreboot.c | 15 | ||||
| -rw-r--r-- | payloads/libpayload/arch/x86/coreboot.c | 15 | ||||
| -rw-r--r-- | payloads/libpayload/include/coreboot_tables.h | 8 | ||||
| -rw-r--r-- | payloads/libpayload/include/sysinfo.h | 1 |
5 files changed, 54 insertions, 0 deletions
diff --git a/payloads/libpayload/arch/arm/coreboot.c b/payloads/libpayload/arch/arm/coreboot.c index c7f371e908..a1c3675ab9 100644 --- a/payloads/libpayload/arch/arm/coreboot.c +++ b/payloads/libpayload/arch/arm/coreboot.c @@ -143,6 +143,12 @@ static void cb_parse_mrc_cache(unsigned char *ptr, struct sysinfo_t *info) info->mrc_cache = phys_to_virt(cbmem->cbmem_tab); } +static void cb_parse_board_id(unsigned char *ptr, struct sysinfo_t *info) +{ + struct cb_board_id *const cbbid = (struct cb_board_id *)ptr; + info->board_id = cbbid->board_id; +} + #ifdef CONFIG_LP_NVRAM static void cb_parse_optiontable(void *ptr, struct sysinfo_t *info) { @@ -196,6 +202,12 @@ static int cb_parse_header(void *addr, struct sysinfo_t *info) info->header = header; + /* + * Valid board IDs are small numbers, preset this to an invalid value + * for the case when firmware does not supply the board ID. + */ + info->board_id = ~0; + /* Now, walk the tables. */ ptr += header->header_bytes; @@ -288,6 +300,9 @@ static int cb_parse_header(void *addr, struct sysinfo_t *info) case CB_TAG_MRC_CACHE: cb_parse_mrc_cache(ptr, info); break; + case CB_TAG_BOARD_ID: + cb_parse_board_id(ptr, info); + break; } ptr += rec->size; diff --git a/payloads/libpayload/arch/arm64/coreboot.c b/payloads/libpayload/arch/arm64/coreboot.c index 6c671c8628..6d7c95580a 100644 --- a/payloads/libpayload/arch/arm64/coreboot.c +++ b/payloads/libpayload/arch/arm64/coreboot.c @@ -143,6 +143,12 @@ static void cb_parse_mrc_cache(unsigned char *ptr, struct sysinfo_t *info) info->mrc_cache = phys_to_virt(cbmem->cbmem_tab); } +static void cb_parse_board_id(unsigned char *ptr, struct sysinfo_t *info) +{ + struct cb_board_id *const cbbid = (struct cb_board_id *)ptr; + info->board_id = cbbid->board_id; +} + #ifdef CONFIG_LP_NVRAM static void cb_parse_optiontable(void *ptr, struct sysinfo_t *info) { @@ -196,6 +202,12 @@ static int cb_parse_header(void *addr, struct sysinfo_t *info) info->header = header; + /* + * Valid board IDs are small numbers, preset this to an invalid value + * for the case when firmware does not supply the board ID. + */ + info->board_id = ~0; + /* Now, walk the tables. */ ptr += header->header_bytes; @@ -288,6 +300,9 @@ static int cb_parse_header(void *addr, struct sysinfo_t *info) case CB_TAG_MRC_CACHE: cb_parse_mrc_cache(ptr, info); break; + case CB_TAG_BOARD_ID: + cb_parse_board_id(ptr, info); + break; } ptr += rec->size; diff --git a/payloads/libpayload/arch/x86/coreboot.c b/payloads/libpayload/arch/x86/coreboot.c index a4635576a3..43fde9f660 100644 --- a/payloads/libpayload/arch/x86/coreboot.c +++ b/payloads/libpayload/arch/x86/coreboot.c @@ -141,6 +141,12 @@ static void cb_parse_acpi_gnvs(unsigned char *ptr, struct sysinfo_t *info) info->acpi_gnvs = phys_to_virt(cbmem->cbmem_tab); } +static void cb_parse_board_id(unsigned char *ptr, struct sysinfo_t *info) +{ + struct cb_board_id *const cbbid = (struct cb_board_id *)ptr; + info->board_id = cbbid->board_id; +} + #ifdef CONFIG_LP_NVRAM static void cb_parse_optiontable(void *ptr, struct sysinfo_t *info) { @@ -206,6 +212,12 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info) info->header = header; + /* + * Valid board IDs are small numbers, preset this to an invalid value + * for the case when firmware does not supply the board ID. + */ + info->board_id = ~0; + /* Now, walk the tables. */ ptr += header->header_bytes; @@ -300,6 +312,9 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info) case CB_TAG_X86_ROM_MTRR: cb_parse_x86_rom_var_mtrr(ptr, info); break; + case CB_TAG_BOARD_ID: + cb_parse_board_id(ptr, info); + break; } ptr += rec->size; diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h index e20249d627..53b5890997 100644 --- a/payloads/libpayload/include/coreboot_tables.h +++ b/payloads/libpayload/include/coreboot_tables.h @@ -205,6 +205,14 @@ struct cb_cbmem_tab { uint64_t cbmem_tab; }; +#define CB_TAG_BOARD_ID 0x0025 +struct cb_board_id { + uint32_t tag; + uint32_t size; + /* Board ID as retrieved from the board revision GPIOs. */ + uint32_t board_id; +}; + #define CB_TAG_X86_ROM_MTRR 0x0021 struct cb_x86_rom_mtrr { uint32_t tag; diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h index 92b8dcabf0..afcf3d8c38 100644 --- a/payloads/libpayload/include/sysinfo.h +++ b/payloads/libpayload/include/sysinfo.h @@ -108,6 +108,7 @@ struct sysinfo_t { void *cbmem_cons; void *mrc_cache; void *acpi_gnvs; + u32 board_id; }; extern struct sysinfo_t lib_sysinfo; |