coreboot-gerrit August 2015

coreboot-gerrit@coreboot.org

1 participants
814 discussions

Patch set updated for coreboot: amd: raminit sysinfo offset fix
by Patrick Georgi 12 Aug '15

12 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10961 -gerrit commit 17e508a01735c723ca9194fa9d875d9c5eea200c Author: Aaron Durbin <adurbin(a)chromium.org> Date: Thu Jul 16 16:07:02 2015 -0500 amd: raminit sysinfo offset fix The sysinfo object within the k8 ram init is used to communicate progess/status from all the nodes in the system. However, the code was assuming where the sysinfo object lived in cache-as-ram. The layout of cache-as-ram is dynamic so one needs to do the lookup of the correct address at runtime. The way the amd code is compiled by #include'ing .c files makes the solution a little more complex in that some cache-as-ram support code needed to be refactored. Change-Id: I6500fa7b005dc082c4c0b3382ee2c3a138d9ac31 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/arch/x86/include/arch/early_variables.h | 16 ++++++++++++++++ src/cpu/amd/car/post_cache_as_ram.c | 12 ++---------- src/cpu/x86/car.c | 9 +++------ src/northbridge/amd/amdk8/f.h | 3 ++- src/northbridge/amd/amdk8/pre_f.h | 3 ++- src/northbridge/amd/amdk8/raminit.c | 3 --- src/northbridge/amd/amdk8/raminit_f.c | 3 --- src/northbridge/amd/amdk8/raminit_f_dqs.c | 6 +++++- 8 files changed, 30 insertions(+), 25 deletions(-) diff --git a/src/arch/x86/include/arch/early_variables.h b/src/arch/x86/include/arch/early_variables.h index d9f1cd7..7ccb340 100644 --- a/src/arch/x86/include/arch/early_variables.h +++ b/src/arch/x86/include/arch/early_variables.h @@ -20,6 +20,8 @@ #ifndef ARCH_EARLY_VARIABLES_H #define ARCH_EARLY_VARIABLES_H +#include <stdlib.h> + #if defined(__PRE_RAM__) && IS_ENABLED(CONFIG_CACHE_AS_RAM) asm(".section .car.global_data,\"w\",@nobits"); asm(".previous"); @@ -43,6 +45,20 @@ void *car_sync_var_ptr(void *var); #define car_set_var(var, val) \ do { car_get_var(var) = (val); } while(0) +extern char _car_data_start[]; +extern char _car_data_end[]; + +static inline size_t car_data_size(void) +{ + size_t car_size = &_car_data_end[0] - &_car_data_start[0]; + return ALIGN(car_size, 64); +} + +static inline size_t car_object_offset(void *ptr) +{ + return (char *)ptr - &_car_data_start[0]; +} + #else #define CAR_GLOBAL static inline void *car_get_var_ptr(void *var) { return var; } diff --git a/src/cpu/amd/car/post_cache_as_ram.c b/src/cpu/amd/car/post_cache_as_ram.c index 6c32090..96df3e7 100644 --- a/src/cpu/amd/car/post_cache_as_ram.c +++ b/src/cpu/amd/car/post_cache_as_ram.c @@ -3,6 +3,7 @@ */ #include <string.h> #include <arch/stages.h> +#include <arch/early_variables.h> #include <cpu/x86/mtrr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/car.h> @@ -22,18 +23,9 @@ #define print_car_debug(x) #endif -extern char _car_data_start[]; -extern char _car_data_end[]; - -static size_t car_data_size(void) -{ - size_t car_size = &_car_data_end[0] - &_car_data_start[0]; - return ALIGN(car_size, 64); -} - static size_t backup_size(void) { - size_t car_size = &_car_data_end[0] - &_car_data_start[0]; + size_t car_size = car_data_size(); return ALIGN(car_size + 1024, 1024); } diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c index b4345ea..cdf7cfc 100644 --- a/src/cpu/x86/car.c +++ b/src/cpu/x86/car.c @@ -30,9 +30,6 @@ typedef void (* const car_migration_func_t)(void); extern car_migration_func_t _car_migrate_start; -extern char _car_data_start[]; -extern char _car_data_end[]; - /* * The car_migrated global variable determines if the cache-as-ram space has * been migrated to real RAM. It does this by assuming the following things: @@ -117,20 +114,20 @@ void *car_sync_var_ptr(void *var) static void do_car_migrate_variables(void) { void *migrated_base; - size_t car_data_size = &_car_data_end[0] - &_car_data_start[0]; + size_t car_size = car_data_size(); /* Check if already migrated. */ if (car_migrated) return; - migrated_base = cbmem_add(CBMEM_ID_CAR_GLOBALS, car_data_size); + migrated_base = cbmem_add(CBMEM_ID_CAR_GLOBALS, car_size); if (migrated_base == NULL) { printk(BIOS_ERR, "Could not migrate CAR data!\n"); return; } - memcpy(migrated_base, &_car_data_start[0], car_data_size); + memcpy(migrated_base, &_car_data_start[0], car_size); /* Mark that the data has been moved. */ car_migrated = ~0; diff --git a/src/northbridge/amd/amdk8/f.h b/src/northbridge/amd/amdk8/f.h index 4f958c5..af4658d 100644 --- a/src/northbridge/amd/amdk8/f.h +++ b/src/northbridge/amd/amdk8/f.h @@ -519,7 +519,8 @@ struct sys_info { } __attribute__((packed)); #ifdef __PRE_RAM__ -extern struct sys_info sysinfo_car; +#include <arch/early_variables.h> +struct sys_info sysinfo_car CAR_GLOBAL; #endif #include <reset.h> diff --git a/src/northbridge/amd/amdk8/pre_f.h b/src/northbridge/amd/amdk8/pre_f.h index 0e0f9f4..c413b5b 100644 --- a/src/northbridge/amd/amdk8/pre_f.h +++ b/src/northbridge/amd/amdk8/pre_f.h @@ -263,7 +263,8 @@ struct sys_info { } __attribute__((packed)); #ifdef __PRE_RAM__ -extern struct sys_info sysinfo_car; +#include <arch/early_variables.h> +struct sys_info sysinfo_car CAR_GLOBAL; #endif #endif /* AMDK8_PRE_F_H */ diff --git a/src/northbridge/amd/amdk8/raminit.c b/src/northbridge/amd/amdk8/raminit.c index c58abb1..fbcb887 100644 --- a/src/northbridge/amd/amdk8/raminit.c +++ b/src/northbridge/amd/amdk8/raminit.c @@ -17,9 +17,6 @@ #include "option_table.h" #endif -#include <arch/early_variables.h> -struct sys_info sysinfo_car CAR_GLOBAL; - void setup_resource_map(const unsigned int *register_values, int max) { int i; diff --git a/src/northbridge/amd/amdk8/raminit_f.c b/src/northbridge/amd/amdk8/raminit_f.c index 1c1a6ea..a116d76 100644 --- a/src/northbridge/amd/amdk8/raminit_f.c +++ b/src/northbridge/amd/amdk8/raminit_f.c @@ -42,9 +42,6 @@ #endif -#include <arch/early_variables.h> -struct sys_info sysinfo_car CAR_GLOBAL; - #include "f_pci.c" diff --git a/src/northbridge/amd/amdk8/raminit_f_dqs.c b/src/northbridge/amd/amdk8/raminit_f_dqs.c index ee3b609..609cddf 100644 --- a/src/northbridge/amd/amdk8/raminit_f_dqs.c +++ b/src/northbridge/amd/amdk8/raminit_f_dqs.c @@ -2074,7 +2074,11 @@ static void train_ram(unsigned nodeid, struct sys_info *sysinfo, struct sys_info static inline void train_ram_on_node(unsigned nodeid, unsigned coreid, struct sys_info *sysinfo, unsigned retcall) { if(coreid) return; // only do it on core0 - struct sys_info *sysinfox = (void *)((CONFIG_RAMTOP) - sizeof(*sysinfox)); + struct sys_info *sysinfox; + uintptr_t migrated_base = CONFIG_RAMTOP - car_data_size(); + + sysinfox = (void *)(migrated_base + car_object_offset(&sysinfo_car)); + wait_till_sysinfo_in_ram(); // use pci to get it if(sysinfox->mem_trained[nodeid] == 0x80) {

