coreboot-gerrit August 2015

coreboot-gerrit@coreboot.org

1 participants
814 discussions

Patch set updated for coreboot: cbfstool: don't pass header_size as separate argument
by Patrick Georgi 26 Aug '15

26 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/11332 -gerrit commit 532c373a7232a2391be63c0daf9fc44fa573c38b Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 22:27:57 2015 +0200 cbfstool: don't pass header_size as separate argument It's already present inside struct cbfs_file Change-Id: Ib10663c6601aa02e07b868e440f05da02af9c2d9 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/cbfstool/cbfs_image.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 53ce604..f93cfef 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -457,8 +457,7 @@ static int cbfs_add_entry_at(struct cbfs_image *image, struct cbfs_file *entry, const void *data, uint32_t content_offset, - const struct cbfs_file *header, - uint32_t header_size) + const struct cbfs_file *header) { struct cbfs_file *next = cbfs_find_next_entry(image, entry); uint32_t addr = cbfs_get_entry_addr(image, entry), @@ -467,6 +466,7 @@ static int cbfs_add_entry_at(struct cbfs_image *image, uint32_t len, header_offset; uint32_t align = image->has_header ? image->header.align : CBFS_ENTRY_ALIGNMENT; + uint32_t header_size = ntohl(header->offset); header_offset = content_offset - header_size; if (header_offset % align) @@ -605,9 +605,8 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, DEBUG("section 0x%x+0x%x for content_offset 0x%x.\n", addr, addr_next - addr, content_offset); - if (cbfs_add_entry_at(image, entry, - buffer->data, content_offset, header, - header_size) == 0) { + if (cbfs_add_entry_at(image, entry, buffer->data, + content_offset, header) == 0) { return 0; } break;

1 0

Patch set updated for coreboot: cbfstool: add extended attributes macros for cbfs_file
by Patrick Georgi 26 Aug '15

26 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/10934 -gerrit commit a53ebf0de529690383dbc5f9a0012304effb1728 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Wed Jul 15 20:49:00 2015 +0200 cbfstool: add extended attributes macros for cbfs_file CBFS_FILE_FIRST_ATTR(struct cbfs_file *) and CBFS_FILE_NEXT_ATTR(struct cbfs_file *, struct cbfs_file_attribute *) help navigate through extended attributes. cbfs_add_file_attr(header, tag, size) adds a new file attribute to header. Change-Id: I325965286c44f31abd95df684d340cebb0e68b75 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- util/cbfstool/cbfs.h | 12 ++++++++++++ util/cbfstool/cbfs_image.c | 35 +++++++++++++++++++++++++++++++++++ util/cbfstool/cbfs_image.h | 6 ++++++ 3 files changed, 53 insertions(+) diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 3f80a04..d45fc67 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -77,6 +77,7 @@ struct cbfs_file { /* length of file data */ uint32_t len; uint32_t type; + /* offset to struct cbfs_file_attribute or 0 */ uint32_t attributes_offset; /* length of header incl. variable data */ uint32_t offset; @@ -95,6 +96,9 @@ struct cbfs_file_attribute { uint8_t data[0]; } __PACKED; +#define CBFS_FILE_ATTR_UNUSED 0 +#define CBFS_FILE_ATTR_UNUSED2 0xffffffff + struct cbfs_stage { uint32_t compression; uint64_t entry; @@ -155,6 +159,14 @@ struct cbfs_payload { #define CBFS_COMPONENT_NULL 0xFFFFFFFF #define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) ) +#define CBFS_FILE_FIRST_ATTR(_p) (((_p)->attributes_offset <= sizeof(_p)) ? NULL : \ + (struct cbfs_file_attribute *)(((uint8_t *)(_p)) + ntohl((_p)->attributes_offset))) +#define CBFS_FILE_NEXT_ATTR(_p, _a) (!(_a)?NULL: \ + ((((uint8_t *)(_a)) + (_a)->len) >= ((uint8_t*)(_p)) + ntohl((_p)->offset))?NULL: \ + ((((struct cbfs_file_attribute *)(((uint8_t *)(_a)) + (_a)->len))->tag == CBFS_FILE_ATTR_UNUSED) || \ + (((struct cbfs_file_attribute *)(((uint8_t *)(_a)) + (_a)->len))->tag == CBFS_FILE_ATTR_UNUSED2))?NULL: \ + (struct cbfs_file_attribute *)(((uint8_t *)(_a)) + (_a)->len)) + /* cbfs_image.c */ uint32_t get_cbfs_entry_type(const char *name, uint32_t default_value); uint32_t get_cbfs_compression(const char *name, uint32_t unknown); diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 315cbe5..0bba33f 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -1018,6 +1018,41 @@ int cbfs_create_empty_entry(struct cbfs_file *entry, int type, return 0; } +struct cbfs_file_attribute *cbfs_add_file_attr(struct cbfs_file *header, + uint32_t tag, + uint16_t size) +{ + struct cbfs_file_attribute *attr, *next; + next = CBFS_FILE_FIRST_ATTR(header); + do { + attr = next; + next = CBFS_FILE_NEXT_ATTR(header, attr); + } while (next != NULL); + uint32_t header_size = ntohl(header->offset) + size; + /* FIXME: see hardcode elsewhere */ + if (header_size > 1024) { + DEBUG("exceeding allocated space for cbfs_file headers"); + return NULL; + } + /* attr points to the last valid attribute now. + * If NULL, we have to create the first one. */ + if (attr == NULL) { + header->attributes_offset = header->offset; + attr = (struct cbfs_file_attribute *) + (((uint8_t *)header) + + ntohl(header->attributes_offset)); + } else { + attr = (struct cbfs_file_attribute *) + (((uint8_t *)attr) + + ntohl(attr->len)); + } + header->offset = htonl(header_size); + memset(attr, 0xff, size); + attr->tag = tag; + attr->len = htonl(size); + return attr; +} + /* Finds a place to hold whole data in same memory page. */ static int is_in_same_page(uint32_t start, uint32_t size, uint32_t page) { diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 7a9b484..fae9948 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -170,4 +170,10 @@ int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, /* Returns the size of a cbfs file header with no extensions */ size_t cbfs_calculate_file_header_size(const char *name); + +/* Adds to header a new extended attribute tagged 'tag', sized 'size'. + * Returns pointer to the new attribute, or NULL on error. */ +struct cbfs_file_attribute *cbfs_add_file_attr(struct cbfs_file *header, + uint32_t tag, + uint16_t size); #endif

1 0

Patch set updated for coreboot: cbfstool: cbfs_add_entry() doesn't need to know filename or type
by Patrick Georgi 26 Aug '15

26 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/11327 -gerrit commit f6ffc297d822c34eb2976d4e5cb38a199011fa21 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 13:53:42 2015 +0200 cbfstool: cbfs_add_entry() doesn't need to know filename or type They're passed as part of the header now. Change-Id: I7cd6296adac1fa72e0708b89c7009552e272f656 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/cbfstool/cbfs_image.c | 9 +++------ util/cbfstool/cbfs_image.h | 2 +- util/cbfstool/cbfstool.c | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 8297cf1..7066b99 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -532,24 +532,21 @@ static int cbfs_add_entry_at(struct cbfs_image *image, } int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, - const char *name, uint32_t type, uint32_t content_offset, + uint32_t content_offset, void *header, uint32_t header_size) { assert(image); assert(buffer); assert(buffer->data); - assert(name); - type = type; assert(!IS_TOP_ALIGNED_ADDRESS(content_offset)); + const char *name = ((struct cbfs_file *)header)->filename; + uint32_t entry_type; uint32_t addr, addr_next; struct cbfs_file *entry, *next; uint32_t need_size; - if (header_size == 0) - header_size = cbfs_calculate_file_header_size(name); - need_size = header_size + buffer->size; DEBUG("cbfs_add_entry('%s'@0x%x) => need_size = %u+%zu=%u\n", name, content_offset, header_size, buffer->size, need_size); diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index c1df911..02c4a2d 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -93,7 +93,7 @@ int cbfs_export_entry(struct cbfs_image *image, const char *entry_name, * Never pass this function a top-aligned address: convert it to an offset. * Returns 0 on success, otherwise non-zero. */ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, - const char *name, uint32_t type, uint32_t content_offset, + uint32_t content_offset, void *header, uint32_t header_size); /* Removes an entry from CBFS image. Returns 0 on success, otherwise non-zero. */ diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index abb812a..465580c 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -155,7 +155,7 @@ static int cbfs_add_integer_component(const char *name, header = cbfs_create_file_header(CBFS_COMPONENT_RAW, buffer.size, name); uint32_t header_size = cbfs_calculate_file_header_size(name); - if (cbfs_add_entry(&image, &buffer, name, CBFS_COMPONENT_RAW, + if (cbfs_add_entry(&image, &buffer, offset, header, header_size) != 0) { ERROR("Failed to add %llu into ROM image as '%s'.\n", (long long unsigned)u64val, name); @@ -221,7 +221,7 @@ 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, + if (cbfs_add_entry(&image, &buffer, offset, header, header_size) != 0) { ERROR("Failed to add '%s' into ROM image.\n", filename);

1 0

Patch merged into coreboot/master: cbfstool: move cbfs_file header creation further up the call chain
by gerrit＠coreboot.org 26 Aug '15

26 Aug '15

the following patch was just integrated into master: commit 3ba501b86daaec299e9bf5b4e13934036ea5f696 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 13:48:10 2015 +0200 cbfstool: move cbfs_file header creation further up the call chain The header is now created before the "converters" are run. Adding new capabilities (and fields to the header) will happen there, so we're close. Change-Id: I0556df724bd93816b435efff7d931293dbed918f Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/11326 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> See http://review.coreboot.org/11326 for details. -gerrit

1 0

Patch merged into coreboot/master: cbfstool: pass cbfs_file header into "compress" functions
by gerrit＠coreboot.org 26 Aug '15

26 Aug '15

the following patch was just integrated into master: commit 056f6a1f80952d91e0aa41d379ae9f08032595cf Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 15:53:52 2015 +0200 cbfstool: pass cbfs_file header into "compress" functions These functions can do all kinds of things, such as converting an ELF image into SELF, or (in the future) compress or checksum entire files. This may require changing or adding fields to the header, so they need to have access to it. The header_size parameter that was provided (but never used) is equivalent to cbfs_file's offset field. Change-Id: I7c10ab15f3dff4412461103e9763a1d78b7be7bb Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/11325 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> See http://review.coreboot.org/11325 for details. -gerrit

1 0

Patch merged into coreboot/master: cbfstool: drop size argument to cbfs_add_entry_at
by gerrit＠coreboot.org 26 Aug '15

26 Aug '15

the following patch was just integrated into master: commit 19c80b23914caa0162a9d76b749fc0362ad7d17e Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 13:16:04 2015 +0200 cbfstool: drop size argument to cbfs_add_entry_at It's sole use was comparing it to the header's "len" field. Change-Id: Ic3657a709dee0d2b9288373757345a1a56124f37 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/11324 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> See http://review.coreboot.org/11324 for details. -gerrit

1 0

Patch merged into coreboot/master: cbfstool: cut down on the debug output
by gerrit＠coreboot.org 26 Aug '15

26 Aug '15

the following patch was just integrated into master: commit ae7efb9257fa80634627534c45c9d511cb4732e6 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 13:11:28 2015 +0200 cbfstool: cut down on the debug output Change-Id: I9a0aad42e4eb67a07c939d7cfa0d2d80838412bb Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/11323 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> See http://review.coreboot.org/11323 for details. -gerrit

1 0

Patch merged into coreboot/master: cbfstool: Don't patch cbfs_file->len, it's already set correctly
by gerrit＠coreboot.org 26 Aug '15

26 Aug '15

the following patch was just integrated into master: commit 7a33b53dc0f55ed64c2b07796d2d4d302d78bac1 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 13:00:04 2015 +0200 cbfstool: Don't patch cbfs_file->len, it's already set correctly ->len used to be set to the file data length plus the size of the padding used for the cbfs_file header. This isn't the case anymore, so no patching of this field is necessary anymore. ->offset still needs to be patched in that case because its final value can only be determined when the file's actual location is known. Change-Id: I1037885f81b4ed3b68898dd7d0e515cf7a9c90a8 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/11322 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> See http://review.coreboot.org/11322 for details. -gerrit

1 0

Patch merged into coreboot/master: cbfstool: drop unused arguments in internal function
by gerrit＠coreboot.org 26 Aug '15

26 Aug '15

the following patch was just integrated into master: commit bc39690900a5d7a73a215e103c49c513c0c11333 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 12:59:45 2015 +0200 cbfstool: drop unused arguments in internal function Change-Id: Ie4edc5f9c96ffba7dcf8b974c56851658b9538e4 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/11321 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> See http://review.coreboot.org/11321 for details. -gerrit

1 0

Patch merged into coreboot/master: cbfstool: start moving cbfs_file header creation up the call chain
by gerrit＠coreboot.org 26 Aug '15

26 Aug '15

the following patch was just integrated into master: commit 62c014bcf3717cacb7ba0dd5e4c9cb1b6e425cd2 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Tue Aug 25 12:55:33 2015 +0200 cbfstool: start moving cbfs_file header creation up the call chain Up to now cbfstool creates the cbfs_file header at the latest possible time, which is unsuitable when the idea is to add further fields to it that need to be configured earlier. Thus, have it ripple up the call chain. Change-Id: I7c160681c31818bc550ed2098008146043d0ee01 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/11320 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> See http://review.coreboot.org/11320 for details. -gerrit

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
82
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit August 2015