diff options
| author | David Hendricks <dhendrix@chromium.org> | 2014-11-20 13:59:45 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-03-21 11:04:03 +0100 |
| commit | 272afe8030e1c0f371617a654656ec22c1b67ccf (patch) | |
| tree | df7330a8daa3f323a3c93e75563089eb2956319f | |
| parent | 6b322cc6199bd5dd29345b35b43209b3511e1112 (diff) | |
libpayload: Add RAM code to sysinfo_t
This adds CB_TAG_RAM_CODE and an entry to sysinfo_t.
BUG=chrome-os-partner:31728
BRANCH=none
TEST=Built and booted on pinky w/ depthcharge patch and saw that
/proc/device-tree/firmware/coreboot/ram-code contains correct
value
Change-Id: I35ee1bcdc77bc6d4d24c1e804aefdbbfaa3875a4
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: ca6d044f2e719ded1d78a5ab3d923e06c3b88d6b
Original-Signed-off-by: David Hendricks <dhendrix@chromium.org>
Original-Change-Id: I69ee1fc7bc09c9d1c387efe2d171c57e62cfaf3f
Original-Reviewed-on: https://chromium-review.googlesource.com/231132
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: http://review.coreboot.org/8755
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
| -rw-r--r-- | payloads/libpayload/include/coreboot_tables.h | 7 | ||||
| -rw-r--r-- | payloads/libpayload/include/sysinfo.h | 1 | ||||
| -rw-r--r-- | payloads/libpayload/libc/coreboot.c | 15 |
3 files changed, 21 insertions, 2 deletions
diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h index e9c159d8bc..a3a0a05a32 100644 --- a/payloads/libpayload/include/coreboot_tables.h +++ b/payloads/libpayload/include/coreboot_tables.h @@ -239,6 +239,13 @@ struct cb_macs { struct mac_address mac_addrs[0]; }; +#define CB_TAG_RAM_CODE 0x0028 +struct cb_ram_code { + uint32_t tag; + uint32_t size; + uint32_t ram_code; +}; + #define CB_TAG_CMOS_OPTION_TABLE 0x00c8 struct cb_cmos_option_table { u32 tag; diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h index 825e4ef2ad..e15d186533 100644 --- a/payloads/libpayload/include/sysinfo.h +++ b/payloads/libpayload/include/sysinfo.h @@ -114,6 +114,7 @@ struct sysinfo_t { void *mrc_cache; void *acpi_gnvs; u32 board_id; + u32 ram_code; void *wifi_calibration; uint64_t ramoops_buffer; uint32_t ramoops_buffer_size; diff --git a/payloads/libpayload/libc/coreboot.c b/payloads/libpayload/libc/coreboot.c index 489adf4a9f..1f1cf320a2 100644 --- a/payloads/libpayload/libc/coreboot.c +++ b/payloads/libpayload/libc/coreboot.c @@ -154,6 +154,12 @@ static void cb_parse_board_id(unsigned char *ptr, struct sysinfo_t *info) info->board_id = cbbid->board_id; } +static void cb_parse_ram_code(unsigned char *ptr, struct sysinfo_t *info) +{ + struct cb_ram_code *const ram_code = (struct cb_ram_code *)ptr; + info->ram_code = ram_code->ram_code; +} + #ifdef CONFIG_LP_NVRAM static void cb_parse_optiontable(void *ptr, struct sysinfo_t *info) { @@ -228,10 +234,12 @@ 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. + * Board straps represented by numerical values are small numbers. + * Preset them to an invalid value in case the firmware does not + * supply the info. */ info->board_id = ~0; + info->ram_code = ~0; /* Now, walk the tables. */ ptr += header->header_bytes; @@ -329,6 +337,9 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info) case CB_TAG_BOARD_ID: cb_parse_board_id(ptr, info); break; + case CB_TAG_RAM_CODE: + cb_parse_ram_code(ptr, info); + break; case CB_TAG_WIFI_CALIBRATION: cb_parse_wifi_calibration(ptr, info); break; |