coreboot-gerrit July 2015

coreboot-gerrit@coreboot.org

1 participants
1048 discussions

Patch merged into coreboot/master: libpayload: store boot media information in sysinfo
by gerrit＠coreboot.org 14 Jul '15

14 Jul '15

the following patch was just integrated into master: commit f61b35d5b0b25ca766f6d207c4b354407862b973 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue Jul 14 17:15:24 2015 +0100 libpayload: store boot media information in sysinfo Write boot media information in sysinfo, if it exists. This allows picking the right CBFS for further files in case there are several. Change-Id: I75a8ee6b93f349b9f2fab1e82826aba675949c0a Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Reviewed-on: http://review.coreboot.org/10869 Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> Tested-by: build bot (Jenkins) See http://review.coreboot.org/10869 for details. -gerrit

1 0

Patch merged into coreboot/master: cbtable: describe boot media
by gerrit＠coreboot.org 14 Jul '15

14 Jul '15

the following patch was just integrated into master: commit fb5d5b16eef66d37dc20cdf0769c9049bf47d6be Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue Jul 14 17:15:51 2015 +0100 cbtable: describe boot media This allows finding the currently used CBFS (in case there are several), and avoids the need to define flash size when building the payload. Change-Id: I4b00159610077761c501507e136407e9ae08c73e Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Reviewed-on: http://review.coreboot.org/10867 Tested-by: build bot (Jenkins) See http://review.coreboot.org/10867 for details. -gerrit

1 0

New patch to review for coreboot: libpayload: assume cbfs file alignment is 64 byte
by Patrick Georgi 14 Jul '15

14 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10920 -gerrit commit 151a426424297f66d56c3eaba1071b4910611558 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue Jul 14 22:29:04 2015 +0200 libpayload: assume cbfs file alignment is 64 byte Change-Id: I8dfd8fbd452ce92fbca2cf095bc5e43e4a26969d Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/include/cbfs_core.h | 2 +- payloads/libpayload/libcbfs/cbfs_core.c | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h index 1f8b7ee..a633232 100644 --- a/payloads/libpayload/include/cbfs_core.h +++ b/payloads/libpayload/include/cbfs_core.h @@ -94,7 +94,7 @@ struct cbfs_header { uint32_t version; uint32_t romsize; uint32_t bootblocksize; - uint32_t align; + uint32_t align; /* fixed to 64 bytes */ uint32_t offset; uint32_t architecture; uint32_t pad[1]; diff --git a/payloads/libpayload/libcbfs/cbfs_core.c b/payloads/libpayload/libcbfs/cbfs_core.c index 44205f6..98345f1 100644 --- a/payloads/libpayload/libcbfs/cbfs_core.c +++ b/payloads/libpayload/libcbfs/cbfs_core.c @@ -98,7 +98,7 @@ const struct cbfs_header *cbfs_get_header(struct cbfs_media *media) struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) { const char *file_name; - uint32_t offset, align, romsize, name_len; + uint32_t offset, romsize, name_len; const struct cbfs_header *header; struct cbfs_file file, *file_ptr; struct cbfs_media default_media; @@ -116,7 +116,6 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) // Logical offset (for source media) of first file. offset = ntohl(header->offset); - align = ntohl(header->align); romsize = ntohl(header->romsize); // TODO Add a "size" in CBFS header for a platform independent way to @@ -129,13 +128,13 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) // 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) % align)) - romsize -= (align - (ntohl(header->bootblocksize) % align)); + if ((ntohl(header->bootblocksize) % 64)) + romsize -= (64 - (ntohl(header->bootblocksize) % 64)); else romsize -= 1; #endif - DEBUG("CBFS location: 0x%x~0x%x, align: %d\n", offset, romsize, align); + DEBUG("CBFS location: 0x%x~0x%x\n", offset, romsize); DEBUG("Looking for '%s' starting from 0x%x.\n", name, offset); media->open(media); @@ -143,9 +142,9 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) media->read(media, &file, offset, sizeof(file)) == sizeof(file)) { if (memcmp(CBFS_FILE_MAGIC, file.magic, sizeof(file.magic)) != 0) { - uint32_t new_align = align; - if (offset % align) - new_align += align - (offset % align); + uint32_t new_align = 64; + if (offset % 64) + new_align += 64 - (offset % 64); ERROR("ERROR: No file header found at 0x%xx - " "try next aligned address: 0x%x.\n", offset, offset + new_align); @@ -179,8 +178,8 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) // Move to next file. offset += ntohl(file.len) + ntohl(file.offset); - if (offset % align) - offset += align - (offset % align); + if (offset % 64) + offset += 64 - (offset % 64); } media->close(media); LOG("WARNING: '%s' not found.\n", name);