1 0

New patch to review for coreboot: cbfstool: unify actual file creation
by Patrick Georgi 12 Aug '15

12 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11222 -gerrit commit 25c5e0cb6f858f79a8d365eaaea9bd83843a1204 Author: Patrick Georgi <pgeorgi(a)google.com> Date: Wed Aug 12 12:29:20 2015 +0200 cbfstool: unify actual file creation After the preparation in earlier commits, it is now possible to handle the more general case of position independent files using the special code path for fixed location files. This leads to a single place where non-empty cbfs file headers are actually written into the image, allowing us to move it up the chain more easily. Change-Id: I8c1fca5e4e81c20971b2960c87690e982aa3e274 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- util/cbfstool/cbfs_image.c | 37 +++++-------------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 168c966..51cfd03 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -546,7 +546,7 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, uint32_t entry_type; uint32_t addr, addr_next; struct cbfs_file *entry, *next; - uint32_t need_size, new_size; + uint32_t need_size; if (header_size == 0) header_size = cbfs_calculate_file_header_size(name); @@ -600,37 +600,10 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, // TODO there are more few tricky cases that we may // want to fit by altering offset. - // Can we simply put object here? - if (!content_offset || content_offset == addr + header_size) { - DEBUG("Filling new entry data (%zd bytes).\n", - buffer->size); - cbfs_create_empty_entry(entry, type, buffer->size, name); - memcpy(CBFS_SUBHEADER(entry), buffer->data, buffer->size); - if (verbose) - cbfs_print_entry_info(image, entry, stderr); - - // setup new entry - DEBUG("Setting new empty entry.\n"); - entry = cbfs_find_next_entry(image, entry); - new_size = (cbfs_get_entry_addr(image, next) - - cbfs_get_entry_addr(image, entry)); - - /* Entry was added and no space for new "empty" entry */ - if (new_size < cbfs_calculate_file_header_size("")) { - DEBUG("No need for new \"empty\" entry\n"); - /* No need to increase the size of the just - * stored file to extend to next file. Alignment - * of next file takes care of this. - */ - return 0; - } - new_size -= cbfs_calculate_file_header_size(""); - DEBUG("new size: %d\n", new_size); - cbfs_create_empty_entry(entry, CBFS_COMPONENT_NULL, - new_size, ""); - if (verbose) - cbfs_print_entry_info(image, entry, stderr); - return 0; + if (content_offset == 0) { + // we tested every condition earlier under which + // placing the file there might fail + content_offset = addr + header_size; } DEBUG("section 0x%x+0x%x for content_offset 0x%x.\n",

