From 2ccb280f512b7ef3ba00d4ed7beb69269af33f09 Mon Sep 17 00:00:00 2001 From: Daisuke Nojiri Date: Wed, 2 Sep 2015 10:53:13 -0700 Subject: [PATCH] cbfs: read cbfs offset and size from sysinfo This change allows libpayload to read cbfs offset and size from sysinfo. Legacy way of locating cbfs reagion is still supported in case sysinfo doesn't store the offset and the size. BUG=none BRANCH=master TEST=tested on samus and smaug Change-Id: I86434fd249467e7c90d59d6b82f0e6c514bc2d05 Signed-off-by: Patrick Georgi Original-Commit-Id: 548a74b7a0758c3f9ba6809425d0fb9c6a5e9d7c Original-Change-Id: I190d5545a65228483204bf1aa1cbf5a80db31ae0 Original-Signed-off-by: Daisuke Nojiri Original-Reviewed-on: https://chromium-review.googlesource.com/296993 Original-Commit-Ready: Daisuke Nojiri Original-Tested-by: Daisuke Nojiri Original-Reviewed-by: Aaron Durbin Reviewed-on: http://review.coreboot.org/11557 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- payloads/libpayload/libcbfs/cbfs_core.c | 72 ++++++++++++++++--------- 1 file changed, 46 insertions(+), 26 deletions(-) diff --git a/payloads/libpayload/libcbfs/cbfs_core.c b/payloads/libpayload/libcbfs/cbfs_core.c index a4cb033c3b..ff3c527f46 100644 --- a/payloads/libpayload/libcbfs/cbfs_core.c +++ b/payloads/libpayload/libcbfs/cbfs_core.c @@ -47,6 +47,7 @@ #include #include +#include /* returns a pointer to CBFS master header, or CBFS_HEADER_INVALID_ADDRESS * on failure */ @@ -94,12 +95,50 @@ const struct cbfs_header *cbfs_get_header(struct cbfs_media *media) return header; } +static int get_cbfs_range(uint32_t *offset, uint32_t *cbfs_end, + struct cbfs_media *media) +{ + const struct cbfs_header *header; + + if (lib_sysinfo.cbfs_offset && lib_sysinfo.cbfs_size) { + *offset = lib_sysinfo.cbfs_offset; + *cbfs_end = *offset + lib_sysinfo.cbfs_size; + return 0; + } + + /* + * If sysinfo doesn't have offset or size, we read them from + * a master header. + */ + DEBUG("CBFS offset & size not found in sysinfo\n"); + header = cbfs_get_header(media); + if (header == CBFS_HEADER_INVALID_ADDRESS) + return -1; + // Logical offset (for source media) of first file. + *offset = ntohl(header->offset); + *cbfs_end = ntohl(header->romsize); +#if IS_ENABLED(CONFIG_LP_ARCH_X86) + // resolve actual length of ROM used for CBFS components + // the bootblock size was not taken into account + *cbfs_end -= ntohl(header->bootblocksize); + + // fine tune the length to handle alignment positioning. + // using (bootblock size) % align, to derive the + // number of bytes the bootblock is off from the alignment size. + if ((ntohl(header->bootblocksize) % CBFS_ALIGNMENT)) + *cbfs_end -= (CBFS_ALIGNMENT - + (ntohl(header->bootblocksize) % CBFS_ALIGNMENT)); + else + *cbfs_end -= 1; +#endif + return 0; +} + /* public API starts here*/ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) { const char *vardata; - uint32_t offset, romsize, vardata_len; - const struct cbfs_header *header; + uint32_t offset, cbfs_end, vardata_len; struct cbfs_file file, *file_ptr; struct cbfs_media default_media; @@ -111,35 +150,16 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) } } - if (CBFS_HEADER_INVALID_ADDRESS == (header = cbfs_get_header(media))) + if (get_cbfs_range(&offset, &cbfs_end, media)) { + ERROR("Failed to find cbfs range\n"); return NULL; + } - // Logical offset (for source media) of first file. - offset = ntohl(header->offset); - romsize = ntohl(header->romsize); - - // TODO Add a "size" in CBFS header for a platform independent way to - // determine the end of CBFS data. -#if IS_ENABLED(CONFIG_LP_ARCH_X86) - // resolve actual length of ROM used for CBFS components - // the bootblock size was not taken into account - romsize -= ntohl(header->bootblocksize); - - // fine tune the length to handle alignment positioning. - // using (bootblock size) % align, to derive the - // number of bytes the bootblock is off from the alignment size. - if ((ntohl(header->bootblocksize) % CBFS_ALIGNMENT)) - romsize -= (CBFS_ALIGNMENT - - (ntohl(header->bootblocksize) % CBFS_ALIGNMENT)); - else - romsize -= 1; -#endif - - DEBUG("CBFS location: 0x%x~0x%x\n", offset, romsize); + DEBUG("CBFS location: 0x%x~0x%x\n", offset, cbfs_end); DEBUG("Looking for '%s' starting from 0x%x.\n", name, offset); media->open(media); - while (offset < romsize && + while (offset < cbfs_end && media->read(media, &file, offset, sizeof(file)) == sizeof(file)) { if (memcmp(CBFS_FILE_MAGIC, file.magic, sizeof(file.magic)) != 0) {