GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: Add board id parsing 

Make board ID value supplied in the coreboot table available to the
bootloader on all three architectures.

BUG=chrome-os-partner:30489
TEST=none yet

Change-Id: I6c2d39e94212b55650929d7d99896581d23f789d
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 723e4a600a5d3a03e960169b04f8322f6dd2486b
Original-Change-Id: I7847bd9fe2d000a29c7ae95144f4868d926fb198
Original-Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/210430
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: http://review.coreboot.org/8730
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Vadim Bendebury 2014-07-29 17:51:29 -07:00 committed by Patrick Georgi
parent 562d71faea
commit 6051e8334e
5 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
payloads/libpayload/arch/arm/coreboot.c
View File

@ -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); 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 #ifdef CONFIG_LP_NVRAM
static void cb_parse_optiontable(void *ptr, struct sysinfo_t *info) 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; 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. */ /* Now, walk the tables. */
ptr += header->header_bytes; ptr += header->header_bytes;
@ -288,6 +300,9 @@ static int cb_parse_header(void *addr, struct sysinfo_t *info)
case CB_TAG_MRC_CACHE: case CB_TAG_MRC_CACHE:
cb_parse_mrc_cache(ptr, info); cb_parse_mrc_cache(ptr, info);
break; break;
case CB_TAG_BOARD_ID:
cb_parse_board_id(ptr, info);
break;
} }
ptr += rec->size; ptr += rec->size;

15
payloads/libpayload/arch/arm64/coreboot.c
View File

@ -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); 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 #ifdef CONFIG_LP_NVRAM
static void cb_parse_optiontable(void *ptr, struct sysinfo_t *info) 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; 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. */ /* Now, walk the tables. */
ptr += header->header_bytes; ptr += header->header_bytes;
@ -288,6 +300,9 @@ static int cb_parse_header(void *addr, struct sysinfo_t *info)
case CB_TAG_MRC_CACHE: case CB_TAG_MRC_CACHE:
cb_parse_mrc_cache(ptr, info); cb_parse_mrc_cache(ptr, info);
break; break;
case CB_TAG_BOARD_ID:
cb_parse_board_id(ptr, info);
break;
} }
ptr += rec->size; ptr += rec->size;

15
payloads/libpayload/arch/x86/coreboot.c
View File

@ -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); 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 #ifdef CONFIG_LP_NVRAM
static void cb_parse_optiontable(void *ptr, struct sysinfo_t *info) 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; 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. */ /* Now, walk the tables. */
ptr += header->header_bytes; 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: case CB_TAG_X86_ROM_MTRR:
cb_parse_x86_rom_var_mtrr(ptr, info); cb_parse_x86_rom_var_mtrr(ptr, info);
break; break;
case CB_TAG_BOARD_ID:
cb_parse_board_id(ptr, info);
break;
} }
ptr += rec->size; ptr += rec->size;

8
payloads/libpayload/include/coreboot_tables.h
View File

@ -205,6 +205,14 @@ struct cb_cbmem_tab {
uint64_t 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 #define CB_TAG_X86_ROM_MTRR 0x0021
struct cb_x86_rom_mtrr { struct cb_x86_rom_mtrr {
uint32_t tag; uint32_t tag;

1
payloads/libpayload/include/sysinfo.h
View File

@ -108,6 +108,7 @@ struct sysinfo_t {
void *cbmem_cons; void *cbmem_cons;
void *mrc_cache; void *mrc_cache;
void *acpi_gnvs; void *acpi_gnvs;
u32 board_id;
}; };
extern struct sysinfo_t lib_sysinfo; extern struct sysinfo_t lib_sysinfo;