1 0

New patch to review for coreboot: cbfstool: move tests for fixed-location files earlier
by Patrick Georgi 12 Aug '15

12 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11221 -gerrit commit 0ee6581ca97e8a3786447be060a166e7a0d6a1b4 Author: Patrick Georgi <pgeorgi(a)google.com> Date: Wed Aug 12 12:05:21 2015 +0200 cbfstool: move tests for fixed-location files earlier ... and the assert is gone. The actual action of adding a just-right file can be moved after the tests since it's exactly the condition those tests don't continue or break on. Change-Id: I6d0e829e0158198301136ada9a0de2f168ceee3f Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- util/cbfstool/cbfs_image.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index d7d4acf..168c966 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -580,6 +580,26 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, if (addr + need_size > addr_next) continue; + // Test for complicated cases + if (content_offset > 0) { + if (addr_next < content_offset) { + DEBUG("Not for specified offset yet"); + continue; + } else if (addr > content_offset) { + DEBUG("Exceed specified content_offset."); + break; + } else if (addr + header_size > content_offset) { + ERROR("Not enough space for header.\n"); + break; + } else if (content_offset + buffer->size > addr_next) { + ERROR("Not enough space for content.\n"); + break; + } + } + + // TODO there are more few tricky cases that we may + // want to fit by altering offset. + // Can we simply put object here? if (!content_offset || content_offset == addr + header_size) { DEBUG("Filling new entry data (%zd bytes).\n", @@ -613,27 +633,6 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, return 0; } - // We need to put content here, and the case is really - // complicated... - assert(content_offset); - if (content_offset > 0) { - if (addr_next < content_offset) { - DEBUG("Not for specified offset yet"); - continue; - } else if (addr > content_offset) { - DEBUG("Exceed specified content_offset."); - break; - } else if (addr + header_size > content_offset) { - ERROR("Not enough space for header.\n"); - break; - } else if (content_offset + buffer->size > addr_next) { - ERROR("Not enough space for content.\n"); - break; - } - } - - // TODO there are more few tricky cases that we may - // want to fit by altering offset. DEBUG("section 0x%x+0x%x for content_offset 0x%x.\n", addr, addr_next - addr, content_offset);

