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

libpayload: Add VPD address into lib_sysinfo 

BUG=chrome-os-partner:56947
TEST=Verifed country code can be parsed from VPD in depthcharge.
BRANCH=None

Change-Id: I2fbbd4a784c50538331747e1ef78c33c6b8a679b
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: acea6e2a200e8bd78fd458255ac7fad307406989
Original-Change-Id: I4616fefc6a377d7830397cdadb493927358e25cc
Original-Signed-off-by: Kan Yan <kyan@google.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/425819
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/18124
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Kan Yan 2017-01-05 19:42:53 -08:00 committed by Martin Roth
parent 828ef4ca36
commit b6cadc6465
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,6 +206,7 @@ struct cb_gpios {
#define CB_TAG_DMA 0x0022 #define CB_TAG_DMA 0x0022
#define CB_TAG_RAM_OOPS 0x0023 #define CB_TAG_RAM_OOPS 0x0023
#define CB_TAG_MTC 0x002b #define CB_TAG_MTC 0x002b
#define CB_TAG_VPD 0x002c
struct lb_range { struct lb_range {
uint32_t tag; uint32_t tag;
uint32_t size; uint32_t size;

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

@ -124,6 +124,7 @@ struct sysinfo_t {
uint64_t boot_media_size; uint64_t boot_media_size;
uint64_t mtc_start; uint64_t mtc_start;
uint32_t mtc_size; uint32_t mtc_size;
void *chromeos_vpd;
}; };
extern struct sysinfo_t lib_sysinfo; extern struct sysinfo_t lib_sysinfo;

9
payloads/libpayload/libc/coreboot.c
View File

@ -228,6 +228,12 @@ static void cb_parse_boot_media_params(unsigned char *ptr,
info->boot_media_size = bmp->boot_media_size; info->boot_media_size = bmp->boot_media_size;
} }
static void cb_parse_vpd(void *ptr, struct sysinfo_t *info)
{
struct cb_cbmem_tab *const cbmem = (struct cb_cbmem_tab *)ptr;
info->chromeos_vpd = phys_to_virt(cbmem->cbmem_tab);
}
#if IS_ENABLED(CONFIG_LP_TIMER_RDTSC) #if IS_ENABLED(CONFIG_LP_TIMER_RDTSC)
static void cb_parse_tsc_info(void *ptr, struct sysinfo_t *info) static void cb_parse_tsc_info(void *ptr, struct sysinfo_t *info)
{ {
@ -398,6 +404,9 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
cb_parse_tsc_info(ptr, info); cb_parse_tsc_info(ptr, info);
break; break;
#endif #endif
case CB_TAG_VPD:
cb_parse_vpd(ptr, info);
break;
default: default:
cb_parse_arch_specific(rec, info); cb_parse_arch_specific(rec, info);
break; break;