coreboot-gerrit May 2015

coreboot-gerrit@coreboot.org

1 participants
1299 discussions

Patch set updated for coreboot: d47373e mainboard/lenovo/t400: Add initial ATPX ACPI implementation
by Timothy Pearson 07 May '15

07 May '15

Timothy Pearson (tpearson(a)raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9320 -gerrit commit d47373ef43b8e80da3f50e1fc507cd08aa63a43e Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Sun Apr 5 23:22:18 2015 -0500 mainboard/lenovo/t400: Add initial ATPX ACPI implementation Change-Id: I9b86ebec59ccb63db0e1ba61533d162507a22379 Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> --- src/mainboard/lenovo/t400/acpi/graphics.asl | 101 ++++++++++++++++++++++++++++ src/mainboard/lenovo/t400/dsdt.asl | 3 + 2 files changed, 104 insertions(+) diff --git a/src/mainboard/lenovo/t400/acpi/graphics.asl b/src/mainboard/lenovo/t400/acpi/graphics.asl new file mode 100644 index 0000000..e928d77 --- /dev/null +++ b/src/mainboard/lenovo/t400/acpi/graphics.asl @@ -0,0 +1,101 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2015 Timothy Pearson <tpearson(a)raptorengineeringinc.com>, Raptor Engineering + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* WARNING + * Switchable graphics not yet tested! + */ + +/* Hybrid graphics enable/disable GPIO bitfields */ +Name (HYG1, 0x004A0000) +Name (HYG2, 0x00020000) + +/* GPIO control port */ +Name (GPCP, DEFAULT_GPIOBASE) + +/* GPIO control map */ +OperationRegion (GPCM, SystemIO, GPCP, 0x3F) +Field (GPCM, ByteAcc, NoLock, Preserve) { + GPUS, 32, + GPIS, 32, + Offset (0x0C), + GPLV, 32, + Offset (0x30), + GQUS, 32, + GQIS, 32, + GQLV, 32 +} + +Method(SHYB, 1) { + /* Switch hybrid graphics */ + if (LEqual(Arg0, One)) + { + /* Discrete graphics requested */ + Or(GPLV, HYG1, GPLV) + Or(GQLV, HYG2, GQLV) + } + else + { + /* Integrated graphics requested */ + Xor(HYG1, 0xFFFFFFFF, Local0) + And(GPLV, Local0, GPLV) + Xor(HYG2, 0xFFFFFFFF, Local0) + And(GQLV, Local0, GQLV) + } +} + +Method (ATPX, 2, NotSerialized) { + /* Create local variables */ + Name (ATPR, Buffer (0x08) { + 0x0, 0x0, 0x0, 0x0, + 0x0, 0x0, 0x0, 0x0 + }) + CreateWordField (ATPR, 0x00, SIZE) + CreateWordField (ATPR, 0x02, VERS) + CreateDWordField (ATPR, 0x02, MASK) + CreateDWordField (ATPR, 0x04, FUNC) + CreateDWordField (ATPR, 0x06, FLAG) + + /* Version request */ + if (LEqual(Arg0, 0x0)) + { + /* Assemble and return version information */ + Store (0x08, SIZE) /* Response length */ + Store (0x01, VERS) /* Version number */ + Store (0x0F, FUNC) /* Supported functions? */ + Return (ATPR) + } + + /* Mux select */ + if (LEqual(Arg0, 0x2)) + { + CreateByteField (Arg1, 0x02, PWST) + Store (PWST, Local0) + And (Local0, 0x01, Local0) + If (Local0) + { + /* Enable discrete graphics */ + SHYB(0x01) + } + else + { + /* Enable integrated graphics */ + SHYB(0x00) + } + } +} diff --git a/src/mainboard/lenovo/t400/dsdt.asl b/src/mainboard/lenovo/t400/dsdt.asl index 0409e66..d2582ce 100644 --- a/src/mainboard/lenovo/t400/dsdt.asl +++ b/src/mainboard/lenovo/t400/dsdt.asl @@ -54,6 +54,9 @@ DefinitionBlock( /* Chipset specific sleep states */ #include <southbridge/intel/i82801ix/acpi/sleepstates.asl> + /* Hybrid graphics support code */ + #include "acpi/graphics.asl" + /* Dock support code */ #include "acpi/dock.asl" }

1 0

New patch to review for coreboot: a46a799 cpu/amd/model_10xxx: Add missing ACPI _PSD object
by Timothy Pearson 07 May '15

07 May '15

Timothy Pearson (tpearson(a)raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10142 -gerrit commit a46a7998c2d848114065d7d187da2df443b8eb00 Author: Timothy Pearson <tpearson(a)raptorengineeringinc.com> Date: Fri May 8 00:32:47 2015 -0500 cpu/amd/model_10xxx: Add missing ACPI _PSD object The ACPI power state generator for AMD 10xxx CPUs did not generate the _PSD object required for reliable PowerNow! operation. Generate the _PSD object in accordance with the BKDG Rev. 3.62. Change-Id: I255a4837ab29ff1b0874daf189ffb61798645795 Signed-off-by: Timothy Pearson <tpearson(a)raptorengineeringinc.com> --- src/cpu/amd/model_10xxx/powernow_acpi.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/cpu/amd/model_10xxx/powernow_acpi.c b/src/cpu/amd/model_10xxx/powernow_acpi.c index bf97099..3ead7f3 100644 --- a/src/cpu/amd/model_10xxx/powernow_acpi.c +++ b/src/cpu/amd/model_10xxx/powernow_acpi.c @@ -37,9 +37,11 @@ static void write_pstates_for_core(u8 pstate_num, u16 *pstate_feq, u32 *pstate_power, u32 *pstate_latency, u32 *pstate_control, u32 *pstate_status, int coreID, - u32 pcontrol_blk, u8 plen, u8 onlyBSP) + u32 pcontrol_blk, u8 plen, u8 onlyBSP, + uint8_t single_link) { int i; + struct cpuid_result cpuid1; if ((onlyBSP) && (coreID != 0)) { plen = 0; @@ -64,7 +66,21 @@ static void write_pstates_for_core(u8 pstate_num, u16 *pstate_feq, u32 *pstate_p /* update the package size */ acpigen_pop_len(); + /* Write PPC object */ acpigen_write_PPC(pstate_num); + + /* Write PSD indicating coordination type */ + if ((single_link) && (mctGetLogicalCPUID(0) & AMD_DR_GT_Bx)) { + /* Revision C or greater single-link processor */ + cpuid1 = cpuid(0x80000008); + acpigen_write_PSD_package(0, (cpuid1.ecx & 0xff) + 1, SW_ALL); + } + else { + /* Anything else */ + cpuid1 = cpuid(0x00000001); + acpigen_write_PSD_package((cpuid1.ebx & 0xff) >> 24, 1, SW_ANY); + } + /* patch the whole Processor token length */ acpigen_pop_len(); } @@ -160,6 +176,10 @@ void amd_generate_powernow(u32 pcontrol_blk, u8 plen, u8 onlyBSP) uint32_t core_power; uint32_t core_latency; uint32_t core_voltage; /* multiplied by 10000 */ + uint8_t single_link; + + /* Determine if this is a single-link system */ + single_link = !!(((pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x18, 0)), 0x80) & 0xff00) >> 8) == 0); /* Determine if this is a PVI or SVI system */ dtemp = pci_read_config32(dev_find_slot(0, PCI_DEVFN(0x18, 3)), 0xA0); @@ -266,6 +286,6 @@ void amd_generate_powernow(u32 pcontrol_blk, u8 plen, u8 onlyBSP) for (index = 0; index < cmp_cap; index++) write_pstates_for_core(Pstate_num, Pstate_feq, Pstate_power, Pstate_latency, Pstate_control, Pstate_status, - index, pcontrol_blk, plen, onlyBSP); + index, pcontrol_blk, plen, onlyBSP, single_link); acpigen_pop_len(); }

1 0

New patch to review for coreboot: 90f6c59 cbfstool: Fix strange flashmap whitespace
by Sol Boucher 07 May '15

07 May '15