1 0

New patch to review for coreboot: cbfstool: prepare moving tests earlier
by Patrick Georgi 12 Aug '15

12 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11220 -gerrit commit 70c582240dc083136fb86024dfd9b00d49ad146b Author: Patrick Georgi <pgeorgi(a)google.com> Date: Wed Aug 12 12:01:01 2015 +0200 cbfstool: prepare moving tests earlier The assert() makes sure the if() holds true. But that assert won't survive for long. Change-Id: Iab7d2bc7bfebb3f3b3ce70dc5bd041902e14bd7a Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- util/cbfstool/cbfs_image.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 077f20f..d7d4acf 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -616,18 +616,20 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, // We need to put content here, and the case is really // complicated... assert(content_offset); - if (addr_next < content_offset) { - DEBUG("Not for specified offset yet"); - continue; - } else if (addr > content_offset) { - DEBUG("Exceed specified content_offset."); - break; - } else if (addr + header_size > content_offset) { - ERROR("Not enough space for header.\n"); - break; - } else if (content_offset + buffer->size > addr_next) { - ERROR("Not enough space for content.\n"); - break; + if (content_offset > 0) { + if (addr_next < content_offset) { + DEBUG("Not for specified offset yet"); + continue; + } else if (addr > content_offset) { + DEBUG("Exceed specified content_offset."); + break; + } else if (addr + header_size > content_offset) { + ERROR("Not enough space for header.\n"); + break; + } else if (content_offset + buffer->size > addr_next) { + ERROR("Not enough space for content.\n"); + break; + } } // TODO there are more few tricky cases that we may

1 0

New patch to review for coreboot: cbfstool: factor out creating a cbfs file header
by Patrick Georgi 12 Aug '15

