coreboot-gerrit July 2015

coreboot-gerrit@coreboot.org

1 participants
1048 discussions

Patch set updated for coreboot: crossgcc: update to gcc 4.9.3
by Patrick Georgi 16 Jul '15

16 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/10943 -gerrit commit f21a14c4bddce253bf20a19dfe2640bc628b5089 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Thu Jul 16 16:56:50 2015 +0200 crossgcc: update to gcc 4.9.3 We will probably update to 5.2 soonish, but that requires some more testing (and better availability of the tarball at gnu mirrors) Change-Id: I7144c0d92aab26e6a4a11ec10e560fb01c9c3360 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- util/crossgcc/buildgcc | 6 +++--- util/crossgcc/sum/gcc-4.9.3.tar.bz2.cksum | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index f59b225..a3c4845 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -22,8 +22,8 @@ cd $(dirname $0) -CROSSGCC_DATE="June 17th, 2015" -CROSSGCC_VERSION="1.31" +CROSSGCC_DATE="July 16th, 2015" +CROSSGCC_VERSION="1.32" # default settings PACKAGE=GCC @@ -38,7 +38,7 @@ GMP_VERSION=6.0.0 MPFR_VERSION=3.1.2 MPC_VERSION=1.0.3 LIBELF_VERSION=0.8.13 -GCC_VERSION=4.9.2 +GCC_VERSION=4.9.3 GCC_AUTOCONF_VERSION=2.69 BINUTILS_VERSION=2.25 GDB_VERSION=7.9.1 diff --git a/util/crossgcc/sum/gcc-4.9.3.tar.bz2.cksum b/util/crossgcc/sum/gcc-4.9.3.tar.bz2.cksum new file mode 100644 index 0000000..f89c999 --- /dev/null +++ b/util/crossgcc/sum/gcc-4.9.3.tar.bz2.cksum @@ -0,0 +1 @@ +2e6490a908eac8b2b56b73679bd7c2a5237df1f8 tarballs/gcc-4.9.3.tar.bz2

1 0

New patch to review for coreboot: crossgcc: update to gcc 4.9.3
by Patrick Georgi 16 Jul '15

16 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/10943 -gerrit commit 3e83cabc848d87b4aa1613334a715b188040aa85 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Thu Jul 16 16:56:50 2015 +0200 crossgcc: update to gcc 4.9.3 We will probably update to 5.2 soonish, but that requires some more testing (and better availability of the tarball at gnu mirrors) Change-Id: I7144c0d92aab26e6a4a11ec10e560fb01c9c3360 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- util/crossgcc/buildgcc | 2 +- util/crossgcc/sum/gcc-4.9.3.tar.bz2.cksum | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index f59b225..7e58302 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -38,7 +38,7 @@ GMP_VERSION=6.0.0 MPFR_VERSION=3.1.2 MPC_VERSION=1.0.3 LIBELF_VERSION=0.8.13 -GCC_VERSION=4.9.2 +GCC_VERSION=4.9.3 GCC_AUTOCONF_VERSION=2.69 BINUTILS_VERSION=2.25 GDB_VERSION=7.9.1 diff --git a/util/crossgcc/sum/gcc-4.9.3.tar.bz2.cksum b/util/crossgcc/sum/gcc-4.9.3.tar.bz2.cksum new file mode 100644 index 0000000..f89c999 --- /dev/null +++ b/util/crossgcc/sum/gcc-4.9.3.tar.bz2.cksum @@ -0,0 +1 @@ +2e6490a908eac8b2b56b73679bd7c2a5237df1f8 tarballs/gcc-4.9.3.tar.bz2

1 0

New patch to review for coreboot: amd/pi: Increase assumption for maximum CBFS file header size
by Patrick Georgi 16 Jul '15