1 0

New patch to review for coreboot: cbfs: hardcode file alignment
by Patrick Georgi 14 Jul '15

14 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10919 -gerrit commit f369ed2b7fc77506c0370cc32e3d162e5d6dfb5c Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue Jul 14 22:28:27 2015 +0200 cbfs: hardcode file alignment Assume that it's 64 byte. Change-Id: I168facd92f64c2cf99c26c350c60317807a4aed4 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- src/arch/x86/mmap_boot.c | 4 +--- src/arch/x86/walkcbfs.S | 17 +++++------------ src/include/cbfs.h | 3 --- src/include/cbfs_serialized.h | 2 +- src/lib/cbfs.c | 9 +++------ src/lib/cbfs_boot_props.c | 2 -- src/vendorcode/google/chromeos/vboot2/vboot_loader.c | 1 - 7 files changed, 10 insertions(+), 28 deletions(-) diff --git a/src/arch/x86/mmap_boot.c b/src/arch/x86/mmap_boot.c index 4dd269b..6c98954 100644 --- a/src/arch/x86/mmap_boot.c +++ b/src/arch/x86/mmap_boot.c @@ -53,13 +53,11 @@ int cbfs_boot_region_properties(struct cbfs_props *props) header.magic = ntohl(header.magic); header.romsize = ntohl(header.romsize); header.bootblocksize = ntohl(header.bootblocksize); - header.align = ntohl(header.align); header.offset = ntohl(header.offset); if (header.magic != CBFS_HEADER_MAGIC) return -1; - props->align = header.align; props->offset = header.offset; if (CONFIG_ROM_SIZE != header.romsize) props->size = CONFIG_ROM_SIZE; @@ -67,7 +65,7 @@ int cbfs_boot_region_properties(struct cbfs_props *props) props->size = header.romsize; props->size -= props->offset; props->size -= header.bootblocksize; - props->size = ALIGN_DOWN(props->size, props->align); + props->size = ALIGN_DOWN(props->size, 64); printk(BIOS_DEBUG, "CBFS @ %zx size %zx\n", props->offset, props->size); diff --git a/src/arch/x86/walkcbfs.S b/src/arch/x86/walkcbfs.S index 60eb8b5..00ac24a 100644 --- a/src/arch/x86/walkcbfs.S +++ b/src/arch/x86/walkcbfs.S @@ -74,13 +74,9 @@ tryharder: mov CBFS_FILE_LEN(%ebx), %edi bswap %edi add %edi, %ecx - mov CBFS_HEADER_PTR, %edi - mov CBFS_HEADER_ALIGN(%edi), %edi - bswap %edi - sub $1, %edi - add %edi, %ecx - not %edi - and %edi, %ecx + /* round by 64 bytes */ + add $(64 - 1), %ecx + and $~(64 - 1), %ecx /* if oldaddr >= addr, leave */ cmp %ebx, %ecx @@ -106,11 +102,8 @@ out: searchfile: - /* if filemagic isn't found, move forward cbfs_header->align bytes */ - mov CBFS_HEADER_PTR, %edi - mov CBFS_HEADER_ALIGN(%edi), %edi - bswap %edi - add %edi, %ebx + /* if filemagic isn't found, move forward 64 bytes */ + add $64, %ebx jmp check_for_exit filemagic: diff --git a/src/include/cbfs.h b/src/include/cbfs.h index 00c43f2..f031141 100644 --- a/src/include/cbfs.h +++ b/src/include/cbfs.h @@ -66,13 +66,10 @@ int cbfs_locate(struct region_device *fh, const struct cbfsd *cbfs, struct cbfsd { const struct region_device *rdev; - size_t align; }; /* The cbfs_props struct describes the properties associated with a CBFS. */ struct cbfs_props { - /* Each file is aligned. */ - size_t align; /* CBFS starts at the following offset within the boot region. */ size_t offset; /* CBFS size. */ diff --git a/src/include/cbfs_serialized.h b/src/include/cbfs_serialized.h index df38857..c8bf79d 100644 --- a/src/include/cbfs_serialized.h +++ b/src/include/cbfs_serialized.h @@ -95,7 +95,7 @@ struct cbfs_header { uint32_t version; uint32_t romsize; uint32_t bootblocksize; - uint32_t align; + uint32_t align; /* fixed to 64 bytes */ uint32_t offset; uint32_t architecture; uint32_t pad[1]; diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index 3e83765..cee18ee 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -57,7 +57,6 @@ int cbfs_boot_locate(struct region_device *fh, const char *name, uint32_t *type) return -1; cbfs.rdev = &rdev; - cbfs.align = props.align; return cbfs_locate(fh, &cbfs, name, type); } @@ -83,11 +82,9 @@ int cbfs_locate(struct region_device *fh, const struct cbfsd *cbfs, { size_t offset; const struct region_device *rd; - size_t align; offset = 0; rd = cbfs->rdev; - align = cbfs->align; LOG("Locating '%s'\n", name); @@ -107,7 +104,7 @@ int cbfs_locate(struct region_device *fh, const struct cbfsd *cbfs, if (memcmp(file.magic, CBFS_FILE_MAGIC, sizeof(file.magic))) { offset++; - offset = ALIGN_UP(offset, align); + offset = ALIGN_UP(offset, 64); continue; } @@ -127,14 +124,14 @@ int cbfs_locate(struct region_device *fh, const struct cbfsd *cbfs, if (!name_match) { DEBUG(" Unmatched '%s' at %zx\n", fname, offset); offset += file.offset + file.len; - offset = ALIGN_UP(offset, align); + offset = ALIGN_UP(offset, 64); continue; } if (type != NULL && *type != file.type) { DEBUG(" Unmatched type %x at %zx\n", file.type, offset); offset += file.offset + file.len; - offset = ALIGN_UP(offset, align); + offset = ALIGN_UP(offset, 64); continue; } diff --git a/src/lib/cbfs_boot_props.c b/src/lib/cbfs_boot_props.c index 21e64d3..7a9f7a9 100644 --- a/src/lib/cbfs_boot_props.c +++ b/src/lib/cbfs_boot_props.c @@ -49,13 +49,11 @@ int __attribute__((weak)) cbfs_boot_region_properties(struct cbfs_props *props) header.magic = ntohl(header.magic); header.romsize = ntohl(header.romsize); - header.align = ntohl(header.align); header.offset = ntohl(header.offset); if (header.magic != CBFS_HEADER_MAGIC) return -1; - props->align = header.align; props->offset = header.offset; props->size = header.romsize; props->size -= props->offset; diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c index 3c0d67e..90ada1e 100644 --- a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c +++ b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c @@ -173,7 +173,6 @@ static int vboot_locate_by_multi_cbfs(const struct region_device *fw_main, return -1; cbfs.rdev = &rdev; - cbfs.align = props.align; return cbfs_locate(asset_rdev(asset), &cbfs, asset_name(asset), NULL); }

1 0

New patch to review for coreboot: cbfstool: fix alignment to 64 byte
by Patrick Georgi 14 Jul '15

14 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10918 -gerrit commit 7536f69603348b60c6ea13973027dd9dd544478e Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue Jul 14 22:18:23 2015 +0200 cbfstool: fix alignment to 64 byte It's not like we _ever_ changed it, so drop the option and make cbfstool use the default. always. Change-Id: Ia1b99fda03d5852137a362422e979f4a4dffc5ed Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- Makefile.inc | 2 +- util/cbfstool/cbfstool.c | 23 +++++++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 347e07b..14fa990 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -573,7 +573,7 @@ prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) $(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(FMAPTOOL) $(CBFSTOOL) $$(cpu_ucode_cbfs_file) $(CBFSTOOL) $@.tmp create \ - -B $(objcbfs)/bootblock.bin -a 64 \ + -B $(objcbfs)/bootblock.bin \ $(CBFSTOOL_PRE1_OPTS) $(prebuild-files) true $(call add-cpu-microcode-to-cbfs,$@.tmp) diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 06d0cef..4469cb4 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -65,7 +65,6 @@ static struct param { uint32_t headeroffset_assigned; uint32_t entrypoint; uint32_t size; - uint32_t alignment; uint32_t pagesize; uint32_t cbfsoffset; uint32_t cbfsoffset_assigned; @@ -372,9 +371,8 @@ static int cbfs_create(void) param.baseaddress_assigned || param.headeroffset_assigned || param.cbfsoffset_assigned || - param.alignment || param.bootblock) { - ERROR("Since -M was provided, -m, -s, -b, -o, -H, -a, and -B should be omitted\n"); + ERROR("Since -M was provided, -m, -s, -b, -o, -H, and -B should be omitted\n"); return 1; } @@ -394,9 +392,6 @@ static int cbfs_create(void) return 1; } - if (!param.alignment) - param.alignment = 64; // default CBFS entry alignment - // Set default offsets. x86, as usual, needs to be a special snowflake. if (!param.baseaddress_assigned) { if (param.arch == CBFS_ARCHITECTURE_X86) { @@ -430,7 +425,7 @@ static int cbfs_create(void) } else { param.cbfsoffset = align_up(param.headeroffset + sizeof(struct cbfs_header), - param.alignment); + 64); DEBUG("CBFS entries start beind master header (%#x).\n", param.cbfsoffset); } @@ -438,7 +433,7 @@ static int cbfs_create(void) int ret = cbfs_legacy_image_create(&image, param.arch, - param.alignment, + 64, &bootblock, param.baseaddress, param.headeroffset, @@ -474,12 +469,12 @@ static int cbfs_locate(void) } int32_t address = cbfs_locate_entry(&image, param.name, buffer.size, - param.pagesize, param.alignment); + param.pagesize, 64); buffer_delete(&buffer); if (address == -1) { ERROR("'%s' can't fit in CBFS for page-size %#x, align %#x.\n", - param.name, param.pagesize, param.alignment); + param.name, param.pagesize, 64); return 1; } @@ -743,9 +738,9 @@ static const struct command commands[] = { {"add-stage", "H:r:f:n:t:c:b:S:vh?", cbfs_add_stage, true, true}, {"add-int", "H:r:i:n:b:vh?", cbfs_add_integer, true, true}, {"copy", "H:D:s:h?", cbfs_copy, true, true}, - {"create", "M:r:s:B:b:H:a:o:m:vh?", cbfs_create, true, true}, + {"create", "M:r:s:B:b:H:o:m:vh?", cbfs_create, true, true}, {"extract", "H:r:n:f:vh?", cbfs_extract, true, false}, - {"locate", "H:r:f:n:P:a:Tvh?", cbfs_locate, true, false}, + {"locate", "H:r:f:n:P:Tvh?", cbfs_locate, true, false}, {"layout", "wvh?", cbfs_layout, false, false}, {"print", "H:r:vh?", cbfs_print, true, false}, {"read", "r:f:vh?", cbfs_read, true, false}, @@ -755,7 +750,6 @@ static const struct command commands[] = { }; static struct option long_options[] = { - {"alignment", required_argument, 0, 'a' }, {"base-address", required_argument, 0, 'b' }, {"bootblock", required_argument, 0, 'B' }, {"cmdline", required_argument, 0, 'C' }, @@ -1023,9 +1017,6 @@ int main(int argc, char **argv) param.copyoffset = strtoul(optarg, NULL, 0); param.copyoffset_assigned = 1; break; - case 'a': - param.alignment = strtoul(optarg, NULL, 0); - break; case 'P': param.pagesize = strtoul(optarg, NULL, 0); break;

1 0

Patch set updated for coreboot: libpayload: store boot media information in sysinfo
by Patrick Georgi 14 Jul '15

14 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10869 -gerrit commit 28e9b8128879374f76704782a06de3a4bfd36cb3 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue Jul 14 17:15:24 2015 +0100 libpayload: store boot media information in sysinfo Write boot media information in sysinfo, if it exists. This allows picking the right CBFS for further files in case there are several. Change-Id: I75a8ee6b93f349b9f2fab1e82826aba675949c0a Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/include/coreboot_tables.h | 11 +++++++++++ payloads/libpayload/include/sysinfo.h | 4 ++++ payloads/libpayload/libc/coreboot.c | 14 ++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h index 0c516b1..24cbf45 100644 --- a/payloads/libpayload/include/coreboot_tables.h +++ b/payloads/libpayload/include/coreboot_tables.h @@ -257,6 +257,17 @@ struct cb_spi_flash { uint32_t erase_cmd; }; +#define CB_TAG_BOOT_MEDIA_PARAMS 0x0030 +struct cb_boot_media_params { + uint32_t tag; + uint32_t size; + /* offsets are relative to start of boot media */ + uint64_t fmap_offset; + uint64_t cbfs_offset; + uint64_t cbfs_size; + uint64_t boot_media_size; +}; + #define CB_TAG_SERIALNO 0x002a #define CB_MAX_SERIALNO_LENGTH 32 diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h index c407c3d..b97ae14 100644 --- a/payloads/libpayload/include/sysinfo.h +++ b/payloads/libpayload/include/sysinfo.h @@ -124,6 +124,10 @@ struct sysinfo_t { uint32_t sector_size; uint32_t erase_cmd; } spi_flash; + uint64_t fmap_offset; + uint64_t cbfs_offset; + uint64_t cbfs_size; + uint64_t boot_media_size; uint64_t mtc_start; uint32_t mtc_size; }; diff --git a/payloads/libpayload/libc/coreboot.c b/payloads/libpayload/libc/coreboot.c index 8a5d3ae..3e248e1 100644 --- a/payloads/libpayload/libc/coreboot.c +++ b/payloads/libpayload/libc/coreboot.c @@ -220,6 +220,17 @@ static void cb_parse_spi_flash(void *ptr, struct sysinfo_t *info) info->spi_flash.erase_cmd = flash->erase_cmd; } +static void cb_parse_boot_media_params(unsigned char *ptr, + struct sysinfo_t *info) +{ + struct cb_boot_media_params *const bmp = + (struct cb_boot_media_params *)ptr; + info->fmap_offset = bmp->fmap_offset; + info->cbfs_offset = bmp->cbfs_offset; + info->cbfs_size = bmp->cbfs_size; + info->boot_media_size = bmp->boot_media_size; +} + int cb_parse_header(void *addr, int len, struct sysinfo_t *info) { struct cb_header *header; @@ -372,6 +383,9 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info) case CB_TAG_MTC: cb_parse_mtc(ptr, info); break; + case CB_TAG_BOOT_MEDIA_PARAMS: + cb_parse_boot_media_params(ptr, info); + break; default: cb_parse_arch_specific(rec, info); break;

1 0

Patch set updated for coreboot: cbtable: describe boot media
by Patrick Georgi 14 Jul '15

14 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10867 -gerrit commit 5a3580c4f1425d2753993b93a34d548266fe728d Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue Jul 14 17:15:51 2015 +0100 cbtable: describe boot media This allows finding the currently used CBFS (in case there are several), and avoids the need to define flash size when building the payload. Change-Id: I4b00159610077761c501507e136407e9ae08c73e Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- src/include/boot/coreboot_tables.h | 11 +++++++++++ src/lib/coreboot_table.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index c8d5251..3dddde5 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -297,6 +297,17 @@ struct lb_spi_flash { uint32_t erase_cmd; }; +#define LB_TAG_BOOT_MEDIA_PARAMS 0x0030 +struct lb_boot_media_params { + uint32_t tag; + uint32_t size; + /* offsets are relative to start of boot media */ + uint64_t fmap_offset; + uint64_t cbfs_offset; + uint64_t cbfs_size; + uint64_t boot_media_size; +}; + #define LB_TAG_SERIALNO 0x002a #define MAX_SERIALNO_LENGTH 32 diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index f7fb2bb..6859bf2 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -23,10 +23,12 @@ #include <console/uart.h> #include <ip_checksum.h> #include <boot/coreboot_tables.h> +#include <boot_device.h> #include <string.h> #include <version.h> #include <boardid.h> #include <device/device.h> +#include <fmap.h> #include <stdlib.h> #include <cbfs.h> #include <cbmem.h> @@ -228,6 +230,36 @@ static void lb_board_id(struct lb_header *header) #endif } +static void lb_boot_media_params(struct lb_header *header) +{ + struct lb_boot_media_params *bmp; + struct cbfs_props props; + const struct region_device *boot_dev; + struct region_device fmrd; + + boot_device_init(); + + if (cbfs_boot_region_properties(&props)) + return; + + boot_dev = boot_device_ro(); + if (boot_dev == NULL) + return; + + bmp = (struct lb_boot_media_params *)lb_new_record(header); + bmp->tag = LB_TAG_BOOT_MEDIA_PARAMS; + bmp->size = sizeof(*bmp); + + bmp->cbfs_offset = props.offset; + bmp->cbfs_size = props.size; + bmp->boot_media_size = region_device_sz(boot_dev); + + bmp->fmap_offset = ~(uint64_t)0; + if (find_fmap_directory(&fmrd) == 0) { + bmp->fmap_offset = region_device_offset(&fmrd); + } +} + static void lb_ram_code(struct lb_header *header) { #if IS_ENABLED(CONFIG_RAM_CODE_SUPPORT) @@ -483,6 +515,8 @@ unsigned long write_coreboot_table( lb_ramoops(head); #endif + lb_boot_media_params(head); + /* Remember where my valid memory ranges are */ return lb_table_fini(head); }

1 0

Patch set updated for coreboot: libpayload: store boot media information in sysinfo
by Patrick Georgi 14 Jul '15

14 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10869 -gerrit commit 414bb4ba1aa7e7ecf690de73ef2d540c701bcf71 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue Jul 14 17:15:24 2015 +0100 libpayload: store boot media information in sysinfo Write boot media information in sysinfo, if it exists. This allows picking the right CBFS for further files in case there are several. Change-Id: I75a8ee6b93f349b9f2fab1e82826aba675949c0a Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/include/coreboot_tables.h | 11 +++++++++++ payloads/libpayload/include/sysinfo.h | 4 ++++ payloads/libpayload/libc/coreboot.c | 14 ++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h index 0c516b1..24cbf45 100644 --- a/payloads/libpayload/include/coreboot_tables.h +++ b/payloads/libpayload/include/coreboot_tables.h @@ -257,6 +257,17 @@ struct cb_spi_flash { uint32_t erase_cmd; }; +#define CB_TAG_BOOT_MEDIA_PARAMS 0x0030 +struct cb_boot_media_params { + uint32_t tag; + uint32_t size; + /* offsets are relative to start of boot media */ + uint64_t fmap_offset; + uint64_t cbfs_offset; + uint64_t cbfs_size; + uint64_t boot_media_size; +}; + #define CB_TAG_SERIALNO 0x002a #define CB_MAX_SERIALNO_LENGTH 32 diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h index c407c3d..54f5e12 100644 --- a/payloads/libpayload/include/sysinfo.h +++ b/payloads/libpayload/include/sysinfo.h @@ -124,6 +124,10 @@ struct sysinfo_t { uint32_t sector_size; uint32_t erase_cmd; } spi_flash; + uint32_t fmap_offset; + uint32_t cbfs_offset; + uint32_t cbfs_size; + uint32_t boot_media_size; uint64_t mtc_start; uint32_t mtc_size; }; diff --git a/payloads/libpayload/libc/coreboot.c b/payloads/libpayload/libc/coreboot.c index 8a5d3ae..3e248e1 100644 --- a/payloads/libpayload/libc/coreboot.c +++ b/payloads/libpayload/libc/coreboot.c @@ -220,6 +220,17 @@ static void cb_parse_spi_flash(void *ptr, struct sysinfo_t *info) info->spi_flash.erase_cmd = flash->erase_cmd; } +static void cb_parse_boot_media_params(unsigned char *ptr, + struct sysinfo_t *info) +{ + struct cb_boot_media_params *const bmp = + (struct cb_boot_media_params *)ptr; + info->fmap_offset = bmp->fmap_offset; + info->cbfs_offset = bmp->cbfs_offset; + info->cbfs_size = bmp->cbfs_size; + info->boot_media_size = bmp->boot_media_size; +} + int cb_parse_header(void *addr, int len, struct sysinfo_t *info) { struct cb_header *header; @@ -372,6 +383,9 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info) case CB_TAG_MTC: cb_parse_mtc(ptr, info); break; + case CB_TAG_BOOT_MEDIA_PARAMS: + cb_parse_boot_media_params(ptr, info); + break; default: cb_parse_arch_specific(rec, info); break;

1 0

Patch set updated for coreboot: cbtable: describe boot media
by Patrick Georgi 14 Jul '15

14 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10867 -gerrit commit 8e04cc0c44d7963915801eb7f5cea3aeee89b1b0 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue Jul 14 17:15:51 2015 +0100 cbtable: describe boot media This allows finding the currently used CBFS (in case there are several), and avoids the need to define flash size when building the payload. Change-Id: I4b00159610077761c501507e136407e9ae08c73e Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- src/include/boot/coreboot_tables.h | 11 +++++++++++ src/lib/coreboot_table.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index c8d5251..3dddde5 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -297,6 +297,17 @@ struct lb_spi_flash { uint32_t erase_cmd; }; +#define LB_TAG_BOOT_MEDIA_PARAMS 0x0030 +struct lb_boot_media_params { + uint32_t tag; + uint32_t size; + /* offsets are relative to start of boot media */ + uint64_t fmap_offset; + uint64_t cbfs_offset; + uint64_t cbfs_size; + uint64_t boot_media_size; +}; + #define LB_TAG_SERIALNO 0x002a #define MAX_SERIALNO_LENGTH 32 diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index f7fb2bb..a41fb29 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -23,10 +23,12 @@ #include <console/uart.h> #include <ip_checksum.h> #include <boot/coreboot_tables.h> +#include <boot_device.h> #include <string.h> #include <version.h> #include <boardid.h> #include <device/device.h> +#include <fmap.h> #include <stdlib.h> #include <cbfs.h> #include <cbmem.h> @@ -228,6 +230,36 @@ static void lb_board_id(struct lb_header *header) #endif } +static void lb_boot_media_params(struct lb_header *header) +{ + struct lb_boot_media_params *bmp; + struct cbfs_props props; + const struct region_device *boot_dev; + struct region_device fmrd; + + boot_device_init(); + + if (cbfs_boot_region_properties(&props)) + return; + + boot_dev = boot_device_ro(); + if (boot_dev == NULL) + return; + + bmp = (struct lb_boot_media_params *)lb_new_record(header); + bmp->tag = LB_TAG_BOOT_MEDIA_PARAMS; + bmp->size = sizeof(*bmp); + + bmp->cbfs_offset = props.offset; + bmp->cbfs_size = props.size; + bmp->boot_media_size = region_device_sz(boot_dev); + + bmp->fmap_offset = ~0; + if (find_fmap_directory(&fmrd) == 0) { + bmp->fmap_offset = region_device_offset(&fmrd); + } +} + static void lb_ram_code(struct lb_header *header) { #if IS_ENABLED(CONFIG_RAM_CODE_SUPPORT) @@ -483,6 +515,8 @@ unsigned long write_coreboot_table( lb_ramoops(head); #endif + lb_boot_media_params(head); + /* Remember where my valid memory ranges are */ return lb_table_fini(head); }

1 0

Patch set updated for coreboot: libpayload: store boot media information in sysinfo
by Patrick Georgi 14 Jul '15

14 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10869 -gerrit commit 49cc830e494b7f972596e3bfa96bc700644d9bbe Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue Jul 14 17:15:24 2015 +0100 libpayload: store boot media information in sysinfo Write boot media information in sysinfo, if it exists. This allows picking the right CBFS for further files in case there are several. Change-Id: I75a8ee6b93f349b9f2fab1e82826aba675949c0a Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/include/coreboot_tables.h | 11 +++++++++++ payloads/libpayload/include/sysinfo.h | 4 ++++ payloads/libpayload/libc/coreboot.c | 14 ++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h index 0c516b1..24cbf45 100644 --- a/payloads/libpayload/include/coreboot_tables.h +++ b/payloads/libpayload/include/coreboot_tables.h @@ -257,6 +257,17 @@ struct cb_spi_flash { uint32_t erase_cmd; }; +#define CB_TAG_BOOT_MEDIA_PARAMS 0x0030 +struct cb_boot_media_params { + uint32_t tag; + uint32_t size; + /* offsets are relative to start of boot media */ + uint64_t fmap_offset; + uint64_t cbfs_offset; + uint64_t cbfs_size; + uint64_t boot_media_size; +}; + #define CB_TAG_SERIALNO 0x002a #define CB_MAX_SERIALNO_LENGTH 32 diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h index c407c3d..54f5e12 100644 --- a/payloads/libpayload/include/sysinfo.h +++ b/payloads/libpayload/include/sysinfo.h @@ -124,6 +124,10 @@ struct sysinfo_t { uint32_t sector_size; uint32_t erase_cmd; } spi_flash; + uint32_t fmap_offset; + uint32_t cbfs_offset; + uint32_t cbfs_size; + uint32_t boot_media_size; uint64_t mtc_start; uint32_t mtc_size; }; diff --git a/payloads/libpayload/libc/coreboot.c b/payloads/libpayload/libc/coreboot.c index 8a5d3ae..3e248e1 100644 --- a/payloads/libpayload/libc/coreboot.c +++ b/payloads/libpayload/libc/coreboot.c @@ -220,6 +220,17 @@ static void cb_parse_spi_flash(void *ptr, struct sysinfo_t *info) info->spi_flash.erase_cmd = flash->erase_cmd; } +static void cb_parse_boot_media_params(unsigned char *ptr, + struct sysinfo_t *info) +{ + struct cb_boot_media_params *const bmp = + (struct cb_boot_media_params *)ptr; + info->fmap_offset = bmp->fmap_offset; + info->cbfs_offset = bmp->cbfs_offset; + info->cbfs_size = bmp->cbfs_size; + info->boot_media_size = bmp->boot_media_size; +} + int cb_parse_header(void *addr, int len, struct sysinfo_t *info) { struct cb_header *header; @@ -372,6 +383,9 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info) case CB_TAG_MTC: cb_parse_mtc(ptr, info); break; + case CB_TAG_BOOT_MEDIA_PARAMS: + cb_parse_boot_media_params(ptr, info); + break; default: cb_parse_arch_specific(rec, info); break;

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2015