coreboot-gerrit July 2015

coreboot-gerrit@coreboot.org

1 participants
1048 discussions

Patch merged into coreboot/master: x86 realmode: Set up the 8254 timer before running option rom
by gerrit＠coreboot.org 16 Jul '15

16 Jul '15

the following patch was just integrated into master: commit 741a0dd89ce67d0fed9a7907bb77ed3ea9afba81 Author: zbao <fishbaozi(a)gmail.com> Date: Thu Jun 25 16:58:53 2015 -0400 x86 realmode: Set up the 8254 timer before running option rom If the 8254 is not set up, the external graphics option rom hangs and never returns. The code is tested on AMD/bettong. Change-Id: I0022de9d9a275a7d4b7a331ae7fcf793b9f4c5f5 Signed-off-by: Zheng Bao <zheng.bao(a)amd.com> Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com> Reviewed-on: http://review.coreboot.org/10903 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marc.jones(a)se-eng.com> See http://review.coreboot.org/10903 for details. -gerrit

1 0

Patch merged into coreboot/master: AMD Merlin Falcon: Mask bit 31 of BIST while doing BIST check
by gerrit＠coreboot.org 16 Jul '15

16 Jul '15

the following patch was just integrated into master: commit fe234c4d2a6ce0e1279597566336fe9277b8aa3b Author: zbao <fishbaozi(a)gmail.com> Date: Thu Jul 2 16:53:09 2015 -0400 AMD Merlin Falcon: Mask bit 31 of BIST while doing BIST check This is a result of the Silcon Observation. On warm reset, the BIST is 0x80000000, which causes BIST error. We skip checking this bit. The update will be in CZ BKDG 1.05. The code is tested on AMD/bettong. Change-Id: I51c3f3567f758766079f7c8789f1ff072e1a7c53 Signed-off-by: Zheng Bao <zheng.bao(a)amd.com> Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com> Reviewed-on: http://review.coreboot.org/10902 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marc.jones(a)se-eng.com> See http://review.coreboot.org/10902 for details. -gerrit

1 0

Patch set updated for coreboot: Remove unused Kconfig symbols in c code
by Martin Roth 16 Jul '15

16 Jul '15

Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10941 -gerrit commit eb5394d2608dfa06d572849b8ab72a07b580ac7b Author: Martin Roth <gaumless(a)gmail.com> Date: Wed Jul 15 18:32:43 2015 -0600 Remove unused Kconfig symbols in c code The BROKEN_CAR_MIGRATE symbol was removed in commit a6371940 - x86 cache-as-ram: Remove BROKEN_CAR_MIGRATE option The symbol DISABLE_SANDYBRIDGE_HYPERTHREADING is from Sage, and was never added to the coreboot.org codebase. Change-Id: I953fe7c46106634a5a3fcdaff88b39e884f152e6 Signed-off-by: Martin Roth <gaumless(a)gmail.com> --- src/cpu/x86/car.c | 2 +- src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c index b0a86b1..b4345ea 100644 --- a/src/cpu/x86/car.c +++ b/src/cpu/x86/car.c @@ -138,7 +138,7 @@ static void do_car_migrate_variables(void) static void car_migrate_variables(int is_recovery) { - if (!IS_ENABLED(CONFIG_BROKEN_CAR_MIGRATE) && !IS_ENABLED(PLATFORM_USES_FSP1_0)) + if (!IS_ENABLED(PLATFORM_USES_FSP1_0)) do_car_migrate_variables(); } ROMSTAGE_CBMEM_INIT_HOOK(car_migrate_variables) diff --git a/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c b/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c index 0930da2..e9dad29 100644 --- a/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c +++ b/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c @@ -53,11 +53,7 @@ static void ConfigureDefaultUpdData(UPD_DATA_REGION *UpdData) } #else /* IS_ENABLED(CONFIG_SOUTHBRIDGE_INTEL_FSP_I89XX) */ const PLATFORM_CONFIG DefaultPlatformConfig = { -#if IS_ENABLED(CONFIG_DISABLE_SANDYBRIDGE_HYPERTHREADING) - FALSE, /* Hyperthreading */ -#else TRUE, /* Hyperthreading */ -#endif FALSE, /* Turbo Mode */ FALSE, /* Memory Down */ #if IS_ENABLED(CONFIG_ENABLE_FSP_FAST_BOOT)

1 0

New patch to review for coreboot: Remove unused Kconfig symbols in c code
by Martin Roth 16 Jul '15