12 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11219 -gerrit commit 936c8dcb4e3d3f95f783a90ccf497fe3153e5211 Author: Patrick Georgi <pgeorgi(a)google.com> Date: Wed Aug 12 09:20:11 2015 +0200 cbfstool: factor out creating a cbfs file header We will want to create headers that live outside the final image at some point (eg. to build the file before we even know where to place it). Change-Id: Ie4c0323df8d5be955aec3621b75309e8f11fae49 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- util/cbfstool/cbfs_image.c | 16 ++++++++++++++-- util/cbfstool/cbfs_image.h | 4 ++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index b0c3080..077f20f 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -1020,10 +1020,14 @@ int cbfs_is_valid_entry(struct cbfs_image *image, struct cbfs_file *entry) strlen(CBFS_FILE_MAGIC)); } -int cbfs_create_empty_entry(struct cbfs_file *entry, int type, +struct cbfs_file *cbfs_create_file_header(int type, size_t len, const char *name) { - memset(entry, CBFS_CONTENT_DEFAULT_VALUE, sizeof(*entry)); + // assume that there won't be file names of ~1000 bytes + const int bufsize = 1024; + + struct cbfs_file *entry = malloc(bufsize); + memset(entry, CBFS_CONTENT_DEFAULT_VALUE, bufsize); memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic)); entry->type = htonl(type); entry->len = htonl(len); @@ -1031,6 +1035,14 @@ int cbfs_create_empty_entry(struct cbfs_file *entry, int type, entry->offset = htonl(cbfs_calculate_file_header_size(name)); memset(entry->filename, 0, ntohl(entry->offset) - sizeof(*entry)); strcpy(entry->filename, name); + return entry; +} + +int cbfs_create_empty_entry(struct cbfs_file *entry, int type, + size_t len, const char *name) +{ + struct cbfs_file *tmp = cbfs_create_file_header(type, len, name); + memcpy(entry, tmp, ntohl(tmp->offset)); memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, len); return 0; } diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index ad999e3..5b27234 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -99,6 +99,10 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, /* Removes an entry from CBFS image. Returns 0 on success, otherwise non-zero. */ int cbfs_remove_entry(struct cbfs_image *image, const char *name); +/* Create a new cbfs file header structure to work with */ +struct cbfs_file *cbfs_create_file_header(int type, size_t len, + const char *name); + /* Initializes a new empty (type = NULL) entry with size and name in CBFS image. * Returns 0 on success, otherwise (ex, not found) non-zero. */ int cbfs_create_empty_entry(struct cbfs_file *entry, int type,

1 0

New patch to review for coreboot: cbfstool: Make cbfs_create_empty_entry build a more complete header
by Patrick Georgi 12 Aug '15

12 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11218 -gerrit commit 952a7dc95f021eab4a88bc6a9a402e9ff3a1d3b7 Author: Patrick Georgi <pgeorgi(a)google.com> Date: Wed Aug 12 09:12:06 2015 +0200 cbfstool: Make cbfs_create_empty_entry build a more complete header Pass the file type into it instead of creating an entry, then modifying the header field again after the fact. Change-Id: I655583218f5085035b0f80efff7f91a66b5b296e Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- util/cbfstool/cbfs_image.c | 25 +++++++++++++------------ util/cbfstool/cbfs_image.h | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index b45969c..b0c3080 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -240,7 +240,8 @@ int cbfs_image_create(struct cbfs_image *image, size_t entries_size) size_t capacity = entries_size - empty_header_len; LOG("Created CBFS (capacity = %zu bytes)\n", capacity); - return cbfs_create_empty_entry(entry_header, capacity, ""); + return cbfs_create_empty_entry(entry_header, CBFS_COMPONENT_NULL, + capacity, ""); } int cbfs_legacy_image_create(struct cbfs_image *image, @@ -436,7 +437,8 @@ int cbfs_copy_instance(struct cbfs_image *image, size_t copy_offset, if (last_entry_size < 0) WARN("No room to create the last entry!\n") else - cbfs_create_empty_entry(dst_entry, last_entry_size, ""); + cbfs_create_empty_entry(dst_entry, CBFS_COMPONENT_NULL, + last_entry_size, ""); return 0; } @@ -480,14 +482,14 @@ static int cbfs_add_entry_at(struct cbfs_image *image, if (target - addr > min_entry_size) { DEBUG("|min|...|header|content|... <create new entry>\n"); len = target - addr - min_entry_size; - cbfs_create_empty_entry(entry, len, ""); + cbfs_create_empty_entry(entry, CBFS_COMPONENT_NULL, len, ""); if (verbose > 1) cbfs_print_entry_info(image, entry, stderr); entry = cbfs_find_next_entry(image, entry); addr = cbfs_get_entry_addr(image, entry); } len = size + (content_offset - addr - header_size); - cbfs_create_empty_entry(entry, len, name); + cbfs_create_empty_entry(entry, type, len, name); if (len != size) { DEBUG("|..|header|content|... <use offset to create entry>\n"); DEBUG("before: offset=0x%x, len=0x%x\n", @@ -501,7 +503,6 @@ static int cbfs_add_entry_at(struct cbfs_image *image, // Ready to fill data into entry. assert(ntohl(entry->len) == size); - entry->type = htonl(type); DEBUG("content_offset: 0x%x, entry location: %x\n", content_offset, (int)((char*)CBFS_SUBHEADER(entry) - image->buffer.data)); @@ -527,7 +528,7 @@ static int cbfs_add_entry_at(struct cbfs_image *image, } len = addr_next - addr - min_entry_size; - cbfs_create_empty_entry(entry, len, ""); + cbfs_create_empty_entry(entry, CBFS_COMPONENT_NULL, len, ""); if (verbose > 1) cbfs_print_entry_info(image, entry, stderr); return 0; } @@ -583,8 +584,7 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, if (!content_offset || content_offset == addr + header_size) { DEBUG("Filling new entry data (%zd bytes).\n", buffer->size); - cbfs_create_empty_entry(entry, buffer->size, name); - entry->type = htonl(type); + cbfs_create_empty_entry(entry, type, buffer->size, name); memcpy(CBFS_SUBHEADER(entry), buffer->data, buffer->size); if (verbose) cbfs_print_entry_info(image, entry, stderr); @@ -606,7 +606,8 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, } new_size -= cbfs_calculate_file_header_size(""); DEBUG("new size: %d\n", new_size); - cbfs_create_empty_entry(entry, new_size, ""); + cbfs_create_empty_entry(entry, CBFS_COMPONENT_NULL, + new_size, ""); if (verbose) cbfs_print_entry_info(image, entry, stderr); return 0; @@ -886,7 +887,7 @@ int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, DEBUG("join_empty_entry: combine 0x%x+0x%x and 0x%x+0x%x.\n", cbfs_get_entry_addr(image, entry), ntohl(entry->len), cbfs_get_entry_addr(image, next), ntohl(next->len)); - cbfs_create_empty_entry(entry, + cbfs_create_empty_entry(entry, CBFS_COMPONENT_NULL, (last_addr - addr - cbfs_calculate_file_header_size("")), ""); @@ -1019,12 +1020,12 @@ int cbfs_is_valid_entry(struct cbfs_image *image, struct cbfs_file *entry) strlen(CBFS_FILE_MAGIC)); } -int cbfs_create_empty_entry(struct cbfs_file *entry, +int cbfs_create_empty_entry(struct cbfs_file *entry, int type, size_t len, const char *name) { memset(entry, CBFS_CONTENT_DEFAULT_VALUE, sizeof(*entry)); memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic)); - entry->type = htonl(CBFS_COMPONENT_NULL); + entry->type = htonl(type); entry->len = htonl(len); entry->attributes_offset = 0; entry->offset = htonl(cbfs_calculate_file_header_size(name)); diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index ecd7db7..ad999e3 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -101,7 +101,7 @@ int cbfs_remove_entry(struct cbfs_image *image, const char *name); /* Initializes a new empty (type = NULL) entry with size and name in CBFS image. * Returns 0 on success, otherwise (ex, not found) non-zero. */ -int cbfs_create_empty_entry(struct cbfs_file *entry, +int cbfs_create_empty_entry(struct cbfs_file *entry, int type, size_t len, const char *name); /* Finds a location to put given content by specified criteria:

1 0

New patch to review for coreboot: cbfstool: honor larger-than-usual header sizes in cbfs_add_entry_at()
by Patrick Georgi 12 Aug '15

12 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11217 -gerrit commit 132bf9a9a3913272d75f27a8cd929bc587af5b3f Author: Patrick Georgi <pgeorgi(a)google.com> Date: Tue Aug 11 15:55:16 2015 +0200 cbfstool: honor larger-than-usual header sizes in cbfs_add_entry_at() If an earlier stage built a larger header, cbfs_add_entry_at() shouldn't decide to go with the most boring, least featureful header type (and its size) instead. Change-Id: Icc5dcd9a797a0f3c42f91cddd21b3b3916095b63 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- util/cbfstool/cbfs_image.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index ed065b0..b45969c 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -457,13 +457,13 @@ static int cbfs_add_entry_at(struct cbfs_image *image, const char *name, uint32_t type, const void *data, - uint32_t content_offset) + uint32_t content_offset, + uint32_t header_size) { struct cbfs_file *next = cbfs_find_next_entry(image, entry); uint32_t addr = cbfs_get_entry_addr(image, entry), addr_next = cbfs_get_entry_addr(image, next); - uint32_t header_size = cbfs_calculate_file_header_size(name), - min_entry_size = cbfs_calculate_file_header_size(""); + uint32_t min_entry_size = cbfs_calculate_file_header_size(""); uint32_t len, target; uint32_t align = image->has_header ? image->header.align : CBFS_ENTRY_ALIGNMENT; @@ -635,7 +635,8 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, addr, addr_next - addr, content_offset); if (cbfs_add_entry_at(image, entry, buffer->size, name, type, - buffer->data, content_offset) == 0) { + buffer->data, content_offset, + header_size) == 0) { return 0; } break;

1 0

New patch to review for coreboot: cbfstool: allow file data converters to modify the header size
by Patrick Georgi 12 Aug '15

12 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11216 -gerrit commit 8dd3f17d9f3a40669a4e29ed7cacdbfa69cbdf7a Author: Patrick Georgi <pgeorgi(a)google.com> Date: Tue Aug 11 15:16:24 2015 +0200 cbfstool: allow file data converters to modify the header size The idea is that they can at some point add extended attributes to the header. That also needs to be passed, but let's start simple. Change-Id: I80359843078b149ac433ee3d739ea192592e16e7 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- util/cbfstool/cbfstool.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 57db97c..bf51956 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -115,7 +115,8 @@ static unsigned convert_to_from_top_aligned(const struct buffer *region, return image_size - region->offset - offset; } -typedef int (*convert_buffer_t)(struct buffer *buffer, uint32_t *offset); +typedef int (*convert_buffer_t)(struct buffer *buffer, uint32_t *offset, + uint32_t *header_size); static int cbfs_add_integer_component(const char *name, uint64_t u64val, @@ -203,7 +204,7 @@ static int cbfs_add_component(const char *filename, uint32_t header_size = cbfs_calculate_file_header_size(name); - if (convert && convert(&buffer, &offset) != 0) { + if (convert && convert(&buffer, &offset, &header_size) != 0) { ERROR("Failed to parse file '%s'.\n", filename); buffer_delete(&buffer); return 1; @@ -224,7 +225,8 @@ static int cbfs_add_component(const char *filename, return 0; } -static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset) +static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset, + unused uint32_t *header_size) { struct buffer output; int ret; @@ -239,7 +241,7 @@ static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset) } static int cbfstool_convert_mkpayload(struct buffer *buffer, - unused uint32_t *offset) + unused uint32_t *offset, unused uint32_t *header_size) { struct buffer output; int ret; @@ -269,7 +271,7 @@ static int cbfstool_convert_mkpayload(struct buffer *buffer, } static int cbfstool_convert_mkflatpayload(struct buffer *buffer, - unused uint32_t *offset) + unused uint32_t *offset, unused uint32_t *header_size) { struct buffer output; if (parse_flat_binary_to_payload(buffer, &output,

1 0

New patch to review for coreboot: cbfstool: calculate header size in cbfs_add_component()
by Patrick Georgi 12 Aug '15

12 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11215 -gerrit commit 034691130db1e4d89d8f50b3992cd37689bb7769 Author: Patrick Georgi <pgeorgi(a)google.com> Date: Tue Aug 11 15:10:33 2015 +0200 cbfstool: calculate header size in cbfs_add_component() It will at some point create the header, and pass it with its size. We can start with the size already. Change-Id: I8f26b2335ffab99a664d1ff7bc88e33ed62cf9ca Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- util/cbfstool/cbfstool.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 80e3895..57db97c 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -201,6 +201,8 @@ static int cbfs_add_component(const char *filename, return 1; } + uint32_t header_size = cbfs_calculate_file_header_size(name); + if (convert && convert(&buffer, &offset) != 0) { ERROR("Failed to parse file '%s'.\n", filename); buffer_delete(&buffer); @@ -211,7 +213,8 @@ static int cbfs_add_component(const char *filename, offset = convert_to_from_top_aligned(param.image_region, -offset); - if (cbfs_add_entry(&image, &buffer, name, type, offset, 0) != 0) { + if (cbfs_add_entry(&image, &buffer, name, type, offset, header_size) + != 0) { ERROR("Failed to add '%s' into ROM image.\n", filename); buffer_delete(&buffer); return 1;

1 0

New patch to review for coreboot: cbfstool: expose cbfs_calculate_file_header_size()
by Patrick Georgi 12 Aug '15

12 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11214 -gerrit commit fc8df329ffff04b7f393044c37d723f639892743 Author: Patrick Georgi <pgeorgi(a)google.com> Date: Tue Aug 11 15:10:02 2015 +0200 cbfstool: expose cbfs_calculate_file_header_size() Headers vary in size soon, and more places need to be able to calculate their size. Change-Id: I30761bb9da0756418993dee21d8fa18cf3174c40 Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- util/cbfstool/cbfs_image.c | 2 +- util/cbfstool/cbfs_image.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index e78ee40..ed065b0 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -112,7 +112,7 @@ int cbfs_parse_comp_algo(const char *name) /* CBFS image */ -static size_t cbfs_calculate_file_header_size(const char *name) +size_t cbfs_calculate_file_header_size(const char *name) { return (sizeof(struct cbfs_file) + align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN)); diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 907be61..ecd7db7 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -164,4 +164,6 @@ int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry, int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, void *arg); +/* Returns the size of a cbfs file header with no extensions */ +size_t cbfs_calculate_file_header_size(const char *name); #endif

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit August 2015