Sol Boucher (solb(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10141 -gerrit commit 90f6c59558ed73e1b989129b4eb10933816349d8 Author: Sol Boucher <solb(a)chromium.org> Date: Thu May 7 16:41:46 2015 -0700 cbfstool: Fix strange flashmap whitespace This is being fixed in a separate commit so we can diff against the library as it existed in its own repo. Change-Id: Id87cd8f4e015a5ed7dd8a19302cc22ab744fefe8 Signed-off-by: Sol Boucher <solb(a)chromium.org> --- util/cbfstool/flashmap/fmap.c | 38 ++++++++++++------------ util/cbfstool/flashmap/fmap.h | 16 +++++------ util/cbfstool/flashmap/kv_pair.c | 12 ++++---- util/cbfstool/flashmap/kv_pair.h | 62 ++++++++++++++++++++-------------------- util/cbfstool/flashmap/valstr.c | 2 +- util/cbfstool/flashmap/valstr.h | 16 +++++------ 6 files changed, 73 insertions(+), 73 deletions(-) diff --git a/util/cbfstool/flashmap/fmap.c b/util/cbfstool/flashmap/fmap.c index 8850a92..68c7d83 100644 --- a/util/cbfstool/flashmap/fmap.c +++ b/util/cbfstool/flashmap/fmap.c @@ -76,8 +76,8 @@ static long int fmap_lsearch(const uint8_t *image, size_t len) for (offset = 0; offset < len - strlen(FMAP_SIGNATURE); offset++) { if (!memcmp(&image[offset], - FMAP_SIGNATURE, - strlen(FMAP_SIGNATURE))) { + FMAP_SIGNATURE, + strlen(FMAP_SIGNATURE))) { fmap_found = 1; break; } @@ -114,8 +114,8 @@ static long int fmap_bsearch(const uint8_t *image, size_t len) if ((offset % (stride * 2) == 0) && (offset != 0)) continue; if (!memcmp(&image[offset], - FMAP_SIGNATURE, - strlen(FMAP_SIGNATURE))) { + FMAP_SIGNATURE, + strlen(FMAP_SIGNATURE))) { fmap_found = 1; break; } @@ -163,19 +163,19 @@ int fmap_print(const struct fmap *fmap) struct kv_pair *kv = NULL; const uint8_t *tmp; - kv = kv_pair_new(); + kv = kv_pair_new(); if (!kv) return -1; tmp = fmap->signature; kv_pair_fmt(kv, "fmap_signature", - "0x%02x%02x%02x%02x%02x%02x%02x%02x", + "0x%02x%02x%02x%02x%02x%02x%02x%02x", tmp[0], tmp[1], tmp[2], tmp[3], tmp[4], tmp[5], tmp[6], tmp[7]); kv_pair_fmt(kv, "fmap_ver_major", "%d", fmap->ver_major); kv_pair_fmt(kv, "fmap_ver_minor","%d", fmap->ver_minor); kv_pair_fmt(kv, "fmap_base", "0x%016llx", - (unsigned long long)fmap->base); + (unsigned long long)fmap->base); kv_pair_fmt(kv, "fmap_size", "0x%04x", fmap->size); kv_pair_fmt(kv, "fmap_name", "%s", fmap->name); kv_pair_fmt(kv, "fmap_nareas", "%d", fmap->nareas); @@ -241,14 +241,14 @@ int fmap_get_csum(const uint8_t *image, unsigned int image_len, uint8_t **digest /* sanity check the offset */ if (fmap->areas[i].size + fmap->areas[i].offset > image_len) { fprintf(stderr, - "(%s) invalid parameter detected in area %d\n", - __func__, i); + "(%s) invalid parameter detected in area %d\n", + __func__, i); return -1; } SHA_update(&ctx, - image + fmap->areas[i].offset, - fmap->areas[i].size); + image + fmap->areas[i].offset, + fmap->areas[i].size); } SHA_final(&ctx); @@ -278,7 +278,7 @@ char *fmap_flags_to_string(uint16_t flags) total_size += strlen(tmp); str = realloc(str, total_size); strcat(str, tmp); - + flags &= ~(1 << i); if (flags) { total_size++; @@ -318,8 +318,8 @@ void fmap_destroy(struct fmap *fmap) { /* append area to existing structure, return new total size if successful */ int fmap_append_area(struct fmap **fmap, - uint32_t offset, uint32_t size, - const uint8_t *name, uint16_t flags) + uint32_t offset, uint32_t size, + const uint8_t *name, uint16_t flags) { struct fmap_area *area; int orig_size, new_size; @@ -513,10 +513,10 @@ static int fmap_append_area_test(struct fmap **fmap) total_size = sizeof(**fmap) + sizeof(test_area); if (fmap_append_area(fmap, - test_area.offset, - test_area.size, - test_area.name, - test_area.flags + test_area.offset, + test_area.size, + test_area.name, + test_area.flags ) != total_size) { printf("failed to append area\n"); goto fmap_append_area_test_exit; @@ -618,7 +618,7 @@ static int fmap_find_test(struct fmap *fmap) status = fail; /* - * Note: In these tests, we'll use fmap_find() and control usage of + * Note: In these tests, we'll use fmap_find() and control usage of * lsearch and bsearch by using a power-of-2 total_size. For lsearch, * use total_size - 1. For bsearch, use total_size. */ diff --git a/util/cbfstool/flashmap/fmap.h b/util/cbfstool/flashmap/fmap.h index 9cea22d..677576a 100644 --- a/util/cbfstool/flashmap/fmap.h +++ b/util/cbfstool/flashmap/fmap.h @@ -54,10 +54,10 @@ enum fmap_flags { /* Mapping of volatile and static regions in firmware binary */ struct fmap_area { - uint32_t offset; /* offset relative to base */ - uint32_t size; /* size in bytes */ - uint8_t name[FMAP_STRLEN]; /* descriptive name */ - uint16_t flags; /* flags for this area */ + uint32_t offset; /* offset relative to base */ + uint32_t size; /* size in bytes */ + uint8_t name[FMAP_STRLEN]; /* descriptive name */ + uint16_t flags; /* flags for this area */ } __attribute__((packed)); struct fmap { @@ -111,7 +111,7 @@ extern int fmap_print(const struct fmap *map); * returns <0 to indicate error */ extern int fmap_get_csum(const uint8_t *image, - unsigned int image_len, uint8_t **digest); + unsigned int image_len, uint8_t **digest); /* @@ -144,7 +144,7 @@ char *fmap_flags_to_string(uint16_t flags); * returns NULL to indicate failure */ extern struct fmap *fmap_create(uint64_t base, - uint32_t size, uint8_t *name); + uint32_t size, uint8_t *name); /* free memory used by an fmap structure */ extern void fmap_destroy(struct fmap *fmap); @@ -172,8 +172,8 @@ extern int fmap_size(struct fmap *fmap); * returns <0 to indicate failure */ extern int fmap_append_area(struct fmap **fmap, - uint32_t offset, uint32_t size, - const uint8_t *name, uint16_t flags); + uint32_t offset, uint32_t size, + const uint8_t *name, uint16_t flags); /* * fmap_find_area - find an fmap_area entry (by name) and return pointer to it diff --git a/util/cbfstool/flashmap/kv_pair.c b/util/cbfstool/flashmap/kv_pair.c index 2572c64..f163c13 100644 --- a/util/cbfstool/flashmap/kv_pair.c +++ b/util/cbfstool/flashmap/kv_pair.c @@ -76,7 +76,7 @@ struct kv_pair **kv_pair_new_array(size_t size) } struct kv_pair *kv_pair_add(struct kv_pair *kv_list, - const char *key, const char *value) + const char *key, const char *value) { struct kv_pair *kv_new; struct kv_pair *kv_ptr; @@ -117,7 +117,7 @@ kv_pair_add_failed: } struct kv_pair *kv_pair_add_bool(struct kv_pair *kv_list, - const char *key, int value) + const char *key, int value) { const char *str; @@ -130,7 +130,7 @@ struct kv_pair *kv_pair_add_bool(struct kv_pair *kv_list, } struct kv_pair *kv_pair_fmt(struct kv_pair *kv_list, - const char *kv_key, const char *format, ...) + const char *kv_key, const char *format, ...) { char kv_value[KV_PAIR_MAX_VALUE_LEN]; va_list vptr; @@ -173,7 +173,7 @@ void kv_pair_free_array(struct kv_pair **kv_array, size_t size) } void kv_pair_print_to_file(FILE* fp, struct kv_pair *kv_list, - enum kv_pair_style style) + enum kv_pair_style style) { struct kv_pair *kv_ptr; @@ -182,7 +182,7 @@ void kv_pair_print_to_file(FILE* fp, struct kv_pair *kv_list, for (kv_ptr = kv_list; kv_ptr != NULL; kv_ptr = kv_ptr->next) { if (kv_ptr->key && kv_ptr->value) { fprintf(fp, "%s=\"%s\" ", - kv_ptr->key, kv_ptr->value); + kv_ptr->key, kv_ptr->value); } } break; @@ -201,7 +201,7 @@ void kv_pair_print_to_file(FILE* fp, struct kv_pair *kv_list, for (kv_ptr = kv_list; kv_ptr != NULL; kv_ptr = kv_ptr->next) { if (kv_ptr->key && kv_ptr->value) fprintf(fp, "%-20s | %s\n", - kv_ptr->key, kv_ptr->value); + kv_ptr->key, kv_ptr->value); } break; } diff --git a/util/cbfstool/flashmap/kv_pair.h b/util/cbfstool/flashmap/kv_pair.h index b573530..9257a26 100644 --- a/util/cbfstool/flashmap/kv_pair.h +++ b/util/cbfstool/flashmap/kv_pair.h @@ -41,13 +41,13 @@ #include <string.h> /* key=value string pair list */ -#define KV_PAIR_MAX_VALUE_LEN 1024 +#define KV_PAIR_MAX_VALUE_LEN 1024 enum kv_pair_style { KV_STYLE_PAIR, /* key1="value1" key2="value2" */ KV_STYLE_VALUE, /* | value1 | value2 | */ - KV_STYLE_LONG, /* key1 | value1 */ - /* key2 | value2 */ + KV_STYLE_LONG, /* key1 | value1 */ + /* key2 | value2 */ }; struct kv_pair { @@ -61,7 +61,7 @@ extern enum kv_pair_style kv_pair_get_style(); extern void kv_pair_set_style(enum kv_pair_style style); /* - * kv_pair_new - create new key=value pair + * kv_pair_new - create new key=value pair * * returns pointer to new key=value pair * returns NULL to indicate error @@ -69,67 +69,67 @@ extern void kv_pair_set_style(enum kv_pair_style style); extern struct kv_pair *kv_pair_new(void); /* - * kv_pair_add - add new key=value pair to list + * kv_pair_add - add new key=value pair to list * - * @kv_list: key=value pair list - * @key: key string - * @value: value string + * @kv_list: key=value pair list + * @key: key string + * @value: value string * * returns pointer to new key=value pair * returns NULL to indicate error */ extern struct kv_pair *kv_pair_add(struct kv_pair *kv_list, - const char *key, const char *value); + const char *key, const char *value); /* - * kv_pair_add_bool - add new boolean kvpair to list + * kv_pair_add_bool - add new boolean kvpair to list * - * @kv_list: key=value pair list - * @key: key string - * @value: value + * @kv_list: key=value pair list + * @key: key string + * @value: value * * returns pointer to new key=value pair * returns NULL to indicate error */ extern struct kv_pair *kv_pair_add_bool(struct kv_pair *kv_list, - const char *key, int value); + const char *key, int value); /* - * kv_pair_fmt - add key=value pair based on printf format - * NOTE: uses variable argument list + * kv_pair_fmt - add key=value pair based on printf format + * NOTE: uses variable argument list * - * @kv_list: list of key=value pairs - * @kv_key: key string - * @format: printf-style format for value input - * @...: arguments to format + * @kv_list: list of key=value pairs + * @kv_key: key string + * @format: printf-style format for value input + * @...: arguments to format * * returns pointer to new key=value pair * returns NULL to indicate error */ extern struct kv_pair *kv_pair_fmt(struct kv_pair *kv_list, - const char *kv_key, const char *format, ...) - __attribute__((format(printf, 3, 4))); + const char *kv_key, const char *format, ...) + __attribute__((format(printf, 3, 4))); /* * kv_pair_free - clean a key=value pair list * - * @kv_list: pointer to key=value list + * @kv_list: pointer to key=value list */ extern void kv_pair_free(struct kv_pair *kv_list); /* * kv_pair_print - print a key=value pair list * - * @kv_list: pointer to key=value list - * @style: print style + * @kv_list: pointer to key=value list + * @style: print style */ extern void kv_pair_print_to_file(FILE* fp, struct kv_pair *kv_list, - enum kv_pair_style style); + enum kv_pair_style style); /* * kv_pair_print - print a key=value pair list to gsys output * - * @kv_list: pointer to key=value list + * @kv_list: pointer to key=value list */ extern void kv_pair_print(struct kv_pair *kv_list); @@ -137,16 +137,16 @@ extern void kv_pair_print(struct kv_pair *kv_list); /* * kv_pair_get_value - return first value with key match * - * @kv_list: pointer to key=value list - * @kv_key: key string + * @kv_list: pointer to key=value list + * @kv_key: key string */ extern const char *kv_pair_get_value(struct kv_pair *kv_list, - const char *kv_key); + const char *kv_key); /* * kv_pair_size - return number of kv pairs in the chain * - * @kv_list: pointer to key=value list + * @kv_list: pointer to key=value list */ extern int kv_pair_size(struct kv_pair *kv_list); diff --git a/util/cbfstool/flashmap/valstr.c b/util/cbfstool/flashmap/valstr.c index fa9ed82..8155c94 100644 --- a/util/cbfstool/flashmap/valstr.c +++ b/util/cbfstool/flashmap/valstr.c @@ -35,7 +35,7 @@ #include <valstr.h> const char *val2str_default(uint32_t val, const struct valstr *vs, - const char *def_str) + const char *def_str) { int i; diff --git a/util/cbfstool/flashmap/valstr.h b/util/cbfstool/flashmap/valstr.h index 3885ef7..9b57d58 100644 --- a/util/cbfstool/flashmap/valstr.h +++ b/util/cbfstool/flashmap/valstr.h @@ -43,21 +43,21 @@ struct valstr { /* * val2str_default - convert value to string * - * @val: value to convert - * @vs: value-string data - * @def_str: default string to return if no matching value found + * @val: value to convert + * @vs: value-string data + * @def_str: default string to return if no matching value found * * returns pointer to string * returns def_str if no matching value found */ const char *val2str_default(uint32_t val, const struct valstr *vs, - const char *def_str); + const char *def_str); /* * val2str - convert value to string * - * @val: value to convert - * @vs: value-string data + * @val: value to convert + * @vs: value-string data * * returns pointer to string * returns pointer to "unknown" static string if not found @@ -67,8 +67,8 @@ const char *val2str(uint32_t val, const struct valstr *vs); /* * str2val - convert string to value * - * @str: string to convert - * @vs: value-string data + * @str: string to convert + * @vs: value-string data * * returns value for string * returns value for last entry in value-string data if not found

1 0

Patch set updated for coreboot: dd6ecdd cbfstool: Fix cbfs_copy_instance()'s master header endianness
by Sol Boucher 07 May '15

07 May '15

Sol Boucher (solb(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10122 -gerrit commit dd6ecddc0d4d095773f67155ff73ab55d1a5dc28 Author: Sol Boucher <solb(a)chromium.org> Date: Tue May 5 15:35:18 2015 -0700 cbfstool: Fix cbfs_copy_instance()'s master header endianness The function hadn't been updated to account for the fact that we now copy an endianness-corrected CBFS master header into a separate buffer from the CBFS data: it still performed pointer arithmetic accross the two buffers and wrote the copied buffer into the image without restoring the original endianness. Change-Id: Ieb2a001f253494cf3a90d7e19cd260791200c4d3 Signed-off-by: Sol Boucher <solb(a)chromium.org> --- util/cbfstool/cbfs_image.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 8e0e9a4..457a873 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -336,17 +336,13 @@ int cbfs_copy_instance(struct cbfs_image *image, size_t copy_offset, size_t align, entry_offset; ssize_t last_entry_size; - size_t header_offset, header_end; size_t cbfs_offset, cbfs_end; size_t copy_end = copy_offset + copy_size; - align = htonl(image->header->align); + align = image->header->align; - header_offset = (char *)image->header - image->buffer.data; - header_end = header_offset + sizeof(image->header); - - cbfs_offset = htonl(image->header->offset); - cbfs_end = htonl(image->header->romsize); + cbfs_offset = image->header->offset; + cbfs_end = image->header->romsize; if (copy_end > image->buffer.size) { ERROR("Copy offset out of range: [%zx:%zx)\n", @@ -354,12 +350,7 @@ int cbfs_copy_instance(struct cbfs_image *image, size_t copy_offset, return 1; } - /* Range check requested copy region with header and source cbfs. */ - if ((copy_offset >= header_offset && copy_offset < header_end) || - (copy_end >= header_offset && copy_end <= header_end)) { - ERROR("New image would overlap old header.\n"); - } - + /* Range check requested copy region with source cbfs. */ if ((copy_offset >= cbfs_offset && copy_offset < cbfs_end) || (copy_end >= cbfs_offset && copy_end <= cbfs_end)) { ERROR("New image would overlap old one.\n"); @@ -368,7 +359,7 @@ int cbfs_copy_instance(struct cbfs_image *image, size_t copy_offset, /* This will work, let's create a copy. */ copy_header = (struct cbfs_header *)(image->buffer.data + copy_offset); - *copy_header = *image->header; + cbfs_put_header(copy_header, image->header); copy_header->bootblocksize = 0; /* Romsize is a misnomer. It's the absolute limit of cbfs content.*/

1 0

Patch set updated for coreboot: 1663924 fmaptool: Add listing of annotated CBFS sections and generate header
by Sol Boucher 07 May '15

07 May '15

Sol Boucher (solb(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9967 -gerrit commit 166392432a2c2c208be254ea800678a89d7af0bc Author: Sol Boucher <solb(a)chromium.org> Date: Wed Mar 18 10:13:48 2015 -0700 fmaptool: Add listing of annotated CBFS sections and generate header The fmd compiler now processes "(CBFS)" annotations, distilling them into a comma-separated list of the names of sections containing CBFSes. This list is the only thing printed to standard output to enable easy capture and machine consumption by other tools. Additionally, the ability to generate a tiny header with a define for the primary CBFS's size is implemented and can be requested via a new command-line switch. Here's an example of how to use the new features: $ ./fmaptool -h layout.h layout_arm_8192.fmd layout.fmap 2>/dev/null FW_MAIN_A,FW_MAIN_B,COREBOOT The hypothetical fmd file contains three sections annotated as (CBFS), the names of which are printed to standard output. As before, a binary FMAP file named layout.fmap is created; however, because the command was invoked with -h, a header #define ing the offset of its FMAP section (i.e. where it will be relative to the base of flash once the boot image is assembled) is also generated. BUG=chromium:470407 TEST=Verify that fmd files without a "COREBOOT" section or with one that isn't annotated as "(CBFS)" are not accepted. Ensure that the list of CBFS sections matches the descriptor file's annotations and is led by the "COREBOOT" section. Invoke with the header generation switch and check that output file for reasonableness. BRANCH=None Change-Id: I496dd937f69467bfd9233c28df59c7608e89538f Signed-off-by: Sol Boucher <solb(a)chromium.org> Original-Commit-Id: 9227698adecf675770b2983380eb570676c2b5d2 Original-Change-Id: I8b32f6ef19cabe2f6760106e676683c4565bbaad Original-Signed-off-by: Sol Boucher <solb(a)chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/262956 Original-Reviewed-by: Duncan Laurie <dlaurie(a)chromium.org> Original-Reviewed-by: Julius Werner <jwerner(a)chromium.org> --- util/cbfstool/Makefile | 3 +- util/cbfstool/Makefile.inc | 1 + util/cbfstool/cbfs_sections.c | 122 ++++++++++++++++++++++++++++ util/cbfstool/cbfs_sections.h | 59 ++++++++++++++ util/cbfstool/fmaptool.c | 181 +++++++++++++++++++++++++++++++++++------- 5 files changed, 337 insertions(+), 29 deletions(-) diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index 2c63e05..1edb092 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -22,7 +22,8 @@ CBFSTOOL_COMMON+=lzma/C/LzFind.o lzma/C/LzmaDec.o lzma/C/LzmaEnc.o CBFSTOOL_COMMON:=$(addprefix $(obj)/,$(CBFSTOOL_COMMON)) FMAPTOOL_BINARY:=$(obj)/fmaptool -FMAPTOOL_COMMON:=fmap_from_fmd.o fmd.o fmd_parser.o fmd_scanner.o +FMAPTOOL_COMMON:=cbfs_sections.o fmap_from_fmd.o +FMAPTOOL_COMMON+=fmd.o fmd_parser.o fmd_scanner.o # FMAP FMAPTOOL_COMMON+=flashmap/fmap.o FMAPTOOL_COMMON+=flashmap/kv_pair.o flashmap/valstr.o diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc index 7fba6be..bf7e1b8 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.inc @@ -19,6 +19,7 @@ cbfsobj += cbfs-payload-linux.o fmapobj := fmapobj += fmaptool.o +fmapobj += cbfs_sections.o fmapobj += fmap_from_fmd.o fmapobj += fmd.o fmapobj += fmd_parser.o diff --git a/util/cbfstool/cbfs_sections.c b/util/cbfstool/cbfs_sections.c new file mode 100644 index 0000000..81912d5 --- /dev/null +++ b/util/cbfstool/cbfs_sections.c @@ -0,0 +1,122 @@ +/* + * fmap_sections.c, track which sections of the image will contain CBFSes + * + * Copyright (C) 2015 Google, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#include "cbfs_sections.h" + +#include <assert.h> +#include <stdlib.h> +#include <string.h> + +struct descriptor_node { + const struct flashmap_descriptor *val; + struct descriptor_node *next; +}; + +static struct descriptor_list { + struct descriptor_node *head; + struct descriptor_node *tail; +} cbfs_sections; + +static bool seen_primary_section = false; + +static void descriptor_list_prepend(struct descriptor_list *list, + struct descriptor_node *new_head) +{ + assert(list); + assert(new_head); + + new_head->next = list->head; + list->head = new_head; + if (!list->tail) + list->tail = new_head; +} + +static void descriptor_list_append(struct descriptor_list *list, + struct descriptor_node *new_tail) +{ + assert(list); + assert(new_tail); + + if (list->tail) + list->tail->next = new_tail; + list->tail = new_tail; + if (!list->head) + list->head = new_tail; +} + +/* Implementation of cbfs module's callback; invoked during fmd file parsing */ +bool fmd_process_annotation_impl(const struct flashmap_descriptor *node, + const char *annotation) +{ + if (strcmp(annotation, SECTION_ANNOTATION_CBFS) == 0 && + node->list_len == 0) { + struct descriptor_node *list_node = malloc(sizeof(*list_node)); + list_node->val = node; + list_node->next = NULL; + + if (strcmp(node->name, SECTION_NAME_PRIMARY_CBFS) == 0) { + descriptor_list_prepend(&cbfs_sections, list_node); + seen_primary_section = true; + } else { + descriptor_list_append(&cbfs_sections, list_node); + } + + return true; + } + + return false; +} + +cbfs_section_iterator_t cbfs_sections_iterator(void) +{ + return cbfs_sections.head; +} + +bool cbfs_sections_iterator_advance(cbfs_section_iterator_t *it) +{ + assert(it); + if (!*it) + return false; + + *it = (*it)->next; + return true; +} + +const struct flashmap_descriptor *cbfs_sections_iterator_deref( + cbfs_section_iterator_t it) +{ + assert(it); + return it->val; +} + +bool cbfs_sections_primary_cbfs_accounted_for(void) +{ + return seen_primary_section; +} + +void cbfs_sections_cleanup(void) +{ + for (struct descriptor_node *cur = cbfs_sections.head, *next = NULL; + cur; cur = next) { + next = cur->next; + free(cur); + } + cbfs_sections.head = NULL; + cbfs_sections.tail = NULL; +} diff --git a/util/cbfstool/cbfs_sections.h b/util/cbfstool/cbfs_sections.h new file mode 100644 index 0000000..5a23899 --- /dev/null +++ b/util/cbfstool/cbfs_sections.h @@ -0,0 +1,59 @@ +/* + * fmap_sections.h, track which sections of the image will contain CBFSes + * + * Copyright (C) 2015 Google, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#ifndef CBFS_SECTIONS_H_ +#define CBFS_SECTIONS_H_ + +#include "fmd.h" + +#include <stdbool.h> + +#define SECTION_NAME_FMAP "FMAP" +#define SECTION_NAME_PRIMARY_CBFS "COREBOOT" + +#define SECTION_ANNOTATION_CBFS "CBFS" + +typedef const struct descriptor_node *cbfs_section_iterator_t; + +/** @return Iterator pointing to first CBFS section, or NULL if none exist */ +cbfs_section_iterator_t cbfs_sections_iterator(void); + +/** + * Advance iterator to point to the next CBFS section. + * If it was already pointing to the last such section, it will be set to NULL. + * + * @param it (Non-NULL) pointer to (possibly NULL) iterator to be updated + * @return Whether it was successfully advanced (wasn't already NULL) + */ +bool cbfs_sections_iterator_advance(cbfs_section_iterator_t *it); + +/** + * @param it Iterator, which must currently be non-NULL + * @return Section to which it points + */ +const struct flashmap_descriptor *cbfs_sections_iterator_deref( + cbfs_section_iterator_t it); + +/** @return Whether a section named SECTION_NAME_PRIMARY_CBFS is in the list. */ +bool cbfs_sections_primary_cbfs_accounted_for(void); + +/** Reclaim the space used to store knowledge of which sections are CBFSes. */ +void cbfs_sections_cleanup(void); + +#endif diff --git a/util/cbfstool/fmaptool.c b/util/cbfstool/fmaptool.c index 961e9dc..09b68d2 100644 --- a/util/cbfstool/fmaptool.c +++ b/util/cbfstool/fmaptool.c @@ -18,53 +18,149 @@ */ #include "common.h" +#include "cbfs_sections.h" #include "fmap_from_fmd.h" #include <stdio.h> #include <string.h> +#include <unistd.h> #define STDIN_FILENAME_SENTINEL "-" +#define HEADER_FMAP_OFFSET "FMAP_OFFSET" + enum fmaptool_return { FMAPTOOL_EXIT_SUCCESS = 0, FMAPTOOL_EXIT_BAD_ARGS, FMAPTOOL_EXIT_BAD_INPUT_PATH, FMAPTOOL_EXIT_BAD_OUTPUT_PATH, FMAPTOOL_EXIT_FAILED_DESCRIPTOR, + FMAPTOOL_EXIT_MISSING_FMAP_SECTION, + FMAPTOOL_EXIT_MISSING_PRIMARY_CBFS, FMAPTOOL_EXIT_FAILED_FMAP_CONVERSION, FMAPTOOL_EXIT_UNKNOWN_FMAP_SIZE, - FMAPTOOL_EXIT_FAILED_WRITING_FILE, + FMAPTOOL_EXIT_FAILED_WRITING_OUTPUT, + FMAPTOOL_EXIT_FAILED_WRITING_HEADER, }; -bool fmd_process_annotation_impl(unused const struct flashmap_descriptor *node, - unused const char *annotation) +static void usage(const char *invoked_as) { - // We always accept annotations, but never act on them. + fputs("fmaptool: Compiler for fmd (flashmap descriptor) files\n", + stderr); + fputs("\nUSAGE:\n", stderr); + fprintf(stderr, + "\t%s [-h <header output file>] <fmd input file> <binary output file>\n", + invoked_as); + fputs("\nMANDATORY ARGUMENTS:\n", stderr); + fprintf(stderr, + "<fmd input file> may be '%s' to read from standard input\n", + STDIN_FILENAME_SENTINEL); + fputs("<binary output file> must be a regular file\n", stderr); + fputs("\nOPTIONAL SWITCHES:\n", stderr); + fprintf(stderr, + "-h\tAlso produce a C header defining %s to the FMAP section's flash offset.\n", + HEADER_FMAP_OFFSET); + fputs("\nOUTPUT:\n", stderr); + fputs("A successful invocation prints a summary of work done to standard error, and a comma-separated list\n", + stderr); + fputs("of those sections that contain CBFSes, starting with the primary such section, to standard output.\n", + stderr); +} + +static void list_cbfs_section_names(void) +{ + cbfs_section_iterator_t cbfs_it = cbfs_sections_iterator(); + assert(cbfs_it); + + bool subsequent = false; + while (cbfs_it) { + const char *cur_name = + cbfs_sections_iterator_deref(cbfs_it)->name; + if (cbfs_sections_iterator_advance(&cbfs_it) && subsequent) + putchar(','); + fputs(cur_name, stdout); + subsequent = true; + } + putchar('\n'); +} + +static bool write_header(const char *out_fname, + const struct flashmap_descriptor *root) +{ + assert(out_fname); + + FILE *header = fopen(out_fname, "w"); + if (!header) { + fprintf(stderr, "FATAL: Unable to open file '%s' for writing\n", + out_fname); + return false; + } + + unsigned fmap_offset = + fmd_calc_absolute_offset(root, SECTION_NAME_FMAP); + assert(fmap_offset != FMD_NOTFOUND); + + fputs("#ifndef FMAPTOOL_GENERATED_HEADER_H_\n", header); + fputs("#define FMAPTOOL_GENERATED_HEADER_H_\n\n", header); + fprintf(header, "#define %s %#x\n\n", HEADER_FMAP_OFFSET, fmap_offset); + fputs("#endif\n", header); + + fclose(header); return true; } +static void full_fmd_cleanup(struct flashmap_descriptor **victim) +{ + assert(victim); + + cbfs_sections_cleanup(); + fmd_cleanup(*victim); + *victim = NULL; +} + int main(int argc, char **argv) { - if (argc != 3) { - fputs("Convert a human-readable flashmap descriptor (fmd) file into the binary FMAP format for use in firmware images\n", - stderr); - fprintf(stderr, - "USAGE: %s <fmd input file> <binary output file>\n", - argv[0]); - fprintf(stderr, - "To read from standard input, provide '%s' as the input filename.\n", - STDIN_FILENAME_SENTINEL); + struct { + // Mandatory + const char *fmd_filename; + const char *fmap_filename; + + // Optional + const char *header_filename; + } args = {NULL, NULL, NULL}; + + bool show_usage = false; + int each_arg; + while (!show_usage && (each_arg = getopt(argc, argv, ":h:")) != -1) { + switch (each_arg) { + case 'h': + args.header_filename = optarg; + break; + case ':': + fprintf(stderr, "-%c: Expected an accompanying value\n", + optopt); + show_usage = true; + break; + default: + fprintf(stderr, "-%c: Unexpected command-line switch\n", + optopt); + show_usage = true; + } + } + + if (show_usage || argc - optind != 2) { + usage(argv[0]); return FMAPTOOL_EXIT_BAD_ARGS; } - const char *fmd_filename = argv[1]; - const char *fmap_filename = argv[2]; + args.fmd_filename = argv[optind]; + args.fmap_filename = argv[optind + 1]; FILE *fmd_file = stdin; - if (strcmp(fmd_filename, STDIN_FILENAME_SENTINEL) != 0) { - fmd_file = fopen(fmd_filename, "r"); + if (strcmp(args.fmd_filename, STDIN_FILENAME_SENTINEL) != 0) { + fmd_file = fopen(args.fmd_filename, "r"); if (!fmd_file) { fprintf(stderr, "FATAL: Unable to open file '%s'\n", - fmd_filename); + args.fmd_filename); return FMAPTOOL_EXIT_BAD_INPUT_PATH; } } @@ -74,14 +170,32 @@ int main(int argc, char **argv) if (!descriptor) { fputs("FATAL: Failed while processing provided descriptor\n", stderr); + full_fmd_cleanup(&descriptor); return FMAPTOOL_EXIT_FAILED_DESCRIPTOR; } + if (!fmd_find_node(descriptor, SECTION_NAME_FMAP)) { + fprintf(stderr, + "FATAL: Flashmap descriptor must have an '%s' section\n", + SECTION_NAME_FMAP); + full_fmd_cleanup(&descriptor); + return FMAPTOOL_EXIT_MISSING_FMAP_SECTION; + } + + if (!cbfs_sections_primary_cbfs_accounted_for()) { + fprintf(stderr, + "FATAL: Flashmap descriptor must have a '%s' section that is annotated with '(%s)'\n", + SECTION_NAME_PRIMARY_CBFS, + SECTION_ANNOTATION_CBFS); + full_fmd_cleanup(&descriptor); + return FMAPTOOL_EXIT_MISSING_PRIMARY_CBFS; + } + struct fmap *flashmap = fmap_from_fmd(descriptor); if (!flashmap) { fputs("FATAL: Failed while constructing FMAP section\n", stderr); - fmd_cleanup(descriptor); + full_fmd_cleanup(&descriptor); return FMAPTOOL_EXIT_FAILED_FMAP_CONVERSION; } @@ -90,16 +204,16 @@ int main(int argc, char **argv) fputs("FATAL: Failed to determine FMAP section size\n", stderr); fmap_destroy(flashmap); - fmd_cleanup(descriptor); + full_fmd_cleanup(&descriptor); return FMAPTOOL_EXIT_UNKNOWN_FMAP_SIZE; } - FILE *fmap_file = fopen(fmap_filename, "wb"); + FILE *fmap_file = fopen(args.fmap_filename, "wb"); if (!fmap_file) { fprintf(stderr, "FATAL: Unable to open file '%s' for writing\n", - fmap_filename); + args.fmap_filename); fmap_destroy(flashmap); - fmd_cleanup(descriptor); + full_fmd_cleanup(&descriptor); return FMAPTOOL_EXIT_BAD_OUTPUT_PATH; } @@ -107,13 +221,24 @@ int main(int argc, char **argv) fputs("FATAL: Failed to write final FMAP to file\n", stderr); fclose(fmap_file); fmap_destroy(flashmap); - fmd_cleanup(descriptor); - return FMAPTOOL_EXIT_FAILED_WRITING_FILE; + full_fmd_cleanup(&descriptor); + return FMAPTOOL_EXIT_FAILED_WRITING_OUTPUT; } fclose(fmap_file); - printf("SUCCESS: Wrote %d bytes to file '%s'\n", size, fmap_filename); - fmap_destroy(flashmap); - fmd_cleanup(descriptor); + + if (args.header_filename && + !write_header(args.header_filename, descriptor)) { + full_fmd_cleanup(&descriptor); + return FMAPTOOL_EXIT_FAILED_WRITING_HEADER; + } + + fprintf(stderr, "SUCCESS: Wrote %d bytes to file '%s'%s\n", size, + args.fmap_filename, + args.header_filename ? " (and generated header)" : ""); + fputs("The sections containing CBFSes are: ", stderr); + list_cbfs_section_names(); + + full_fmd_cleanup(&descriptor); return FMAPTOOL_EXIT_SUCCESS; }

1 0

Patch set updated for coreboot: 0f88650 cbfstool: Make update-fit action work on new-style images
by Sol Boucher 07 May '15

07 May '15

Sol Boucher (solb(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10137 -gerrit commit 0f8865027f49585d1084c8c3e1c87297bbb0589b Author: Sol Boucher <solb(a)chromium.org> Date: Wed May 6 14:44:40 2015 -0700 cbfstool: Make update-fit action work on new-style images Because new images place the bootblock in a separate region from the primary CBFS, performing an update-fit operation requires reading an additional section and choosing a different destination for the write based on the image type. Since other actions are not affected by these requirements, the logic for the optional read and all writing is implemented in the cbfs_update_fit() function itself, rather than relying on the main() function for writing as the other actions do. Change-Id: I2024c59715120ecc3b9b158e007ebce75acff023 Signed-off-by: Sol Boucher <solb(a)chromium.org> --- util/cbfstool/cbfstool.c | 23 +++++++++++++++++++-- util/cbfstool/fit.c | 54 ++++++++++++++++++++++++++---------------------- util/cbfstool/fit.h | 17 +++++++++++++-- 3 files changed, 65 insertions(+), 29 deletions(-) diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index ea3c339..ac098e5 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -33,6 +33,8 @@ #include "fit.h" #include "partitioned_file.h" +#define SECTION_WITH_FIT_TABLE "BOOTBLOCK" + struct command { const char *name; const char *optstring; @@ -677,12 +679,29 @@ static int cbfs_update_fit(void) return 1; } + // Decide which region to read/write the FIT table from/to. + struct buffer bootblock; + if (partitioned_file_is_partitioned(param.image_file)) { + if (!partitioned_file_read_region(&bootblock, param.image_file, + SECTION_WITH_FIT_TABLE)) + return 1; + } else { + // In legacy images, the bootblock is part of the CBFS. + buffer_clone(&bootblock, param.image_region); + } + struct cbfs_image image; if (cbfs_image_from_buffer(&image, param.image_region, param.headeroffset)) return 1; - return fit_update_table(&image, param.fit_empty_entries, param.name); + if (fit_update_table(&bootblock, &image, param.name, + param.fit_empty_entries, convert_to_from_top_aligned)) + return 1; + + // The region to be written depends on the type of image, so we write it + // here rather than having main() write the CBFS region back as usual. + return !partitioned_file_write_region(param.image_file, &bootblock); } static int cbfs_copy(void) @@ -731,7 +750,7 @@ static const struct command commands[] = { {"print", "H:r:vh?", cbfs_print, true, false}, {"read", "r:f:vh?", cbfs_read, true, false}, {"remove", "H:r:n:vh?", cbfs_remove, true, true}, - {"update-fit", "H:r:n:x:vh?", cbfs_update_fit, true, true}, + {"update-fit", "H:r:n:x:vh?", cbfs_update_fit, true, false}, {"write", "r:f:udvh?", cbfs_write, true, true}, }; diff --git a/util/cbfstool/fit.c b/util/cbfstool/fit.c index 7dbfc51..97341b5 100644 --- a/util/cbfstool/fit.c +++ b/util/cbfstool/fit.c @@ -18,13 +18,10 @@ */ #include <stdint.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <stdio.h> -#include "common.h" -#include "cbfs.h" -#include "cbfs_image.h" #include "fit.h" /* FIXME: This code assumes it is being executed on a little endian machine. */ @@ -69,9 +66,9 @@ struct microcode_entry { int size; }; -static inline void *rom_buffer_pointer(struct cbfs_image *image, int offset) +static inline void *rom_buffer_pointer(struct buffer *buffer, int offset) { - return &image->buffer.data[offset]; + return &buffer->data[offset]; } static inline int fit_entry_size_bytes(struct fit_entry *entry) @@ -104,9 +101,10 @@ static inline int fit_entry_type(struct fit_entry *entry) * in the host address space at [4G - romsize -> 4G). It also assume all * pointers have values within this address range. */ -static inline int ptr_to_offset(uint32_t theromsize, uint32_t host_ptr) +static inline int ptr_to_offset(fit_offset_converter_t helper, + const struct buffer *region, uint32_t host_ptr) { - return (int)(theromsize + host_ptr); + return helper(region, -host_ptr); } /* @@ -114,25 +112,28 @@ static inline int ptr_to_offset(uint32_t theromsize, uint32_t host_ptr) * in the host address space at [4G - romsize -> 4G). It also assume all * pointers have values within this address range. */ -static inline uint32_t offset_to_ptr(uint32_t theromsize, int offset) +static inline uint32_t offset_to_ptr(fit_offset_converter_t helper, + const struct buffer *region, int offset) { - return -(theromsize - (uint32_t )offset); + return -helper(region, offset); } -static struct fit_table *locate_fit_table(struct cbfs_image *image) +static struct fit_table *locate_fit_table(fit_offset_converter_t offset_helper, + struct buffer *buffer) { struct fit_table *table; uint32_t *fit_pointer; - fit_pointer = rom_buffer_pointer(image, - ptr_to_offset(image->buffer.size, FIT_POINTER_LOCATION)); + fit_pointer = rom_buffer_pointer(buffer, + ptr_to_offset(offset_helper, buffer, + FIT_POINTER_LOCATION)); /* Ensure pointer is below 4GiB and within 16MiB of 4GiB */ if (fit_pointer[1] != 0 || fit_pointer[0] < FIT_TABLE_LOWEST_ADDRESS) return NULL; - table = rom_buffer_pointer(image, - ptr_to_offset(image->buffer.size, *fit_pointer)); + table = rom_buffer_pointer(buffer, + ptr_to_offset(offset_helper, buffer, *fit_pointer)); /* Check that the address field has the proper signature. */ if (strncmp((const char *)&table->header.address, FIT_HEADER_ADDRESS, @@ -168,9 +169,10 @@ static void update_fit_checksum(struct fit_table *fit) fit->header.checksum = -result; } -static void add_microcodde_entries(struct cbfs_image *image, - struct fit_table *fit, - struct microcode_entry *mcus, int num_mcus) +static void add_microcodde_entries(struct fit_table *fit, + const struct cbfs_image *image, + int num_mcus, struct microcode_entry *mcus, + fit_offset_converter_t offset_helper) { int i; @@ -178,7 +180,8 @@ static void add_microcodde_entries(struct cbfs_image *image, struct fit_entry *entry = &fit->entries[i]; struct microcode_entry *mcu = &mcus[i]; - entry->address = offset_to_ptr(image->buffer.size, mcu->offset); + entry->address = offset_to_ptr(offset_helper, &image->buffer, + mcu->offset); fit_entry_update_size(entry, mcu->size); entry->version = FIT_MICROCODE_VERSION; entry->type_checksum_valid = FIT_TYPE_MICROCODE; @@ -213,9 +216,9 @@ static int parse_microcode_blob(struct cbfs_image *image, num_mcus = 0; while (file_length > sizeof(struct microcode_header)) { - struct microcode_header *mcu_header; + const struct microcode_header *mcu_header; - mcu_header = rom_buffer_pointer(image, current_offset); + mcu_header = rom_buffer_pointer(&image->buffer, current_offset); /* Quickly sanity check a prospective microcode update. */ if (mcu_header->total_size < sizeof(*mcu_header)) @@ -243,8 +246,9 @@ static int parse_microcode_blob(struct cbfs_image *image, return 0; } -int fit_update_table(struct cbfs_image *image, int empty_entries, - const char *microcode_blob_name) +int fit_update_table(struct buffer *bootblock, struct cbfs_image *image, + const char *microcode_blob_name, int empty_entries, + fit_offset_converter_t offset_fn) { struct fit_table *fit; struct cbfs_file *mcode_file; @@ -252,7 +256,7 @@ int fit_update_table(struct cbfs_image *image, int empty_entries, int ret = 0; // struct rom_image image = { .rom = rom, .size = romsize, }; - fit = locate_fit_table(image); + fit = locate_fit_table(offset_fn, bootblock); if (!fit) { ERROR("FIT not found.\n"); @@ -279,7 +283,7 @@ int fit_update_table(struct cbfs_image *image, int empty_entries, goto out; } - add_microcodde_entries(image, fit, mcus, empty_entries); + add_microcodde_entries(fit, image, empty_entries, mcus, offset_fn); update_fit_checksum(fit); out: diff --git a/util/cbfstool/fit.h b/util/cbfstool/fit.h index 63e22f4..4dd0dc7 100644 --- a/util/cbfstool/fit.h +++ b/util/cbfstool/fit.h @@ -20,6 +20,19 @@ #ifndef __CBFSTOOL_FIT_H #define __CBFSTOOL_FIT_H -int fit_update_table(struct cbfs_image *image, - int empty_entries, const char *microcode_blob_name); +#include "cbfs_image.h" +#include "common.h" + +/* + * Converts between offsets from the start of the specified image region and + * "top-aligned" offsets from the top of the entire flash image. Should work in + * both directions: accepts either type of offset and produces the other type. + * The implementation must have some notion of the flash image's total size. + */ +typedef unsigned (*fit_offset_converter_t)(const struct buffer *region, + unsigned offset); + +int fit_update_table(struct buffer *bootblock, struct cbfs_image *image, + const char *microcode_blob_name, int empty_entries, + fit_offset_converter_t offset_fn); #endif

1 0

Patch set updated for coreboot: fc9b5bb cbfstool: Support top-aligned addresses for new-format images
by Sol Boucher 07 May '15

07 May '15

Sol Boucher (solb(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10136 -gerrit commit fc9b5bb82c493fe7116ec416df141bacfd67adce Author: Sol Boucher <solb(a)chromium.org> Date: Thu May 7 02:39:22 2015 -0700 cbfstool: Support top-aligned addresses for new-format images The cbfstool handling of new-style FMAP-driven "partitioned" images originally disallowed the use of x86-style top-aligned addresses with the add.* and layout actions because it wasn't obvious how they should work, especially since the normal addressing is done relative to each individual region for these types of images. Not surprisingly, however, the x86 portions of the build system make copious use of top-aligned addresses, so this allows their use with new images and specifies their behavior as being relative to the *image* end---not the region end---just as it is for legacy images. Change-Id: Icecc843f4f8b6bb52aa0ea16df771faa278228d2 Signed-off-by: Sol Boucher <solb(a)chromium.org> --- util/cbfstool/cbfs_image.c | 19 ++++++------------ util/cbfstool/cbfs_image.h | 4 +--- util/cbfstool/cbfstool.c | 43 ++++++++++++++++++++++++++++++---------- util/cbfstool/common.h | 2 ++ util/cbfstool/partitioned_file.c | 7 +++++++ util/cbfstool/partitioned_file.h | 3 +++ 6 files changed, 52 insertions(+), 26 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 4ecb461..8fb2a60 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -526,6 +526,12 @@ 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) { + assert(image); + assert(buffer); + assert(buffer->data); + assert(name); + assert(!IS_TOP_ALIGNED_ADDRESS(content_offset)); + uint32_t entry_type; uint32_t addr, addr_next; struct cbfs_file *entry, *next; @@ -537,19 +543,6 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, DEBUG("cbfs_add_entry('%s'@0x%x) => need_size = %u+%zu=%u\n", name, content_offset, header_size, buffer->size, need_size); - if (IS_TOP_ALIGNED_ADDRESS(content_offset)) { - if (!cbfs_is_legacy_cbfs(image)) { - ERROR("Top-aligned offsets are only supported for legacy CBFSes (with master headers)\n"); - return -1; - } - - // legacy cbfstool takes top-aligned address. - uint32_t theromsize = image->header.romsize; - INFO("Converting top-aligned address 0x%x to offset: 0x%x\n", - content_offset, content_offset + theromsize); - content_offset = theromsize + (int32_t)content_offset; - } - // Merge empty entries. DEBUG("(trying to merge empty entries...)\n"); cbfs_walk(image, cbfs_merge_empty_entry, NULL); diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 024edc5..5ff8a9a 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -22,8 +22,6 @@ #include "common.h" #include "cbfs.h" -#define IS_TOP_ALIGNED_ADDRESS(x) ((uint32_t)(x) > 0x80000000) - /* CBFS image processing */ struct cbfs_image { @@ -88,7 +86,7 @@ int cbfs_export_entry(struct cbfs_image *image, const char *entry_name, /* Adds an entry to CBFS image by given name and type. If content_offset is * non-zero, try to align "content" (CBFS_SUBHEADER(p)) at content_offset. - * Note that top-aligned addresses are only supported for legacy CBFSes. + * 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); diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 29ac6b6..ea3c339 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -98,6 +98,21 @@ static bool region_is_modern_cbfs(const char *region) CBFS_FILE_MAGIC, strlen(CBFS_FILE_MAGIC)); } +/* + * Converts between offsets from the start of the specified image region and + * "top-aligned" offsets from the top of the entire flash image. Works in either + * direction: pass in one type of offset and receive the other type. + * N.B. A top-aligned offset is always a positive number, and should not be + * confused with a top-aliged *address*, which is its arithmetic inverse. */ +static unsigned convert_to_from_top_aligned(const struct buffer *region, + unsigned offset) +{ + assert(region); + + size_t image_size = partitioned_file_total_size(param.image_file); + return image_size - region->offset - offset; +} + typedef int (*convert_buffer_t)(struct buffer *buffer, uint32_t *offset); static int cbfs_add_integer_component(const char *name, @@ -129,6 +144,10 @@ static int cbfs_add_integer_component(const char *name, goto done; } + if (IS_TOP_ALIGNED_ADDRESS(offset)) + offset = convert_to_from_top_aligned(param.image_region, + -offset); + if (cbfs_add_entry(&image, &buffer, name, CBFS_COMPONENT_RAW, offset) != 0) { ERROR("Failed to add %llu into ROM image as '%s'.\n", @@ -187,6 +206,10 @@ static int cbfs_add_component(const char *filename, return 1; } + if (IS_TOP_ALIGNED_ADDRESS(offset)) + offset = convert_to_from_top_aligned(param.image_region, + -offset); + if (cbfs_add_entry(&image, &buffer, name, type, offset) != 0) { ERROR("Failed to add '%s' into ROM image.\n", filename); buffer_delete(&buffer); @@ -439,11 +462,6 @@ static int cbfs_locate(void) param.headeroffset)) return 1; - if (!cbfs_is_legacy_cbfs(&image) && param.top_aligned) { - ERROR("The -T switch is only valid on legacy images having CBFS master headers\n"); - return 1; - } - if (cbfs_get_entry(&image, param.name)) WARN("'%s' already in CBFS.\n", param.name); @@ -464,7 +482,8 @@ static int cbfs_locate(void) } if (param.top_aligned) - address = address - image.header.romsize; + address = -convert_to_from_top_aligned(param.image_region, + address); printf("0x%x\n", address); return 0; @@ -806,7 +825,7 @@ static void usage(char *name) "USAGE:\n" " %s [-h]\n" " %s FILE COMMAND [-v] [PARAMETERS]...\n\n" "OPTIONs:\n" " -H header_offset Do not search for header; use this offset*\n" - " -T Output top-aligned memory address*\n" + " -T Output top-aligned memory address\n" " -u Accept short data; fill upward/from bottom\n" " -d Accept short data; fill downward/from top\n" " -v Provide verbose output\n" @@ -857,8 +876,8 @@ static void usage(char *name) "Updates the FIT table with microcode entries\n" "\n" "OFFSETs:\n" - " Numbers accompanying -b, -H, and -o switches may be provided\n" - " in two possible formats*: if their value is greater than\n" + " Numbers accompanying -b, -H, and -o switches* may be provided\n" + " in two possible formats: if their value is greater than\n" " 0x80000000, they are interpreted as a top-aligned x86 memory\n" " address; otherwise, they are treated as an offset into flash.\n" "ARCHes:\n" @@ -878,7 +897,11 @@ static void usage(char *name) " that, when working with such images, the -F and -r switches\n" " default to '%s' for convenience, and both the -b switch to\n" " CBFS operations and the output of the locate action become\n" - " relative to the selected CBFS region's lowest address.\n", + " relative to the selected CBFS region's lowest address.\n" + " The one exception to this rule is the top-aligned address,\n" + " which is always relative to the end of the entire image\n" + " rather than relative to the local region; this is true for\n" + " for both input (sufficiently large) and output (-T) data.\n", SECTION_NAME_FMAP, SECTION_NAME_PRIMARY_CBFS, SECTION_NAME_PRIMARY_CBFS ); diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index 831d3eb..392ec80 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -50,6 +50,8 @@ extern int verbose; #define MAX(x, y) ((x) > (y) ? (x) : (y)) #define MIN(x, y) ((x) < (y) ? (x) : (y)) +#define IS_TOP_ALIGNED_ADDRESS(x) ((uint32_t)(x) > 0x80000000) + #define unused __attribute__((unused)) static inline uint32_t align_up(uint32_t value, uint32_t align) diff --git a/util/cbfstool/partitioned_file.c b/util/cbfstool/partitioned_file.c index 6473963..0b25272 100644 --- a/util/cbfstool/partitioned_file.c +++ b/util/cbfstool/partitioned_file.c @@ -290,6 +290,13 @@ bool partitioned_file_is_partitioned(const partitioned_file_t *file) return partitioned_file_get_fmap(file) != NULL; } +size_t partitioned_file_total_size(const partitioned_file_t *file) +{ + assert(file); + + return file->buffer.size; +} + bool partitioned_file_region_check_magic(const partitioned_file_t *file, const char *region, const char *magic, size_t magic_len) { diff --git a/util/cbfstool/partitioned_file.h b/util/cbfstool/partitioned_file.h index 97d1b57..92f228e 100644 --- a/util/cbfstool/partitioned_file.h +++ b/util/cbfstool/partitioned_file.h @@ -133,6 +133,9 @@ void partitioned_file_close(partitioned_file_t *file); /** @return Whether the file is partitioned (i.e. not flat). */ bool partitioned_file_is_partitioned(const partitioned_file_t *file); +/** @return The image's overall filesize, regardless of whether it's flat. */ +size_t partitioned_file_total_size(const partitioned_file_t *file); + /** @return Whether the specified region begins with the magic bytes. */ bool partitioned_file_region_check_magic(const partitioned_file_t *file, const char *region, const char *magic, size_t magic_len);

1 0

Patch set updated for coreboot: 7872941 fmaptool: Conform to cbfstool's error message format
by Sol Boucher 07 May '15

07 May '15

Sol Boucher (solb(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10048 -gerrit commit 7872941a8263b6d8dd3276faa7f8383492f55e12 Author: Sol Boucher <solb(a)chromium.org> Date: Wed Mar 18 10:13:48 2015 -0700 fmaptool: Conform to cbfstool's error message format The tool now makes use of the ERROR() macros from common.h. Change-Id: Ie38f40c65f7b6d3bc2adb97e246224cd38d4cb99 Signed-off-by: Sol Boucher <solb(a)chromium.org> --- util/cbfstool/fmap_from_fmd.c | 15 +++----- util/cbfstool/fmd.c | 27 +++++--------- util/cbfstool/fmd_parser.c | 85 ++++++++++++++++++++++--------------------- util/cbfstool/fmd_parser.h | 4 +- util/cbfstool/fmd_parser.y | 13 ++++--- 5 files changed, 68 insertions(+), 76 deletions(-) diff --git a/util/cbfstool/fmap_from_fmd.c b/util/cbfstool/fmap_from_fmd.c index fa1024b..2671743 100644 --- a/util/cbfstool/fmap_from_fmd.c +++ b/util/cbfstool/fmap_from_fmd.c @@ -28,9 +28,8 @@ static bool fmap_append_fmd_node(struct fmap **flashmap, const struct flashmap_descriptor *section, unsigned absolute_watermark) { if (strlen(section->name) >= FMAP_STRLEN) { - fprintf(stderr, - "ERROR: Section name ('%s') exceeds %d character FMAP format limit\n", - section->name, FMAP_STRLEN - 1); + ERROR("Section name ('%s') exceeds %d character FMAP format limit\n", + section->name, FMAP_STRLEN - 1); return false; } @@ -38,9 +37,8 @@ static bool fmap_append_fmd_node(struct fmap **flashmap, if (fmap_append_area(flashmap, absolute_watermark, section->size, (uint8_t *)section->name, 0) < 0) { - fprintf(stderr, - "ERROR: Failed to insert section '%s' into FMAP\n", - section->name); + ERROR("Failed to insert section '%s' into FMAP\n", + section->name); return false; } @@ -59,8 +57,7 @@ struct fmap *fmap_from_fmd(const struct flashmap_descriptor *desc) assert(desc->size_known); if (strlen(desc->name) >= FMAP_STRLEN) { - fprintf(stderr, - "ERROR: Image name ('%s') exceeds %d character FMAP header limit\n", + ERROR("Image name ('%s') exceeds %d character FMAP header limit\n", desc->name, FMAP_STRLEN - 1); return NULL; } @@ -68,7 +65,7 @@ struct fmap *fmap_from_fmd(const struct flashmap_descriptor *desc) struct fmap *fmap = fmap_create(desc->offset_known ? desc->offset : 0, desc->size, (uint8_t *)desc->name); if (!fmap) { - fputs("ERROR: Failed to allocate FMAP header\n", stderr); + ERROR("Failed to allocate FMAP header\n"); return fmap; } diff --git a/util/cbfstool/fmd.c b/util/cbfstool/fmd.c index bfce049..a4430be 100644 --- a/util/cbfstool/fmd.c +++ b/util/cbfstool/fmd.c @@ -19,6 +19,7 @@ #include "fmd.h" +#include "common.h" #include "fmd_parser.h" #include "fmd_scanner.h" #include "option.h" @@ -56,8 +57,7 @@ static bool validate_descriptor_node(const struct flashmap_descriptor *node, ENTRY search_key = {node->name, NULL}; if (hsearch(search_key, FIND)) { - fprintf(stderr, "ERROR: Multiple sections with name '%s'\n", - node->name); + ERROR("Multiple sections with name '%s'\n", node->name); return false; } if (!hsearch(search_key, ENTER)) @@ -65,26 +65,22 @@ static bool validate_descriptor_node(const struct flashmap_descriptor *node, if (node->offset_known) { if (start.val_known && node->offset < start.val) { - fprintf(stderr, "ERROR: Section '%s' starts too low\n", - node->name); + ERROR("Section '%s' starts too low\n", node->name); return false; } else if (end.val_known && node->offset > end.val) { - fprintf(stderr, "ERROR: Section '%s' starts too high\n", - node->name); + ERROR("Section '%s' starts too high\n", node->name); return false; } } if (node->size_known) { if (node->size == 0) { - fprintf(stderr, "ERROR: Section '%s' given no space\n", - node->name); + ERROR("Section '%s' given no space\n", node->name); return false; } else if (node->offset_known) { unsigned node_end = node->offset + node->size; if (end.val_known && node_end > end.val) { - fprintf(stderr, "ERROR: Section '%s' too big\n", - node->name); + ERROR("Section '%s' too big\n", node->name); return false; } } @@ -120,16 +116,14 @@ static bool complete_missing_info_backward( assert(cur->offset_known || cur->size_known); if (!cur->offset_known) { if (cur->size > end_watermark) { - fprintf(stderr, "ERROR: Section '%s' too big\n", - cur->name); + ERROR("Section '%s' too big\n", cur->name); return false; } cur->offset_known = true; cur->offset = end_watermark -= cur->size; } else if (!cur->size_known) { if (cur->offset > end_watermark) { - fprintf(stderr, - "ERROR: Section '%s' starts too high\n", + ERROR("Section '%s' starts too high\n", cur->name); return false; } @@ -230,8 +224,7 @@ static bool validate_and_complete_info(struct flashmap_descriptor *cur_level) if (!cur_section->size_known) { if (!cur_section->offset_known) { - fprintf(stderr, - "ERROR: Cannot determine either offset or size of section '%s'\n", + ERROR("Cannot determine either offset or size of section '%s'\n", cur_section->name); return false; } else if (!first_incomplete_it) { @@ -315,7 +308,7 @@ struct flashmap_descriptor *fmd_create(FILE *stream) // This hash table is used to store the declared name of each // section and ensure that each is globally unique. if (!hcreate(fmd_count_nodes(ret))) { - perror("ERROR: While initializing hashtable"); + perror("E: While initializing hashtable"); fmd_cleanup(ret); return NULL; } diff --git a/util/cbfstool/fmd_parser.c b/util/cbfstool/fmd_parser.c index d97e743..d463393 100644 --- a/util/cbfstool/fmd_parser.c +++ b/util/cbfstool/fmd_parser.c @@ -65,12 +65,13 @@ #line 20 "fmd_parser.y" /* yacc.c:339 */ #include "fmd_scanner.h" +#include "common.h" #include <stdlib.h> struct flashmap_descriptor *res = NULL; -#line 74 "y.tab.c" /* yacc.c:339 */ +#line 75 "y.tab.c" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -100,7 +101,7 @@ struct flashmap_descriptor *res = NULL; extern int yydebug; #endif /* "%code requires" blocks. */ -#line 36 "fmd_parser.y" /* yacc.c:355 */ +#line 37 "fmd_parser.y" /* yacc.c:355 */ #include "fmd.h" #include "option.h" @@ -125,7 +126,7 @@ struct flashmap_descriptor *parse_descriptor(char *name, struct descriptor_list children); void yyerror(const char *s); -#line 129 "y.tab.c" /* yacc.c:355 */ +#line 130 "y.tab.c" /* yacc.c:355 */ /* Token type. */ #ifndef YYTOKENTYPE @@ -147,7 +148,7 @@ void yyerror(const char *s); typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 28 "fmd_parser.y" /* yacc.c:355 */ +#line 29 "fmd_parser.y" /* yacc.c:355 */ unsigned intval; char *strval; @@ -155,7 +156,7 @@ union YYSTYPE struct flashmap_descriptor *region_ptr; struct descriptor_list region_listhdr; -#line 159 "y.tab.c" /* yacc.c:355 */ +#line 160 "y.tab.c" /* yacc.c:355 */ }; # define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_DECLARED 1 @@ -170,7 +171,7 @@ int yyparse (void); /* Copy the second part of user declarations. */ -#line 174 "y.tab.c" /* yacc.c:358 */ +#line 175 "y.tab.c" /* yacc.c:358 */ #ifdef short # undef short @@ -468,8 +469,8 @@ static const yytype_uint8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint8 yyrline[] = { - 0, 79, 79, 84, 101, 108, 109, 110, 111, 112, - 113, 114, 115, 116, 118, 122, 123, 124, 135 + 0, 80, 80, 85, 102, 109, 110, 111, 112, 113, + 114, 115, 116, 117, 119, 123, 124, 125, 136 }; #endif @@ -1251,16 +1252,16 @@ yyreduce: switch (yyn) { case 2: -#line 80 "fmd_parser.y" /* yacc.c:1646 */ +#line 81 "fmd_parser.y" /* yacc.c:1646 */ { if (!(res = parse_descriptor((yyvsp[-3].strval), (yyvsp[-2].maybe_intval), (yyvsp[-1].maybe_intval), (yyvsp[0].region_listhdr)))) YYABORT; } -#line 1260 "y.tab.c" /* yacc.c:1646 */ +#line 1261 "y.tab.c" /* yacc.c:1646 */ break; case 3: -#line 86 "fmd_parser.y" /* yacc.c:1646 */ +#line 87 "fmd_parser.y" /* yacc.c:1646 */ { struct flashmap_descriptor *node = parse_descriptor((yyvsp[-4].strval), (yyvsp[-2].maybe_intval), (yyvsp[-1].maybe_intval), (yyvsp[0].region_listhdr)); if (!node) @@ -1268,7 +1269,7 @@ yyreduce: char *annotation = (yyvsp[-3].strval); if (annotation && !fmd_process_annotation_impl(node, annotation)) { - fprintf(stderr, "ERROR: Section '%s' has unexpected annotation '(%s)'\n", + ERROR("Section '%s' has unexpected annotation '(%s)'\n", node->name, annotation); YYABORT; } @@ -1276,92 +1277,92 @@ yyreduce: (yyval.region_ptr) = node; } -#line 1280 "y.tab.c" /* yacc.c:1646 */ +#line 1281 "y.tab.c" /* yacc.c:1646 */ break; case 4: -#line 102 "fmd_parser.y" /* yacc.c:1646 */ +#line 103 "fmd_parser.y" /* yacc.c:1646 */ { if (!(yyvsp[0].strval)) { - perror("ERROR: While allocating section name"); + perror("E: While allocating section name"); YYABORT; } } -#line 1291 "y.tab.c" /* yacc.c:1646 */ +#line 1292 "y.tab.c" /* yacc.c:1646 */ break; case 5: -#line 108 "fmd_parser.y" /* yacc.c:1646 */ +#line 109 "fmd_parser.y" /* yacc.c:1646 */ { (yyval.strval) = NULL; } -#line 1297 "y.tab.c" /* yacc.c:1646 */ +#line 1298 "y.tab.c" /* yacc.c:1646 */ break; case 7: -#line 110 "fmd_parser.y" /* yacc.c:1646 */ +#line 111 "fmd_parser.y" /* yacc.c:1646 */ { (yyval.strval) = (yyvsp[-1].strval); } -#line 1303 "y.tab.c" /* yacc.c:1646 */ +#line 1304 "y.tab.c" /* yacc.c:1646 */ break; case 8: -#line 111 "fmd_parser.y" /* yacc.c:1646 */ +#line 112 "fmd_parser.y" /* yacc.c:1646 */ { (yyval.maybe_intval) = (struct unsigned_option){false, 0}; } -#line 1309 "y.tab.c" /* yacc.c:1646 */ +#line 1310 "y.tab.c" /* yacc.c:1646 */ break; case 10: -#line 113 "fmd_parser.y" /* yacc.c:1646 */ +#line 114 "fmd_parser.y" /* yacc.c:1646 */ { (yyval.maybe_intval) = (struct unsigned_option){true, (yyvsp[0].intval)}; } -#line 1315 "y.tab.c" /* yacc.c:1646 */ +#line 1316 "y.tab.c" /* yacc.c:1646 */ break; case 11: -#line 114 "fmd_parser.y" /* yacc.c:1646 */ +#line 115 "fmd_parser.y" /* yacc.c:1646 */ { (yyval.maybe_intval) = (struct unsigned_option){false, 0}; } -#line 1321 "y.tab.c" /* yacc.c:1646 */ +#line 1322 "y.tab.c" /* yacc.c:1646 */ break; case 13: -#line 116 "fmd_parser.y" /* yacc.c:1646 */ +#line 117 "fmd_parser.y" /* yacc.c:1646 */ { (yyval.maybe_intval) = (struct unsigned_option){true, (yyvsp[0].intval)}; } -#line 1327 "y.tab.c" /* yacc.c:1646 */ +#line 1328 "y.tab.c" /* yacc.c:1646 */ break; case 14: -#line 118 "fmd_parser.y" /* yacc.c:1646 */ +#line 119 "fmd_parser.y" /* yacc.c:1646 */ { (yyval.region_listhdr) = (struct descriptor_list) {.len = 0, .head = NULL, .tail = NULL}; } -#line 1336 "y.tab.c" /* yacc.c:1646 */ +#line 1337 "y.tab.c" /* yacc.c:1646 */ break; case 16: -#line 123 "fmd_parser.y" /* yacc.c:1646 */ +#line 124 "fmd_parser.y" /* yacc.c:1646 */ { (yyval.region_listhdr) = (yyvsp[-1].region_listhdr); } -#line 1342 "y.tab.c" /* yacc.c:1646 */ +#line 1343 "y.tab.c" /* yacc.c:1646 */ break; case 17: -#line 125 "fmd_parser.y" /* yacc.c:1646 */ +#line 126 "fmd_parser.y" /* yacc.c:1646 */ { struct descriptor_node *node = malloc(sizeof(*node)); if (!node) { - perror("ERROR: While allocating linked list node"); + perror("E: While allocating linked list node"); YYABORT; } node->val = (yyvsp[0].region_ptr); node->next = NULL; (yyval.region_listhdr) = (struct descriptor_list){.len = 1, .head = node, .tail = node}; } -#line 1357 "y.tab.c" /* yacc.c:1646 */ +#line 1358 "y.tab.c" /* yacc.c:1646 */ break; case 18: -#line 136 "fmd_parser.y" /* yacc.c:1646 */ +#line 137 "fmd_parser.y" /* yacc.c:1646 */ { struct descriptor_node *node = malloc(sizeof(*node)); if (!node) { - perror("ERROR: While allocating linked list node"); + perror("E: While allocating linked list node"); YYABORT; } node->val = (yyvsp[0].region_ptr); @@ -1371,11 +1372,11 @@ yyreduce: (yyval.region_listhdr) = (struct descriptor_list) {.len = (yyvsp[-1].region_listhdr).len + 1, .head = (yyvsp[-1].region_listhdr).head, .tail = node}; } -#line 1375 "y.tab.c" /* yacc.c:1646 */ +#line 1376 "y.tab.c" /* yacc.c:1646 */ break; -#line 1379 "y.tab.c" /* yacc.c:1646 */ +#line 1380 "y.tab.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -1603,7 +1604,7 @@ yyreturn: #endif return yyresult; } -#line 150 "fmd_parser.y" /* yacc.c:1906 */ +#line 151 "fmd_parser.y" /* yacc.c:1906 */ struct flashmap_descriptor *parse_descriptor(char *name, @@ -1612,7 +1613,7 @@ struct flashmap_descriptor *parse_descriptor(char *name, { struct flashmap_descriptor *region = malloc(sizeof(*region)); if (!region) { - perror("ERROR: While allocating descriptor section"); + perror("E: While allocating descriptor section"); return NULL; } region->name = name; @@ -1624,7 +1625,7 @@ struct flashmap_descriptor *parse_descriptor(char *name, if (region->list_len) { region->list = malloc(region->list_len * sizeof(*region->list)); if (!region->list) { - perror("ERROR: While allocating node children array"); + perror("E: While allocating node children array"); return NULL; } struct descriptor_node *cur_node = children.head; diff --git a/util/cbfstool/fmd_parser.h b/util/cbfstool/fmd_parser.h index 393a8ff..dc6301d 100644 --- a/util/cbfstool/fmd_parser.h +++ b/util/cbfstool/fmd_parser.h @@ -40,7 +40,7 @@ extern int yydebug; #endif /* "%code requires" blocks. */ -#line 36 "fmd_parser.y" /* yacc.c:1909 */ +#line 37 "fmd_parser.y" /* yacc.c:1909 */ #include "fmd.h" #include "option.h" @@ -87,7 +87,7 @@ void yyerror(const char *s); typedef union YYSTYPE YYSTYPE; union YYSTYPE { -#line 28 "fmd_parser.y" /* yacc.c:1909 */ +#line 29 "fmd_parser.y" /* yacc.c:1909 */ unsigned intval; char *strval; diff --git a/util/cbfstool/fmd_parser.y b/util/cbfstool/fmd_parser.y index 292fba3..2327ae4 100644 --- a/util/cbfstool/fmd_parser.y +++ b/util/cbfstool/fmd_parser.y @@ -19,6 +19,7 @@ %{ #include "fmd_scanner.h" +#include "common.h" #include <stdlib.h> @@ -90,7 +91,7 @@ flash_region: region_name region_annotation_opt region_offset_opt char *annotation = $2; if (annotation && !fmd_process_annotation_impl(node, annotation)) { - fprintf(stderr, "ERROR: Section '%s' has unexpected annotation '(%s)'\n", + ERROR("Section '%s' has unexpected annotation '(%s)'\n", node->name, annotation); YYABORT; } @@ -101,7 +102,7 @@ flash_region: region_name region_annotation_opt region_offset_opt region_name: STRING { if (!$1) { - perror("ERROR: While allocating section name"); + perror("E: While allocating section name"); YYABORT; } }; @@ -125,7 +126,7 @@ region_list_entries: flash_region { struct descriptor_node *node = malloc(sizeof(*node)); if (!node) { - perror("ERROR: While allocating linked list node"); + perror("E: While allocating linked list node"); YYABORT; } node->val = $1; @@ -136,7 +137,7 @@ region_list_entries: flash_region { struct descriptor_node *node = malloc(sizeof(*node)); if (!node) { - perror("ERROR: While allocating linked list node"); + perror("E: While allocating linked list node"); YYABORT; } node->val = $2; @@ -155,7 +156,7 @@ struct flashmap_descriptor *parse_descriptor(char *name, { struct flashmap_descriptor *region = malloc(sizeof(*region)); if (!region) { - perror("ERROR: While allocating descriptor section"); + perror("E: While allocating descriptor section"); return NULL; } region->name = name; @@ -167,7 +168,7 @@ struct flashmap_descriptor *parse_descriptor(char *name, if (region->list_len) { region->list = malloc(region->list_len * sizeof(*region->list)); if (!region->list) { - perror("ERROR: While allocating node children array"); + perror("E: While allocating node children array"); return NULL; } struct descriptor_node *cur_node = children.head;

1 0

Patch set updated for coreboot: 7b9a071 cbfstool: Eliminate useless cbfs_image_create() local variable
by Sol Boucher 07 May '15

07 May '15

Sol Boucher (solb(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10131 -gerrit commit 7b9a0713e0670fa88bbeab493a0f3f87488ecdc2 Author: Sol Boucher <solb(a)chromium.org> Date: Tue May 5 20:35:26 2015 -0700 cbfstool: Eliminate useless cbfs_image_create() local variable The only operation performed on this struct turned out to be sizeof... Change-Id: I619db60ed2e7ef6c196dd2600dc83bad2fdc6a55 Signed-off-by: Sol Boucher <solb(a)chromium.org> --- 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 3df291a..16dc3dc 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -191,7 +191,6 @@ int cbfs_image_create(struct cbfs_image *image, uint32_t header_offset, uint32_t entries_offset) { - struct cbfs_header header; struct cbfs_file *entry; int32_t *rel_offset; uint32_t cbfs_len; @@ -200,8 +199,8 @@ int cbfs_image_create(struct cbfs_image *image, DEBUG("cbfs_image_create: bootblock=0x%x+0x%zx, " "header=0x%x+0x%zx, entries_offset=0x%x\n", - bootblock_offset, bootblock->size, - header_offset, sizeof(header), entries_offset); + bootblock_offset, bootblock->size, header_offset, + sizeof(image->header), entries_offset); // This attribute must be given in order to prove that this module // correctly preserves certain CBFS properties. See the block comment @@ -245,9 +244,9 @@ int cbfs_image_create(struct cbfs_image *image, bootblock->size); // Prepare header - if (header_offset + sizeof(header) > size - sizeof(int32_t)) { + if (header_offset + sizeof(image->header) > size - sizeof(int32_t)) { ERROR("Header (0x%x+0x%zx) exceed ROM size (0x%zx)\n", - header_offset, sizeof(header), size); + header_offset, sizeof(image->header), size); return -1; } image->header.magic = CBFS_HEADER_MAGIC;

1 0

Patch set updated for coreboot: f712faa cbfstool: Import minimal set of files from flashmap
by Sol Boucher 07 May '15

07 May '15

Sol Boucher (solb(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9940 -gerrit commit f712faa907a97a3c0012dabe357ab2b87bfdc5dd Author: Sol Boucher <solb(a)chromium.org> Date: Fri Feb 27 17:07:30 2015 -0800 cbfstool: Import minimal set of files from flashmap flashmap was developed in a separate repository until now. Import the files from the 2012 version of the project [1]. [1] https://code.google.com/p/flashmap BUG=chromium:461875 TEST=None BRANCH=None Change-Id: Ida33f81509abc1cf2e532435adbbf31919d96bd8 Signed-off-by: Sol Boucher <solb(a)chromium.org> Original-Commit-Id: f44e1d1864babe244f07ca49655f0b80b84e890d Original-Change-Id: Ibf191d34df738449c9b9d7ebccca3d7f4150d4d3 Original-Signed-off-by: Sol Boucher <solb(a)chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/254801 Original-Reviewed-by: Julius Werner <jwerner(a)chromium.org> --- util/cbfstool/flashmap/fmap.c | 727 +++++++++++++++++++++++++++++++++++++++ util/cbfstool/flashmap/fmap.h | 192 +++++++++++ util/cbfstool/flashmap/kv_pair.c | 242 +++++++++++++ util/cbfstool/flashmap/kv_pair.h | 153 ++++++++ util/cbfstool/flashmap/valstr.c | 65 ++++ util/cbfstool/flashmap/valstr.h | 78 +++++ 6 files changed, 1457 insertions(+) diff --git a/util/cbfstool/flashmap/fmap.c b/util/cbfstool/flashmap/fmap.c new file mode 100644 index 0000000..8850a92 --- /dev/null +++ b/util/cbfstool/flashmap/fmap.c @@ -0,0 +1,727 @@ +/* Copyright 2010, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + */ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <sys/mman.h> +#include <errno.h> +#include <inttypes.h> +#include <limits.h> +#include <assert.h> + +#include <fmap.h> +#include <valstr.h> + +#include "kv_pair.h" +#include "mincrypt/sha.h" + +#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + +const struct valstr flag_lut[] = { + { FMAP_AREA_STATIC, "static" }, + { FMAP_AREA_COMPRESSED, "compressed" }, + { FMAP_AREA_RO, "ro" }, +}; + +/* returns size of fmap data structure if successful, <0 to indicate error */ +int fmap_size(struct fmap *fmap) +{ + if (!fmap) + return -1; + + return sizeof(*fmap) + (fmap->nareas * sizeof(struct fmap_area)); +} + +/* brute force linear search */ +static long int fmap_lsearch(const uint8_t *image, size_t len) +{ + long int offset; + int fmap_found = 0; + + for (offset = 0; offset < len - strlen(FMAP_SIGNATURE); offset++) { + if (!memcmp(&image[offset], + FMAP_SIGNATURE, + strlen(FMAP_SIGNATURE))) { + fmap_found = 1; + break; + } + } + + if (!fmap_found) + return -1; + + if (offset + fmap_size((struct fmap *)&image[offset]) > len) + return -1; + + return offset; +} + +/* if image length is a power of 2, use binary search */ +static long int fmap_bsearch(const uint8_t *image, size_t len) +{ + long int offset = -1; + int fmap_found = 0, stride; + + /* + * For efficient operation, we start with the largest stride possible + * and then decrease the stride on each iteration. Also, check for a + * remainder when modding the offset with the previous stride. This + * makes it so that each offset is only checked once. + */ + for (stride = len / 2; stride >= 1; stride /= 2) { + if (fmap_found) + break; + + for (offset = 0; + offset < len - strlen(FMAP_SIGNATURE); + offset += stride) { + if ((offset % (stride * 2) == 0) && (offset != 0)) + continue; + if (!memcmp(&image[offset], + FMAP_SIGNATURE, + strlen(FMAP_SIGNATURE))) { + fmap_found = 1; + break; + } + } + } + + if (!fmap_found) + return -1; + + if (offset + fmap_size((struct fmap *)&image[offset]) > len) + return -1; + + return offset; +} + +static int popcnt(unsigned int u) +{ + int count; + + /* K&R method */ + for (count = 0; u; count++) + u &= (u - 1); + + return count; +} + +long int fmap_find(const uint8_t *image, unsigned int image_len) +{ + long int ret = -1; + + if ((image == NULL) || (image_len == 0)) + return -1; + + if (popcnt(image_len) == 1) + ret = fmap_bsearch(image, image_len); + else + ret = fmap_lsearch(image, image_len); + + return ret; +} + +int fmap_print(const struct fmap *fmap) +{ + int i; + struct kv_pair *kv = NULL; + const uint8_t *tmp; + + kv = kv_pair_new(); + if (!kv) + return -1; + + tmp = fmap->signature; + kv_pair_fmt(kv, "fmap_signature", + "0x%02x%02x%02x%02x%02x%02x%02x%02x", + tmp[0], tmp[1], tmp[2], tmp[3], + tmp[4], tmp[5], tmp[6], tmp[7]); + kv_pair_fmt(kv, "fmap_ver_major", "%d", fmap->ver_major); + kv_pair_fmt(kv, "fmap_ver_minor","%d", fmap->ver_minor); + kv_pair_fmt(kv, "fmap_base", "0x%016llx", + (unsigned long long)fmap->base); + kv_pair_fmt(kv, "fmap_size", "0x%04x", fmap->size); + kv_pair_fmt(kv, "fmap_name", "%s", fmap->name); + kv_pair_fmt(kv, "fmap_nareas", "%d", fmap->nareas); + kv_pair_print(kv); + kv_pair_free(kv); + + for (i = 0; i < fmap->nareas; i++) { + struct kv_pair *kv; + uint16_t flags; + char *str; + + kv = kv_pair_new(); + if (!kv) + return -1; + + kv_pair_fmt(kv, "area_offset", "0x%08x", + fmap->areas[i].offset); + kv_pair_fmt(kv, "area_size", "0x%08x", + fmap->areas[i].size); + kv_pair_fmt(kv, "area_name", "%s", + fmap->areas[i].name); + kv_pair_fmt(kv, "area_flags_raw", "0x%02x", + fmap->areas[i].flags); + + /* Print descriptive strings for flags rather than the field */ + flags = fmap->areas[i].flags; + if ((str = fmap_flags_to_string(flags)) == NULL) + return -1; + kv_pair_fmt(kv, "area_flags", "%s", str ); + free(str); + + kv_pair_print(kv); + kv_pair_free(kv); + } + + return 0; +} + +/* get SHA1 sum of all static regions described by the flashmap and copy into + *digest (which will be allocated and must be freed by the caller), */ +int fmap_get_csum(const uint8_t *image, unsigned int image_len, uint8_t **digest) +{ + int i; + struct fmap *fmap; + int fmap_offset; + SHA_CTX ctx; + + if ((image == NULL)) + return -1; + + if ((fmap_offset = fmap_find(image, image_len)) < 0) + return -1; + fmap = (struct fmap *)(image + fmap_offset); + + SHA_init(&ctx); + + /* Iterate through flash map and calculate the checksum piece-wise. */ + for (i = 0; i < fmap->nareas; i++) { + /* skip non-static areas */ + if (!(fmap->areas[i].flags & FMAP_AREA_STATIC)) + continue; + + /* sanity check the offset */ + if (fmap->areas[i].size + fmap->areas[i].offset > image_len) { + fprintf(stderr, + "(%s) invalid parameter detected in area %d\n", + __func__, i); + return -1; + } + + SHA_update(&ctx, + image + fmap->areas[i].offset, + fmap->areas[i].size); + } + + SHA_final(&ctx); + *digest = malloc(SHA_DIGEST_SIZE); + memcpy(*digest, ctx.buf, SHA_DIGEST_SIZE); + + return SHA_DIGEST_SIZE; +} + +/* convert raw flags field to user-friendly string */ +char *fmap_flags_to_string(uint16_t flags) +{ + char *str = NULL; + int i, total_size; + + str = malloc(1); + str[0] = '\0'; + total_size = 1; + + for (i = 0; i < sizeof(flags) * CHAR_BIT; i++) { + if (!flags) + break; + + if (flags & (1 << i)) { + const char *tmp = val2str(1 << i, flag_lut); + + total_size += strlen(tmp); + str = realloc(str, total_size); + strcat(str, tmp); + + flags &= ~(1 << i); + if (flags) { + total_size++; + str = realloc(str, total_size); + strcat(str, ","); + } + } + } + + return str; +} + +/* allocate and initialize a new fmap structure */ +struct fmap *fmap_create(uint64_t base, uint32_t size, uint8_t *name) +{ + struct fmap *fmap; + + fmap = malloc(sizeof(*fmap)); + if (!fmap) + return NULL; + + memset(fmap, 0, sizeof(*fmap)); + memcpy(&fmap->signature, FMAP_SIGNATURE, strlen(FMAP_SIGNATURE)); + fmap->ver_major = VERSION_MAJOR; + fmap->ver_minor = VERSION_MINOR; + fmap->base = base; + fmap->size = size; + memccpy(&fmap->name, name, '\0', FMAP_STRLEN); + + return fmap; +} + +/* free memory used by an fmap structure */ +void fmap_destroy(struct fmap *fmap) { + free(fmap); +} + +/* append area to existing structure, return new total size if successful */ +int fmap_append_area(struct fmap **fmap, + uint32_t offset, uint32_t size, + const uint8_t *name, uint16_t flags) +{ + struct fmap_area *area; + int orig_size, new_size; + + if ((fmap == NULL || *fmap == NULL) || (name == NULL)) + return -1; + + /* too many areas */ + if ((*fmap)->nareas >= 0xffff) + return -1; + + orig_size = fmap_size(*fmap); + new_size = orig_size + sizeof(*area); + + *fmap = realloc(*fmap, new_size); + if (*fmap == NULL) + return -1; + + area = (struct fmap_area *)((uint8_t *)*fmap + orig_size); + memset(area, 0, sizeof(*area)); + memcpy(&area->offset, &offset, sizeof(area->offset)); + memcpy(&area->size, &size, sizeof(area->size)); + memccpy(&area->name, name, '\0', FMAP_STRLEN); + memcpy(&area->flags, &flags, sizeof(area->flags)); + + (*fmap)->nareas++; + return new_size; +} + +struct fmap_area *fmap_find_area(struct fmap *fmap, const char *name) +{ + int i; + struct fmap_area *area = NULL; + + if (!fmap || !name) + return NULL; + + for (i = 0; i < fmap->nareas; i++) { + if (!strcmp((const char *)fmap->areas[i].name, name)) { + area = &fmap->areas[i]; + break; + } + } + + return area; +} + +/* + * LCOV_EXCL_START + * Unit testing stuff done here so we do not need to expose static functions. + */ +static enum test_status { pass = EXIT_SUCCESS, fail = EXIT_FAILURE } status; +static struct fmap *fmap_create_test(void) +{ + struct fmap *fmap; + uint64_t base = 0; + uint32_t size = 0x100000; + char name[] = "test_fmap"; + + status = fail; + + fmap = fmap_create(base, size, (uint8_t *)name); + if (!fmap) + return NULL; + + if (memcmp(&fmap->signature, FMAP_SIGNATURE, strlen(FMAP_SIGNATURE))) { + printf("FAILURE: signature is incorrect\n"); + goto fmap_create_test_exit; + } + + if ((fmap->ver_major != VERSION_MAJOR) || + (fmap->ver_minor != VERSION_MINOR)) { + printf("FAILURE: version is incorrect\n"); + goto fmap_create_test_exit; + } + + if (fmap->base != base) { + printf("FAILURE: base is incorrect\n"); + goto fmap_create_test_exit; + } + + if (fmap->size != 0x100000) { + printf("FAILURE: size is incorrect\n"); + goto fmap_create_test_exit; + } + + if (strcmp((char *)fmap->name, "test_fmap")) { + printf("FAILURE: name is incorrect\n"); + goto fmap_create_test_exit; + } + + if (fmap->nareas != 0) { + printf("FAILURE: number of areas is incorrect\n"); + goto fmap_create_test_exit; + } + + status = pass; +fmap_create_test_exit: + /* preserve fmap if all went well */ + if (status == fail) { + fmap_destroy(fmap); + fmap = NULL; + } + return fmap; +} + +static int fmap_print_test(struct fmap *fmap) +{ + return fmap_print(fmap); +} + +static int fmap_get_csum_test(struct fmap *fmap) +{ + uint8_t *digest = NULL, *image = NULL; + /* assume 0x100-0x10100 is marked "static" and is filled with 0x00 */ + int image_size = 0x20000; + uint8_t csum[SHA_DIGEST_SIZE] = { + 0x1a, 0xdc, 0x95, 0xbe, 0xbe, 0x9e, 0xea, 0x8c, + 0x11, 0x2d, 0x40, 0xcd, 0x04, 0xab, 0x7a, 0x8d, + 0x75, 0xc4, 0xf9, 0x61 }; + + status = fail; + + if ((fmap_get_csum(NULL, image_size, &digest) >= 0) || + (fmap_get_csum(image, image_size, NULL) >= 0)) { + printf("failed to abort on NULL pointer input\n"); + goto fmap_get_csum_test_exit; + } + + image = calloc(image_size, 1); + memcpy(image, fmap, fmap_size(fmap)); + + if (fmap_get_csum(image, image_size, &digest) != SHA_DIGEST_SIZE) { + printf("FAILURE: failed to calculate checksum\n"); + goto fmap_get_csum_test_exit; + } + if (memcmp(digest, csum, SHA_DIGEST_SIZE)) { + printf("FAILURE: checksum is incorrect\n"); + goto fmap_get_csum_test_exit; + } + + status = pass; +fmap_get_csum_test_exit: + free(image); + free(digest); + return status; +} + +static int fmap_size_test(struct fmap *fmap) +{ + status = fail; + + if (fmap_size(NULL) >= 0) { + printf("FAILURE: failed to abort on NULL pointer input\n"); + goto fmap_size_test_exit; + } + + status = pass; +fmap_size_test_exit: + return status; +} + +/* this test re-allocates the fmap, so it gets a double-pointer */ +static int fmap_append_area_test(struct fmap **fmap) +{ + int total_size; + uint16_t nareas_orig; + /* test_area will be used by fmap_csum_test and find_area_test */ + struct fmap_area test_area = { + .offset = 0x400, + .size = 0x10000, + .name = "test_area_1", + .flags = FMAP_AREA_STATIC, + }; + + status = fail; + + if ((fmap_append_area(NULL, 0, 0, test_area.name, 0) >= 0) || + (fmap_append_area(fmap, 0, 0, NULL, 0) >= 0)) { + printf("FAILURE: failed to abort on NULL pointer input\n"); + goto fmap_append_area_test_exit; + } + + nareas_orig = (*fmap)->nareas; + (*fmap)->nareas = ~(0); + if (fmap_append_area(fmap, 0, 0, (const uint8_t *)"foo", 0) >= 0) { + printf("FAILURE: failed to abort with too many areas\n"); + goto fmap_append_area_test_exit; + } + (*fmap)->nareas = nareas_orig; + + total_size = sizeof(**fmap) + sizeof(test_area); + if (fmap_append_area(fmap, + test_area.offset, + test_area.size, + test_area.name, + test_area.flags + ) != total_size) { + printf("failed to append area\n"); + goto fmap_append_area_test_exit; + } + + if ((*fmap)->nareas != 1) { + printf("FAILURE: failed to increment number of areas\n"); + goto fmap_append_area_test_exit; + } + + status = pass; +fmap_append_area_test_exit: + return status; +} + +static int fmap_find_area_test(struct fmap *fmap) +{ + status = fail; + char area_name[] = "test_area_1"; + + if (fmap_find_area(NULL, area_name) || + fmap_find_area(fmap, NULL)) { + printf("FAILURE: failed to abort on NULL pointer input\n"); + goto fmap_find_area_test_exit; + } + + if (fmap_find_area(fmap, area_name) == NULL) { + printf("FAILURE: failed to find \"%s\"\n", area_name); + goto fmap_find_area_test_exit; + } + + status = pass; +fmap_find_area_test_exit: + return status; +} + +static int fmap_flags_to_string_test() +{ + char *str, *my_str; + int i; + uint16_t flags; + + status = fail; + + /* no area flag */ + str = fmap_flags_to_string(0); + if (!str || strcmp(str, "")) { + printf("FAILURE: failed to return empty string when no flag" + "are set"); + goto fmap_flags_to_string_test_exit; + } + free(str); + + /* single area flags */ + for (i = 0; i < ARRAY_SIZE(flag_lut); i++) { + if (!flag_lut[i].str) + continue; + + if ((str = fmap_flags_to_string(flag_lut[i].val)) == NULL) { + printf("FAILURE: failed to translate flag to string"); + goto fmap_flags_to_string_test_exit; + } + free(str); + } + + /* construct our own flags field and string using all available flags + * and compare output with fmap_flags_to_string() */ + my_str = calloc(256, 1); + flags = 0; + for (i = 0; i < ARRAY_SIZE(flag_lut); i++) { + if (!flag_lut[i].str) + continue; + else if (i > 0) + strcat(my_str, ","); + + flags |= flag_lut[i].val; + strcat(my_str, flag_lut[i].str); + } + + str = fmap_flags_to_string(flags); + if (strcmp(str, my_str)) { + printf("FAILURE: bad result from fmap_flags_to_string\n"); + goto fmap_flags_to_string_test_exit; + } + free(my_str); + free(str); + + status = pass; +fmap_flags_to_string_test_exit: + return status; + +} + +static int fmap_find_test(struct fmap *fmap) +{ + uint8_t *buf; + size_t total_size, offset; + + status = fail; + + /* + * Note: In these tests, we'll use fmap_find() and control usage of + * lsearch and bsearch by using a power-of-2 total_size. For lsearch, + * use total_size - 1. For bsearch, use total_size. + */ + + total_size = 0x100000; + buf = calloc(total_size, 1); + + /* test if image length is zero */ + if (fmap_find(buf, 0) >= 0) { + printf("FAILURE: failed to abort on zero-length image\n"); + goto fmap_find_test_exit; + } + + /* test if no fmap exists */ + if (fmap_find(buf, total_size - 1) >= 0) { + printf("FAILURE: lsearch returned false positive\n"); + goto fmap_find_test_exit; + } + if (fmap_find(buf, total_size) >= 0) { + printf("FAILURE: bsearch returned false positive\n"); + goto fmap_find_test_exit; + } + + /* simple test case: fmap at (total_size / 2) + 1 */ + offset = (total_size / 2) + 1; + memcpy(&buf[offset], fmap, fmap_size(fmap)); + + if (fmap_find(buf, total_size - 1) != offset) { + printf("FAILURE: lsearch failed to find fmap\n"); + goto fmap_find_test_exit; + } + if (fmap_find(buf, total_size) != offset) { + printf("FAILURE: bsearch failed to find fmap\n"); + goto fmap_find_test_exit; + } + + /* test bsearch if offset is at 0 */ + offset = 0; + memset(buf, 0, total_size); + memcpy(buf, fmap, fmap_size(fmap)); + if (fmap_find(buf, total_size) != offset) { + printf("FAILURE: bsearch failed to find fmap at offset 0\n"); + goto fmap_find_test_exit; + } + + /* test overrun detection */ + memset(buf, 0, total_size); + memcpy(&buf[total_size - fmap_size(fmap) + 1], + fmap, + fmap_size(fmap) + 1); + if (fmap_find(buf, total_size - 1) >= 0) { + printf("FAILURE: lsearch failed to catch overrun\n"); + goto fmap_find_test_exit; + } + if (fmap_find(buf, total_size) >= 0) { + printf("FAILURE: bsearch failed to catch overrun\n"); + goto fmap_find_test_exit; + } + + status = pass; +fmap_find_test_exit: + free(buf); + return status; +} + +int fmap_test() +{ + int rc = EXIT_SUCCESS; + struct fmap *my_fmap; + + /* + * This test has two parts: Creation of an fmap with one or more + * area(s), and other stuff. Since a valid fmap is required to run + * many tests, we abort if fmap creation fails in any way. + * + * Also, fmap_csum_test() makes some assumptions based on the areas + * appended. See fmap_append_area_test() for details. + */ + if ((my_fmap = fmap_create_test()) == NULL) { + rc = EXIT_FAILURE; + goto fmap_test_exit; + } + + if (fmap_find_test(my_fmap)) { + rc = EXIT_FAILURE; + goto fmap_test_exit; + } + + if (fmap_append_area_test(&my_fmap)) { + rc = EXIT_FAILURE; + goto fmap_test_exit; + } + + rc |= fmap_find_area_test(my_fmap); + rc |= fmap_get_csum_test(my_fmap); + rc |= fmap_size_test(my_fmap); + rc |= fmap_flags_to_string_test(); + rc |= fmap_print_test(my_fmap); + +fmap_test_exit: + fmap_destroy(my_fmap); + if (rc) + printf("FAILED\n"); + return rc; +} +/* LCOV_EXCL_STOP */ diff --git a/util/cbfstool/flashmap/fmap.h b/util/cbfstool/flashmap/fmap.h new file mode 100644 index 0000000..9cea22d --- /dev/null +++ b/util/cbfstool/flashmap/fmap.h @@ -0,0 +1,192 @@ +/* + * Copyright 2010, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + */ + +#ifndef FLASHMAP_LIB_FMAP_H__ +#define FLASHMAP_LIB_FMAP_H__ + +#include <inttypes.h> + +#include <valstr.h> + +#define FMAP_SIGNATURE "__FMAP__" +#define FMAP_VER_MAJOR 1 /* this header's FMAP minor version */ +#define FMAP_VER_MINOR 1 /* this header's FMAP minor version */ +#define FMAP_STRLEN 32 /* maximum length for strings, */ + /* including null-terminator */ +extern const struct valstr flag_lut[16]; +enum fmap_flags { + FMAP_AREA_STATIC = 1 << 0, + FMAP_AREA_COMPRESSED = 1 << 1, + FMAP_AREA_RO = 1 << 2, +}; + +/* Mapping of volatile and static regions in firmware binary */ +struct fmap_area { + uint32_t offset; /* offset relative to base */ + uint32_t size; /* size in bytes */ + uint8_t name[FMAP_STRLEN]; /* descriptive name */ + uint16_t flags; /* flags for this area */ +} __attribute__((packed)); + +struct fmap { + uint8_t signature[8]; /* "__FMAP__" (0x5F5F464D41505F5F) */ + uint8_t ver_major; /* major version */ + uint8_t ver_minor; /* minor version */ + uint64_t base; /* address of the firmware binary */ + uint32_t size; /* size of firmware binary in bytes */ + uint8_t name[FMAP_STRLEN]; /* name of this firmware binary */ + uint16_t nareas; /* number of areas described by + fmap_areas[] below */ + struct fmap_area areas[]; +} __attribute__((packed)); + +/* + * fmap_find - find FMAP signature in a binary image + * + * @image: binary image + * @len: length of binary image + * + * This function does no error checking. The caller is responsible for + * verifying that the contents are sane. + * + * returns offset of FMAP signature to indicate success + * returns <0 to indicate failure + */ +extern long int fmap_find(const uint8_t *image, unsigned int len); + +/* + * fmap_print - Print contents of flash map data structure + * + * @map: raw map data + * + * returns 0 to indiciate success + * returns <0 to indicate failure + */ +extern int fmap_print(const struct fmap *map); + +/* + * fmap_get_csum - get the checksum of static regions of an image + * + * @image: image to checksum + * @len: length of image + * @digest: double-pointer to store location of first byte of digest + * + * fmap_get_csum() will reset, write, and finalize the digest. + * The location of the final digest will start at the location pointed to + * by digest, which will be allocated and must be freed by the caller. + * + * returns digest length if successful + * returns <0 to indicate error + */ +extern int fmap_get_csum(const uint8_t *image, + unsigned int image_len, uint8_t **digest); + + +/* + * fmap_flags_to_string - convert raw flags field into user-friendly string + * + * @flags: raw flags + * + * This function returns a user-friendly comma-separated list of fmap area + * flags. If there are no flags (flags == 0), the string will contain only + * a terminating character ('\0') + * + * This function allocates memory which the caller must free. + * + * returns pointer to an allocated string if successful + * returns NULL to indicate failure + */ +char *fmap_flags_to_string(uint16_t flags); + +/* + * fmap_create - allocate and initialize a new fmap structure + * + * @base: base address of firmware within address space + * @size: size of the firmware (bytes) + * @name: name of firmware + * + * This function will allocate a flashmap header. Members of the structure + * which are not passed in are automatically initialized. + * + * returns pointer to newly allocated flashmap header if successful + * returns NULL to indicate failure + */ +extern struct fmap *fmap_create(uint64_t base, + uint32_t size, uint8_t *name); + +/* free memory used by an fmap structure */ +extern void fmap_destroy(struct fmap *fmap); + +/* + * fmap_size - returns size of fmap data structure (including areas) + * + * @fmap: fmap + * + * returns size of fmap structure if successful + * returns <0 to indicate failure + */ +extern int fmap_size(struct fmap *fmap); + +/* + * fmap_append_area - realloc an existing flashmap and append an area + * + * @fmap: double pointer to existing flashmap + * @offset: offset of area + * @size: size of area + * @name: name of area + * @flags: area flags + * + * returns total size of reallocated flashmap structure if successful + * returns <0 to indicate failure + */ +extern int fmap_append_area(struct fmap **fmap, + uint32_t offset, uint32_t size, + const uint8_t *name, uint16_t flags); + +/* + * fmap_find_area - find an fmap_area entry (by name) and return pointer to it + * + * @fmap: fmap structure to parse + * @name: name of area to find + * + * returns a pointer to the entry in the fmap structure if successful + * returns NULL to indicate failure or if no matching area entry is found + */ +extern struct fmap_area *fmap_find_area(struct fmap *fmap, const char *name); + +/* unit testing stuff */ +extern int fmap_test(); + +#endif /* FLASHMAP_LIB_FMAP_H__*/ diff --git a/util/cbfstool/flashmap/kv_pair.c b/util/cbfstool/flashmap/kv_pair.c new file mode 100644 index 0000000..2572c64 --- /dev/null +++ b/util/cbfstool/flashmap/kv_pair.c @@ -0,0 +1,242 @@ +/* + * Copyright 2010, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <stdarg.h> + +#include "kv_pair.h" + +/* Internal variable for output style. Use accessors to get/set style. */ +static enum kv_pair_style _style; + +void kv_pair_set_style(enum kv_pair_style style) +{ + _style = style; +} + +enum kv_pair_style kv_pair_get_style() +{ + return _style; +} + +struct kv_pair *kv_pair_new(void) +{ + struct kv_pair *kv; + + kv = calloc(0, sizeof(*kv)); + if (!kv) + return NULL; + + return kv; +} + +struct kv_pair **kv_pair_new_array(size_t size) +{ + struct kv_pair **kv; + size_t i; + + kv = (struct kv_pair **) calloc(0, sizeof(kv) * size); + for (i = 0; i < size; ++i) { + kv[i] = kv_pair_new(); + } + return kv; +} + +struct kv_pair *kv_pair_add(struct kv_pair *kv_list, + const char *key, const char *value) +{ + struct kv_pair *kv_new; + struct kv_pair *kv_ptr; + + kv_new = kv_pair_new(); + if (!kv_new) + return NULL; + + /* save key=value strings if provided */ + if (key) { + kv_new->key = strdup(key); + if (!kv_new->key) + goto kv_pair_add_failed; + } + if (value) { + kv_new->value = strdup(value); + if (!kv_new->value) + goto kv_pair_add_failed; + } + + /* first in the list if no list provided */ + if (kv_list) { + /* find the end of list */ + for (kv_ptr = kv_list; kv_ptr->next != NULL; + kv_ptr = kv_ptr->next) + ; + + /* link in the new pair at the end */ + kv_ptr->next = kv_new; + } + + /* return pointer to the new pair */ + return kv_new; + +kv_pair_add_failed: + kv_pair_free(kv_new); + return NULL; +} + +struct kv_pair *kv_pair_add_bool(struct kv_pair *kv_list, + const char *key, int value) +{ + const char *str; + + if (value) { + str = "yes"; + } else { + str = "no"; + } + return kv_pair_add(kv_list, key, str); +} + +struct kv_pair *kv_pair_fmt(struct kv_pair *kv_list, + const char *kv_key, const char *format, ...) +{ + char kv_value[KV_PAIR_MAX_VALUE_LEN]; + va_list vptr; + + memset(kv_value, 0, sizeof(kv_value)); + + va_start(vptr, format); + vsnprintf(kv_value, sizeof(kv_value), format, vptr); + va_end(vptr); + + return kv_pair_add(kv_list, kv_key, kv_value); +} + +void kv_pair_free(struct kv_pair *kv_list) +{ + struct kv_pair *kv_ptr = kv_list; + struct kv_pair *kv_next; + + while (kv_ptr != NULL) { + /* free key/value strings */ + if (kv_ptr->key) + free(kv_ptr->key); + if (kv_ptr->value) + free(kv_ptr->value); + + /* free current pair move to next */ + kv_next = kv_ptr->next; + free(kv_ptr); + kv_ptr = kv_next; + } +} + +void kv_pair_free_array(struct kv_pair **kv_array, size_t size) +{ + size_t i; + for (i = 0; i < size; ++i) { + kv_pair_free(kv_array[i]); + } + free(kv_array); +} + +void kv_pair_print_to_file(FILE* fp, struct kv_pair *kv_list, + enum kv_pair_style style) +{ + struct kv_pair *kv_ptr; + + switch (style) { + case KV_STYLE_PAIR: + for (kv_ptr = kv_list; kv_ptr != NULL; kv_ptr = kv_ptr->next) { + if (kv_ptr->key && kv_ptr->value) { + fprintf(fp, "%s=\"%s\" ", + kv_ptr->key, kv_ptr->value); + } + } + break; + + case KV_STYLE_VALUE: + for (kv_ptr = kv_list; kv_ptr != NULL; kv_ptr = kv_ptr->next) { + if (kv_ptr->value) { + fprintf(fp, "%s", kv_ptr->value); + if (kv_ptr->next) + fprintf(fp, " | "); + } + } + break; + + case KV_STYLE_LONG: + for (kv_ptr = kv_list; kv_ptr != NULL; kv_ptr = kv_ptr->next) { + if (kv_ptr->key && kv_ptr->value) + fprintf(fp, "%-20s | %s\n", + kv_ptr->key, kv_ptr->value); + } + break; + } + + fprintf(fp, "\n"); +} + +void kv_pair_print(struct kv_pair *kv_list) +{ + kv_pair_print_to_file(stdout, kv_list, kv_pair_get_style()); +} + +const char *kv_pair_get_value(struct kv_pair *kv_list, const char *kv_key) +{ + const char *kv_value = NULL; + struct kv_pair *kv_ptr; + + for (kv_ptr = kv_list; kv_ptr != NULL; kv_ptr = kv_ptr->next) { + if (kv_ptr->key && strcmp(kv_ptr->key, kv_key) == 0) { + kv_value = kv_ptr->value; + break; + } + } + return kv_value; +} + +int kv_pair_size(struct kv_pair *kv_list) { + struct kv_pair *kv_ptr; + int count; + + count = 0; + for (kv_ptr = kv_list; kv_ptr != NULL; kv_ptr = kv_ptr->next) { + if (kv_ptr->key) { + count++; + } + } + return count; +} diff --git a/util/cbfstool/flashmap/kv_pair.h b/util/cbfstool/flashmap/kv_pair.h new file mode 100644 index 0000000..b573530 --- /dev/null +++ b/util/cbfstool/flashmap/kv_pair.h @@ -0,0 +1,153 @@ +/* + * Copyright 2010, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * Alternatively, this software may be distributed under the terms of the + * GNU General Public License ("GPL") version 2 as published by the Free + * Software Foundation. + */ + +#ifndef FLASHMAP_LIB_KV_PAIR_H__ +#define FLASHMAP_LIB_KV_PAIR_H__ + +#include <stdio.h> +#include <inttypes.h> +#include <string.h> + +/* key=value string pair list */ +#define KV_PAIR_MAX_VALUE_LEN 1024 + +enum kv_pair_style { + KV_STYLE_PAIR, /* key1="value1" key2="value2" */ + KV_STYLE_VALUE, /* | value1 | value2 | */ + KV_STYLE_LONG, /* key1 | value1 */ + /* key2 | value2 */ +}; + +struct kv_pair { + char *key; + char *value; + struct kv_pair *next; +}; + +extern enum kv_pair_style kv_pair_get_style(); + +extern void kv_pair_set_style(enum kv_pair_style style); + +/* + * kv_pair_new - create new key=value pair + * + * returns pointer to new key=value pair + * returns NULL to indicate error + */ +extern struct kv_pair *kv_pair_new(void); + +/* + * kv_pair_add - add new key=value pair to list + * + * @kv_list: key=value pair list + * @key: key string + * @value: value string + * + * returns pointer to new key=value pair + * returns NULL to indicate error + */ +extern struct kv_pair *kv_pair_add(struct kv_pair *kv_list, + const char *key, const char *value); + +/* + * kv_pair_add_bool - add new boolean kvpair to list + * + * @kv_list: key=value pair list + * @key: key string + * @value: value + * + * returns pointer to new key=value pair + * returns NULL to indicate error + */ +extern struct kv_pair *kv_pair_add_bool(struct kv_pair *kv_list, + const char *key, int value); + +/* + * kv_pair_fmt - add key=value pair based on printf format + * NOTE: uses variable argument list + * + * @kv_list: list of key=value pairs + * @kv_key: key string + * @format: printf-style format for value input + * @...: arguments to format + * + * returns pointer to new key=value pair + * returns NULL to indicate error + */ +extern struct kv_pair *kv_pair_fmt(struct kv_pair *kv_list, + const char *kv_key, const char *format, ...) + __attribute__((format(printf, 3, 4))); + +/* + * kv_pair_free - clean a key=value pair list + * + * @kv_list: pointer to key=value list + */ +extern void kv_pair_free(struct kv_pair *kv_list); + +/* + * kv_pair_print - print a key=value pair list + * + * @kv_list: pointer to key=value list + * @style: print style + */ +extern void kv_pair_print_to_file(FILE* fp, struct kv_pair *kv_list, + enum kv_pair_style style); + +/* + * kv_pair_print - print a key=value pair list to gsys output + * + * @kv_list: pointer to key=value list + */ +extern void kv_pair_print(struct kv_pair *kv_list); + + +/* + * kv_pair_get_value - return first value with key match + * + * @kv_list: pointer to key=value list + * @kv_key: key string + */ +extern const char *kv_pair_get_value(struct kv_pair *kv_list, + const char *kv_key); + +/* + * kv_pair_size - return number of kv pairs in the chain + * + * @kv_list: pointer to key=value list + */ +extern int kv_pair_size(struct kv_pair *kv_list); + +#endif /* FLASHMAP_LIB_KV_PAIR_H__ */ diff --git a/util/cbfstool/flashmap/valstr.c b/util/cbfstool/flashmap/valstr.c new file mode 100644 index 0000000..fa9ed82 --- /dev/null +++ b/util/cbfstool/flashmap/valstr.c @@ -0,0 +1,65 @@ +/* + * Copyright 2010, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include <inttypes.h> +#include <string.h> + +#include <valstr.h> + +const char *val2str_default(uint32_t val, const struct valstr *vs, + const char *def_str) +{ + int i; + + for (i = 0; vs[i].str; i++) { + if (vs[i].val == val) + return vs[i].str; + } + + return def_str; +} + +const char *val2str(uint32_t val, const struct valstr *vs) +{ + return val2str_default(val, vs, "Unknown"); +} + +uint32_t str2val(const char *str, const struct valstr *vs) +{ + int i; + + for (i = 0; vs[i].str; i++) { + if (strcasecmp(vs[i].str, str) == 0) + return vs[i].val; + } + + return vs[i].val; +} diff --git a/util/cbfstool/flashmap/valstr.h b/util/cbfstool/flashmap/valstr.h new file mode 100644 index 0000000..3885ef7 --- /dev/null +++ b/util/cbfstool/flashmap/valstr.h @@ -0,0 +1,78 @@ +/* + * Copyright 2010, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef FLASHMAP_LIB_VALSTR_H__ +#define FLASHMAP_LIB_VALSTR_H__ + +#include <inttypes.h> + +/* value + string structure for common conversions */ +struct valstr { + uint32_t val; /* field value */ + const char *str; /* field description */ +}; + +/* + * val2str_default - convert value to string + * + * @val: value to convert + * @vs: value-string data + * @def_str: default string to return if no matching value found + * + * returns pointer to string + * returns def_str if no matching value found + */ +const char *val2str_default(uint32_t val, const struct valstr *vs, + const char *def_str); + +/* + * val2str - convert value to string + * + * @val: value to convert + * @vs: value-string data + * + * returns pointer to string + * returns pointer to "unknown" static string if not found + */ +const char *val2str(uint32_t val, const struct valstr *vs); + +/* + * str2val - convert string to value + * + * @str: string to convert + * @vs: value-string data + * + * returns value for string + * returns value for last entry in value-string data if not found + */ +uint32_t str2val(const char *str, const struct valstr *vs); + +#endif /* FLASHMAP_LIB_VALSTR_H__ */

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2015