16 Jul '15

Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10941 -gerrit commit d495001c8d976c429200fdcb0865db30e05f8551 Author: Martin Roth <gaumless(a)gmail.com> Date: Wed Jul 15 18:32:43 2015 -0600 Remove unused Kconfig symbols in c code The BROKEN_CAR_MIGRATE symbol was removed in commit a6371940 - x86 cache-as-ram: Remove BROKEN_CAR_MIGRATE option The symbol DISABLE_SANDYBRIDGE_HYPERTHREADING is from Sage, and was never added to the coreboot.org codebase. Change-Id: I953fe7c46106634a5a3fcdaff88b39e884f152e6 Signed-off-by: Martin Roth <gaumless(a)gmail.com> --- src/cpu/x86/car.c | 2 +- src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/cpu/x86/car.c b/src/cpu/x86/car.c index b0a86b1..3fa550f 100644 --- a/src/cpu/x86/car.c +++ b/src/cpu/x86/car.c @@ -138,7 +138,7 @@ static void do_car_migrate_variables(void) static void car_migrate_variables(int is_recovery) { - if (!IS_ENABLED(CONFIG_BROKEN_CAR_MIGRATE) && !IS_ENABLED(PLATFORM_USES_FSP1_0)) + if !IS_ENABLED(PLATFORM_USES_FSP1_0) do_car_migrate_variables(); } ROMSTAGE_CBMEM_INIT_HOOK(car_migrate_variables) diff --git a/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c b/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c index 0930da2..e9dad29 100644 --- a/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c +++ b/src/northbridge/intel/fsp_sandybridge/fsp/chipset_fsp_util.c @@ -53,11 +53,7 @@ static void ConfigureDefaultUpdData(UPD_DATA_REGION *UpdData) } #else /* IS_ENABLED(CONFIG_SOUTHBRIDGE_INTEL_FSP_I89XX) */ const PLATFORM_CONFIG DefaultPlatformConfig = { -#if IS_ENABLED(CONFIG_DISABLE_SANDYBRIDGE_HYPERTHREADING) - FALSE, /* Hyperthreading */ -#else TRUE, /* Hyperthreading */ -#endif FALSE, /* Turbo Mode */ FALSE, /* Memory Down */ #if IS_ENABLED(CONFIG_ENABLE_FSP_FAST_BOOT)

1 0

New patch to review for coreboot: pcengines/apu1: Add k10temp thermal zone.
by Tobias Diedrich 15 Jul '15

15 Jul '15

Tobias Diedrich (ranma+coreboot(a)tdiedrich.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10940 -gerrit commit 80cabf9a87f331f105aa0b8d87f3cf9d05af9a19 Author: Tobias Diedrich <ranma+coreboot(a)tdiedrich.de> Date: Sun Jun 21 18:25:38 2015 +0200 pcengines/apu1: Add k10temp thermal zone. Change-Id: Id9c5b783ba424246816677099ec6651814e59f21 Signed-off-by: Tobias Diedrich <ranma+coreboot(a)tdiedrich.de> --- src/mainboard/pcengines/apu1/acpi/thermal.asl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mainboard/pcengines/apu1/acpi/thermal.asl b/src/mainboard/pcengines/apu1/acpi/thermal.asl index baa4043..3e89ebf 100644 --- a/src/mainboard/pcengines/apu1/acpi/thermal.asl +++ b/src/mainboard/pcengines/apu1/acpi/thermal.asl @@ -15,7 +15,9 @@ * Foundation, Inc. */ -/* Thermal Zones have been #if 0 for a long time. - * Removing it for now because it doesn't seem to - * do anything when enabled anyway. - */ +Scope (\_SB.PCI0) { + Device (K10M) { + Name (_ADR, 0x00180003) + #include <northbridge/amd/amdfam10/thermal_mixin.asl> + } +}

1 0

New patch to review for coreboot: cbfs: mirror cbfs file attributes for compression
by Patrick Georgi 15 Jul '15

15 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 097f43cb760b1911f2b9598a37cb36d41d4fb5ca 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 7fa8dbb..ed848c8 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 == 0) ? NULL : \

1 0

New patch to review for coreboot: libpayload: allow compression at file header level
by Patrick Georgi 15 Jul '15

15 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 7284d14edd5b4b5c65c641be7a29b93a55e6d3fb 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 | 34 +++++++++++++++++++++++++-------- 3 files changed, 51 insertions(+), 16 deletions(-) diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h index 26730c9..eee587e 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 == 0) ? 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..eec244a 100644 --- a/payloads/libpayload/libcbfs/cbfs_core.c +++ b/payloads/libpayload/libcbfs/cbfs_core.c @@ -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

New patch to review for coreboot: libpayload: add cbfs_file attributes
by Patrick Georgi 15 Jul '15

15 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 7e6062cac626893f6f40b0e8e2d3f599cce1c4f9 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..26730c9 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; uint32_t offset; } __attribute__((packed)); +struct cbfs_file_attributes { + uint32_t len; +} __attribute__((packed)); + +#define CBFS_FILE_ATTRIBUTES(_p) (((_p)->attributes == 0) ? NULL : \ + (struct cbfs_file_attributes *)(((uint8_t *)(_p)) + ntohl((_p)->attributes))) + /*** Component sub-headers ***/ /* Following are component sub-headers for the "standard"

1 0

New patch to review for coreboot: cbfs: Add support for cbfs_file_attributes as far as required so far
by Patrick Georgi 15 Jul '15

15 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 bd58b42af92cbd183dbb8226a5c4b0edce420469 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..7fa8dbb 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; uint32_t offset; } __attribute__((packed)); +struct cbfs_file_attributes { + uint32_t len; +} __attribute__((packed)); + +#define CBFS_FILE_ATTRIBUTES(_p) (((_p)->attributes == 0) ? NULL : \ + (struct cbfs_file_attributes *)(((uint8_t *)(_p)) + ntohl((_p)->attributes))) + /* * ROMCC does not understand uint64_t, so we hide future definitions as they are * unlikely to be ever needed from ROMCC

1 0

New patch to review for coreboot: cbfstool: allow compression at file header level
by Patrick Georgi 15 Jul '15

15 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 e80a3fe38c5fd065559366a4ffc55a686adeb9e2 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 c53ac0e..c32ce2d 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -85,6 +85,9 @@ _Static_assert(sizeof(struct cbfs_file) == 24, "cbfs_file size mismatch"); struct cbfs_file_attributes { 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 9724543..c4b4c01 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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2015