16 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/10942 -gerrit commit 31807badef2a5515e0715af33aa4631590b49900 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Thu Jul 16 15:34:26 2015 +0200 amd/pi: Increase assumption for maximum CBFS file header size The new attributes increase the header size, breaking this assumption. Change-Id: Ib23862f27650b39133deafb74a24327b098b6e86 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- src/southbridge/amd/pi/hudson/Makefile.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/southbridge/amd/pi/hudson/Makefile.inc b/src/southbridge/amd/pi/hudson/Makefile.inc index d2fd7dc..bf67505 100644 --- a/src/southbridge/amd/pi/hudson/Makefile.inc +++ b/src/southbridge/amd/pi/hudson/Makefile.inc @@ -68,7 +68,7 @@ endif ifneq ($(HUDSON_FWM_INSIDE_CBFS), 1) $(warning ##### WARNING: CONFIG_HUDSON_FWM_POSITION ($(HUDSON_FWM_POSITION)) is outside of CBFS area ($(CBFS_BASE_ADDRESS) to 4294967295) ##### ) endif -CBFS_HEADER_SIZE=0x40 +CBFS_HEADER_SIZE=0x60 #assume the cbfs header is less than $(CBFS_HEADER_SIZE) bytes. ROMSIG_SIZE=4096

1 0

Patch set updated for coreboot: cbfstool: allow compression at file header level
by Patrick Georgi 16 Jul '15

16 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/10935 -gerrit commit cd71f05a434ac3b362eaf2ddd1d118a1efad6cab Author: Daisuke Nojiri <dnojiri(a)chromium.org> Date: Thu Jul 9 15:07:45 2015 -0700 cbfstool: allow compression at file header level Currently, compression is only allowed at subheader level (e.g. cbfs_stage, cbfs_payload_segment). This change adds compression field to each file's header so that any cbfs file can be compressed. With the necessary additions in coreboot and libpayload, the following sample code can load a compressed file: const char *name = "foo.bmp"; struct cbfs_file *file = cbfs_get_file(media, name); void *dst = malloc(ntohl(file->uncompressed_size)); dst = cbfs_get_file_content(media, name, type, file, dst); cbfs_stage and cbfs_payload_segment continue to support compression at subheader level because stages and payloads have to be decompressed to the load address, which is stored in the subheader. For these, file level compression should be turned off. Change-Id: I9a00ec99dfc68ffb2771bb4a3cc5ba6ba8a326f4 Signed-off-by: Daisuke Nojiri <dnojiri(a)chromium.org> Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- util/cbfstool/cbfs.h | 3 +++ util/cbfstool/cbfs_image.c | 9 ++++++++- util/cbfstool/cbfs_image.h | 3 ++- util/cbfstool/cbfstool.c | 40 ++++++++++++++++++++++++++++++++++------ 4 files changed, 47 insertions(+), 8 deletions(-) diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index c7a5bd6..abe87a0 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -86,6 +86,9 @@ _Static_assert(sizeof(struct cbfs_file) == 24, "cbfs_file size mismatch"); struct cbfs_file_attributes { /* size of this structure, to test if a given element is available */ uint32_t len; + /* whole file compression format. 0 if no compression. */ + uint32_t compression; + uint32_t decompressed_size; } __PACKED; struct cbfs_stage { diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 48cf7b2..bbc5141 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -537,7 +537,8 @@ 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) + const char *name, uint32_t type, uint32_t content_offset, + enum comp_algo compression, uint32_t decompressed_size) { assert(image); assert(buffer); @@ -587,6 +588,10 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, buffer->size); cbfs_create_empty_entry(entry, buffer->size, name); entry->type = htonl(type); + struct cbfs_file_attributes *attr = + CBFS_FILE_ATTRIBUTES(entry); + attr->compression = htonl(compression); + attr->decompressed_size = htonl(decompressed_size); memcpy(CBFS_SUBHEADER(entry), buffer->data, buffer->size); if (verbose) cbfs_print_entry_info(image, entry, stderr); @@ -1047,6 +1052,8 @@ int cbfs_create_empty_entry(struct cbfs_file *entry, struct cbfs_file_attributes *attr = CBFS_FILE_ATTRIBUTES(entry); attr->len = sizeof(struct cbfs_file_attributes); + attr->compression = 0; + attr->decompressed_size = 0; return 0; } diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index cb2935b..7da7621 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -93,7 +93,8 @@ 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); + const char *name, uint32_t type, uint32_t content_offset, + enum comp_algo algo, uint32_t decompressed_size); /* Removes an entry from CBFS image. Returns 0 on success, otherwise non-zero. */ int cbfs_remove_entry(struct cbfs_image *image, const char *name); diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index b6a486f..1637089 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -76,6 +76,8 @@ static struct param { bool show_immutable; int fit_empty_entries; enum comp_algo compression; + enum comp_algo file_compression; + uint32_t decompressed_size; /* for linux payloads */ char *initrd; char *cmdline; @@ -83,6 +85,7 @@ static struct param { /* All variables not listed are initialized as zero. */ .arch = CBFS_ARCHITECTURE_UNKNOWN, .compression = CBFS_COMPRESS_NONE, + .file_compression = CBFS_COMPRESS_NONE, .headeroffset = ~0, .region_name = SECTION_NAME_PRIMARY_CBFS, }; @@ -150,8 +153,8 @@ static int cbfs_add_integer_component(const char *name, offset = convert_to_from_top_aligned(param.image_region, -offset); - if (cbfs_add_entry(&image, &buffer, name, CBFS_COMPONENT_RAW, offset) != - 0) { + if (cbfs_add_entry(&image, &buffer, name, CBFS_COMPONENT_RAW, offset, + 0, 0) != 0) { ERROR("Failed to add %llu into ROM image as '%s'.\n", (long long unsigned)u64val, name); goto done; @@ -212,7 +215,9 @@ 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) { + if (cbfs_add_entry(&image, &buffer, name, type, offset, + param.file_compression, + param.decompressed_size) != 0) { ERROR("Failed to add '%s' into ROM image.\n", filename); buffer_delete(&buffer); return 1; @@ -222,6 +227,29 @@ static int cbfs_add_component(const char *filename, return 0; } +static int cbfstool_convert_raw(struct buffer *buffer, unused uint32_t *offset) +{ + char *compressed; + int compressed_size; + + comp_func_ptr compress = compression_function(param.compression); + if (!compress) + return -1; + compressed = calloc(buffer->size, 1); + + if (compress(buffer->data, buffer->size, + compressed, &compressed_size)) { + WARN("Compression failed - disabled\n"); + } else { + param.file_compression = param.compression; + free(buffer->data); + buffer->data = compressed; + param.decompressed_size = buffer->size; + buffer->size = compressed_size; + } + return 0; +} + static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset) { struct buffer output; @@ -289,7 +317,7 @@ static int cbfs_add(void) param.type, param.baseaddress, param.headeroffset, - NULL); + cbfstool_convert_raw); } static int cbfs_add_stage(void) @@ -735,7 +763,7 @@ static bool cbfs_is_legacy_format(struct buffer *buffer) } static const struct command commands[] = { - {"add", "H:r:f:n:t:b:vh?", cbfs_add, true, true}, + {"add", "H:r:f:n:t:c:b:vh?", cbfs_add, true, true}, {"add-flat-binary", "H:r:f:n:l:e:c:b:vh?", cbfs_add_flat_binary, true, true}, {"add-payload", "H:r:f:n:t:c:b:C:I:vh?", cbfs_add_payload, true, true}, @@ -850,7 +878,7 @@ static void usage(char *name) " -h Display this help message\n\n" "COMMANDs:\n" " add [-r image,regions] -f FILE -n NAME -t TYPE \\\n" - " [-b base-address] " + " [-c compression] [-b base-address] " "Add a component\n" " add-payload [-r image,regions] -f FILE -n NAME \\\n" " [-c compression] [-b base-address] "

1 0

Patch set updated for coreboot: cbfstool: add extended attributes structure to cbfs_file
by Patrick Georgi 16 Jul '15

16 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/10934 -gerrit commit bd3cd72d26191f3925bc2319f6e27a4c57942616 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Wed Jul 15 20:49:00 2015 +0200 cbfstool: add extended attributes structure to cbfs_file This is a forward and backward compatible approach to extending the cbfs format. Unfortunately we forgot to add a header length or offset to the file name, making old implementations depend on it starting 24 bytes after the cbfs_file structure. To work around that, add another, extensible structure after the file name, and point to it through an offset, so we can add more variable length structures in the future when necessary. The offset field which points to the file data is adjusted appropriately and so old implementations still know where to find both any file's data and its successor in the directory. Files within CBFS that don't use advanced features remain fully usable by old implementations. Files that use advanced features still don't break the data structures. Change-Id: I325965286c44f31abd95df684d340cebb0e68b75 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- util/cbfstool/cbfs.h | 9 +++++++++ util/cbfstool/cbfs_image.c | 11 +++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index e63db37..c7a5bd6 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -74,6 +74,7 @@ struct cbfs_file { /* length of file data */ uint32_t len; uint32_t type; + /* offset to struct cbfs_file_attributes or 0 */ uint32_t attributes_offset; /* length of header incl. variable data */ uint32_t offset; @@ -82,6 +83,11 @@ struct cbfs_file { _Static_assert(sizeof(struct cbfs_file) == 24, "cbfs_file size mismatch"); +struct cbfs_file_attributes { + /* size of this structure, to test if a given element is available */ + uint32_t len; +} __PACKED; + struct cbfs_stage { uint32_t compression; uint64_t entry; @@ -142,6 +148,9 @@ struct cbfs_payload { #define CBFS_COMPONENT_NULL 0xFFFFFFFF #define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) ) +#define CBFS_FILE_ATTRIBUTES(_p) (((_p)->attributes_offset <= sizeof(_p)) ? NULL : \ + (struct cbfs_file_attributes *)(((uint8_t *)(_p)) + ntohl((_p)->attributes_offset))) + /* 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 6f028c8..48cf7b2 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -118,7 +118,8 @@ int cbfs_parse_comp_algo(const char *name) static size_t cbfs_calculate_file_header_size(const char *name) { return (sizeof(struct cbfs_file) + - align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN)); + align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN) + + sizeof(struct cbfs_file_attributes)); } /* Only call on legacy CBFSes possessing a master header. */ @@ -1035,11 +1036,17 @@ int cbfs_create_empty_entry(struct cbfs_file *entry, memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic)); entry->type = htonl(CBFS_COMPONENT_NULL); entry->len = htonl(len); - entry->attributes_offset = 0; + /* FIXME: + move writing the offset fields to cbfs_calculate_file_header */ entry->offset = htonl(cbfs_calculate_file_header_size(name)); + entry->attributes_offset = htonl(cbfs_calculate_file_header_size(name) - + sizeof(struct cbfs_file_attributes)); memset(entry->filename, 0, ntohl(entry->offset) - sizeof(*entry)); strcpy(entry->filename, name); memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, len); + + struct cbfs_file_attributes *attr = CBFS_FILE_ATTRIBUTES(entry); + attr->len = sizeof(struct cbfs_file_attributes); return 0; }

1 0

Patch set updated for coreboot: cbfstool: rename checksum to attributes_offset
by Patrick Georgi 16 Jul '15

16 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/10933 -gerrit commit 5cbe000fe30281e927fe78a28e217caf3225d77f Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Wed Jul 15 18:28:23 2015 +0200 cbfstool: rename checksum to attributes_offset So far it's still unused, but its purpose will change: It will become an offset to another structure that contains additional file attributes. This change is compatible because the binary format doesn't change and so far the field was always set to 0, which can serve nicely as 'unused' field. Change-Id: I2dafb06866713d43a236556f9492641526270837 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- util/cbfstool/cbfs.h | 2 +- util/cbfstool/cbfs_image.c | 2 +- util/cbfstool/common.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 1996b1c..e63db37 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -74,7 +74,7 @@ struct cbfs_file { /* length of file data */ uint32_t len; uint32_t type; - uint32_t checksum; + uint32_t attributes_offset; /* length of header incl. variable data */ uint32_t offset; char filename[]; diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 828d367..6f028c8 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -1035,7 +1035,7 @@ int cbfs_create_empty_entry(struct cbfs_file *entry, memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic)); entry->type = htonl(CBFS_COMPONENT_NULL); entry->len = htonl(len); - entry->checksum = 0; // TODO Build a checksum algorithm. + entry->attributes_offset = 0; entry->offset = htonl(cbfs_calculate_file_header_size(name)); memset(entry->filename, 0, ntohl(entry->offset) - sizeof(*entry)); strcpy(entry->filename, name); diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index fffd096..d72db38 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -131,7 +131,7 @@ void cbfs_file_get_header(struct buffer *buf, struct cbfs_file *file) bgets(buf, &file->magic, sizeof(file->magic)); file->len = xdr_be.get32(buf); file->type = xdr_be.get32(buf); - file->checksum = xdr_be.get32(buf); + file->attributes_offset = xdr_be.get32(buf); file->offset = xdr_be.get32(buf); }

1 0

Patch set updated for coreboot: cbfs: mirror cbfs file attributes for compression
by Patrick Georgi 16 Jul '15

16 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/10939 -gerrit commit 367ab487f2b153380685e04b0b10c0d130f0851e Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Wed Jul 15 21:36:58 2015 +0200 cbfs: mirror cbfs file attributes for compression Even if coreboot doesn't use them at this time, but keep the structures in sync. Change-Id: I92f21edc3bbac6be419b1593d8e13d6055c94efa Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- src/include/cbfs_serialized.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/include/cbfs_serialized.h b/src/include/cbfs_serialized.h index 198ce78..c764120 100644 --- a/src/include/cbfs_serialized.h +++ b/src/include/cbfs_serialized.h @@ -138,6 +138,8 @@ struct cbfs_file { struct cbfs_file_attributes { uint32_t len; + uint32_t compression; + uint32_t decompressed_size; } __attribute__((packed)); #define CBFS_FILE_ATTRIBUTES(_p) (((_p)->attributes_offset <= sizeof(_p)) ? NULL : \

1 0

Patch set updated for coreboot: libpayload: allow compression at file header level
by Patrick Georgi 16 Jul '15

16 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/10938 -gerrit commit cd73033d955d5bcae7e8f2ac4684af69d85c7b35 Author: Daisuke Nojiri <dnojiri(a)chromium.org> Date: Thu Jul 9 15:07:45 2015 -0700 libpayload: allow compression at file header level Sample call sequence for loading a compressed file is as follows: const char *name = "foo.bmp"; struct cbfs_file *file = cbfs_get_file(media, name); struct cbfs_file_attributes *attr = CBFS_FILE_ATTRIBUTES(file); if (attr) { void *dst = malloc(ntohl(attr->uncompressed_size)); dst = cbfs_get_file_content(media, name, type, NULL, file, dst); } cbfs_stage and cbfs_payload_segment continue to support compression at subheader level because stages and payloads have to be decompressed to the load address, which is stored in the subheader. For these, file level compression should be turned off. Change-Id: If959e3dff9b93c6ae45ec7358afcc7840bc17218 Signed-off-by: Daisuke Nojiri <dnojiri(a)chromium.org> Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/include/cbfs_core.h | 19 +++++++++-- payloads/libpayload/libcbfs/cbfs.c | 14 +++++--- payloads/libpayload/libcbfs/cbfs_core.c | 58 +++++++++++++++++++++------------ 3 files changed, 63 insertions(+), 28 deletions(-) diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h index 2dbaaf4..48a6fcd 100644 --- a/payloads/libpayload/include/cbfs_core.h +++ b/payloads/libpayload/include/cbfs_core.h @@ -138,6 +138,8 @@ struct cbfs_file { struct cbfs_file_attributes { uint32_t len; + uint32_t compression; + uint32_t decompressed_size; } __attribute__((packed)); #define CBFS_FILE_ATTRIBUTES(_p) (((_p)->attributes_offset <= sizeof(_p)) ? NULL : \ @@ -220,12 +222,23 @@ struct cbfs_media { int (*close)(struct cbfs_media *media); }; -/* returns pointer to a file entry inside CBFS or NULL */ +/* returns pointer to a file entry inside CBFS or NULL on error */ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name); -/* returns pointer to file content inside CBFS after if type is correct */ +/* + * returns pointer to file content inside CBFS after if type is correct + * or NULL on error. + * + * if the file is compressed, it's decompressed and copied to dst allocated by + * the caller. + * + * it can be invoked using previously mapped file content pointed by *file. + * if *file is not NULL, loading file will be skipped, assuming the file has + * not been unmapped. + */ void *cbfs_get_file_content(struct cbfs_media *media, const char *name, - int type, size_t *sz); + int type, size_t *sz, + struct cbfs_file *file, void *dst); /* returns decompressed size on success, 0 on failure */ int cbfs_decompress(int algo, void *src, void *dst, int len); diff --git a/payloads/libpayload/libcbfs/cbfs.c b/payloads/libpayload/libcbfs/cbfs.c index 9d7d2f1..6b0e11c 100644 --- a/payloads/libpayload/libcbfs/cbfs.c +++ b/payloads/libpayload/libcbfs/cbfs.c @@ -89,7 +89,8 @@ void *cbfs_load_optionrom(struct cbfs_media *media, uint16_t vendor, tohex16(device, name+8); orom = (struct cbfs_optionrom *) - cbfs_get_file_content(media, name, CBFS_TYPE_OPTIONROM, NULL); + cbfs_get_file_content(media, name, CBFS_TYPE_OPTIONROM, + NULL, NULL, NULL); if (orom == NULL) return NULL; @@ -119,7 +120,8 @@ void *cbfs_load_optionrom(struct cbfs_media *media, uint16_t vendor, void * cbfs_load_stage(struct cbfs_media *media, const char *name) { struct cbfs_stage *stage = (struct cbfs_stage *) - cbfs_get_file_content(media, name, CBFS_TYPE_STAGE, NULL); + cbfs_get_file_content(media, name, CBFS_TYPE_STAGE, + NULL, NULL, NULL); /* this is a mess. There is no ntohll. */ /* for now, assume compatible byte order until we solve this. */ uintptr_t entry; @@ -155,7 +157,8 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name) int cbfs_execute_stage(struct cbfs_media *media, const char *name) { struct cbfs_stage *stage = (struct cbfs_stage *) - cbfs_get_file_content(media, name, CBFS_TYPE_STAGE, NULL); + cbfs_get_file_content(media, name, CBFS_TYPE_STAGE, + NULL, NULL, NULL); if (stage == NULL) return 1; @@ -173,7 +176,7 @@ int cbfs_execute_stage(struct cbfs_media *media, const char *name) void *cbfs_load_payload(struct cbfs_media *media, const char *name) { return (struct cbfs_payload *)cbfs_get_file_content( - media, name, CBFS_TYPE_PAYLOAD, NULL); + media, name, CBFS_TYPE_PAYLOAD, NULL, NULL, NULL); } struct cbfs_file *cbfs_find(const char *name) { @@ -181,7 +184,8 @@ struct cbfs_file *cbfs_find(const char *name) { } void *cbfs_find_file(const char *name, int type) { - return cbfs_get_file_content(CBFS_DEFAULT_MEDIA, name, type, NULL); + return cbfs_get_file_content(CBFS_DEFAULT_MEDIA, name, type, + NULL, NULL, NULL); } const struct cbfs_header *get_cbfs_header(void) { diff --git a/payloads/libpayload/libcbfs/cbfs_core.c b/payloads/libpayload/libcbfs/cbfs_core.c index 7926d9d..75ded46 100644 --- a/payloads/libpayload/libcbfs/cbfs_core.c +++ b/payloads/libpayload/libcbfs/cbfs_core.c @@ -97,8 +97,8 @@ const struct cbfs_header *cbfs_get_header(struct cbfs_media *media) /* public API starts here*/ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) { - const char *file_name; - uint32_t offset, romsize, name_len; + const char *vardata; + uint32_t offset, romsize, vardata_len; const struct cbfs_header *header; struct cbfs_file file, *file_ptr; struct cbfs_media default_media; @@ -153,29 +153,29 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) offset += new_align; continue; } - name_len = ntohl(file.offset) - sizeof(file); - DEBUG(" - load entry 0x%x file name (%d bytes)...\n", offset, - name_len); + vardata_len = ntohl(file.offset) - sizeof(file); + DEBUG(" - load entry 0x%x variable data (%d bytes)...\n", + offset, vardata_len); // load file name (arbitrary length). - file_name = (const char*)media->map( - media, offset + sizeof(file), name_len); - if (file_name == CBFS_MEDIA_INVALID_MAP_ADDRESS) { + vardata = (const char*)media->map( + media, offset + sizeof(file), vardata_len); + if (vardata == CBFS_MEDIA_INVALID_MAP_ADDRESS) { ERROR("ERROR: Failed to get filename: 0x%x.\n", offset); - } else if (strcmp(file_name, name) == 0) { + } else if (strcmp(vardata, name) == 0) { int file_offset = ntohl(file.offset), file_len = ntohl(file.len); DEBUG("Found file (offset=0x%x, len=%d).\n", offset + file_offset, file_len); - media->unmap(media, file_name); + media->unmap(media, vardata); file_ptr = media->map(media, offset, file_offset + file_len); media->close(media); return file_ptr; } else { DEBUG(" (unmatched file @0x%x: %s)\n", offset, - file_name); - media->unmap(media, file_name); + vardata); + media->unmap(media, vardata); } // Move to next file. @@ -189,18 +189,20 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) } void *cbfs_get_file_content(struct cbfs_media *media, const char *name, - int type, size_t *sz) + int type, size_t *sz, struct cbfs_file *file, + void *dst) { - struct cbfs_file *file = cbfs_get_file(media, name); + if (file == NULL) { + file = cbfs_get_file(media, name); + if (file == NULL) { + ERROR("Could not find file '%s'.\n", name); + return NULL; + } + } if (sz) *sz = 0; - if (file == NULL) { - ERROR("Could not find file '%s'.\n", name); - return NULL; - } - if (ntohl(file->type) != type) { ERROR("File '%s' is of type %x, but we requested %x.\n", name, ntohl(file->type), type); @@ -210,7 +212,23 @@ void *cbfs_get_file_content(struct cbfs_media *media, const char *name, if (sz) *sz = ntohl(file->len); - return (void *)CBFS_SUBHEADER(file); + void *file_content = (void *)CBFS_SUBHEADER(file); + + struct cbfs_file_attributes *attr = CBFS_FILE_ATTRIBUTES(file); + if (attr && attr->compression) { + uint32_t alg = ntohl(attr->compression); + DEBUG("File '%s' is compressed (alg=%d)\n", alg); + if (!dst) { + ERROR("Memory for decompressed data not provided\n"); + return NULL; + } + if (cbfs_decompress(alg, file_content, dst, + ntohl(attr->decompressed_size))) + return NULL; + file_content = dst; + } + + return file_content; } int cbfs_decompress(int algo, void *src, void *dst, int len)

1 0

Patch set updated for coreboot: libpayload: add cbfs_file attributes
by Patrick Georgi 16 Jul '15

16 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/10937 -gerrit commit f12a7f94688458058290fb9dee85a1ec6349b554 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Wed Jul 15 21:29:46 2015 +0200 libpayload: add cbfs_file attributes Change-Id: I98a75eef19f049ad67d46cdc2790949dcd155797 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- payloads/libpayload/include/cbfs_core.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h index a95cef7..2dbaaf4 100644 --- a/payloads/libpayload/include/cbfs_core.h +++ b/payloads/libpayload/include/cbfs_core.h @@ -132,10 +132,17 @@ struct cbfs_file { char magic[8]; uint32_t len; uint32_t type; - uint32_t checksum; + uint32_t attributes_offset; uint32_t offset; } __attribute__((packed)); +struct cbfs_file_attributes { + uint32_t len; +} __attribute__((packed)); + +#define CBFS_FILE_ATTRIBUTES(_p) (((_p)->attributes_offset <= sizeof(_p)) ? NULL : \ + (struct cbfs_file_attributes *)(((uint8_t *)(_p)) + ntohl((_p)->attributes_offset))) + /*** Component sub-headers ***/ /* Following are component sub-headers for the "standard"

1 0

Patch set updated for coreboot: cbfs: Add support for cbfs_file_attributes as far as required so far
by Patrick Georgi 16 Jul '15

16 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/10936 -gerrit commit f320dbe6c38a1ca3ef48ccbd93ec045b18f7d99f Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Wed Jul 15 21:18:10 2015 +0200 cbfs: Add support for cbfs_file_attributes as far as required so far Change-Id: I808a529b18c2e43e4ab83f30259f73e66635b83d Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- src/include/cbfs_serialized.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/include/cbfs_serialized.h b/src/include/cbfs_serialized.h index f672095..198ce78 100644 --- a/src/include/cbfs_serialized.h +++ b/src/include/cbfs_serialized.h @@ -132,10 +132,17 @@ struct cbfs_file { char magic[8]; uint32_t len; uint32_t type; - uint32_t checksum; + uint32_t attributes_offset; uint32_t offset; } __attribute__((packed)); +struct cbfs_file_attributes { + uint32_t len; +} __attribute__((packed)); + +#define CBFS_FILE_ATTRIBUTES(_p) (((_p)->attributes_offset <= sizeof(_p)) ? NULL : \ + (struct cbfs_file_attributes *)(((uint8_t *)(_p)) + ntohl((_p)->attributes_offset))) + /* * ROMCC does not understand uint64_t, so we hide future definitions as they are * unlikely to be ever needed from ROMCC

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2015