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

libpayload: Add fmap_cache to sysinfo_t 

Now that FMAP is cached in CBMEM and its pointer is added to coreboot
table for quick lookup, this change adds a new member "fmap_cache" to
sysinfo_t that can be used by payloads to get to FMAP cache.

BUG=b:141723751

Change-Id: If894c20c2de89a9d8564561bc7780c86f3f4135a
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35640
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Shelley Chen <shchen@google.com>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Furquan Shaikh 2019-09-27 00:02:25 -07:00 committed by Patrick Georgi
parent 86cb421df6
commit 3d4923d85a
3 changed files with 13 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

@ -78,6 +78,7 @@ enum {
CB_TAG_VBOOT_WORKBUF = 0x0034, CB_TAG_VBOOT_WORKBUF = 0x0034,
CB_TAG_MMC_INFO = 0x0035, CB_TAG_MMC_INFO = 0x0035,
CB_TAG_TCPA_LOG = 0x0036, CB_TAG_TCPA_LOG = 0x0036,
CB_TAG_FMAP = 0x0037,
CB_TAG_CMOS_OPTION_TABLE = 0x00c8, CB_TAG_CMOS_OPTION_TABLE = 0x00c8,
CB_TAG_OPTION = 0x00c9, CB_TAG_OPTION = 0x00c9,
CB_TAG_OPTION_ENUM = 0x00ca, CB_TAG_OPTION_ENUM = 0x00ca,

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

@ -128,6 +128,9 @@ struct sysinfo_t {
uint32_t mtc_size; uint32_t mtc_size;
void *chromeos_vpd; void *chromeos_vpd;
int mmc_early_wake_status; int mmc_early_wake_status;
/* Pointer to FMAP cache in CBMEM */
void *fmap_cache;
}; };
extern struct sysinfo_t lib_sysinfo; extern struct sysinfo_t lib_sysinfo;

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

@ -239,6 +239,12 @@ static void cb_parse_vpd(void *ptr, struct sysinfo_t *info)
info->chromeos_vpd = phys_to_virt(cbmem->cbmem_tab); info->chromeos_vpd = phys_to_virt(cbmem->cbmem_tab);
} }
static void cb_parse_fmap_cache(void *ptr, struct sysinfo_t *info)
{
struct cb_cbmem_tab *const cbmem = (struct cb_cbmem_tab *)ptr;
info->fmap_cache = phys_to_virt(cbmem->cbmem_tab);
}
#if CONFIG(LP_TIMER_RDTSC) #if 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)
{ {
@ -412,6 +418,9 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
case CB_TAG_VPD: case CB_TAG_VPD:
cb_parse_vpd(ptr, info); cb_parse_vpd(ptr, info);
break; break;
case CB_TAG_FMAP:
cb_parse_fmap_cache(ptr, info);
break;
default: default:
cb_parse_arch_specific(rec, info); cb_parse_arch_specific(rec, info);
break; break;