coreboot-gerrit July 2015

coreboot-gerrit@coreboot.org

1 participants
1048 discussions

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

15 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10934 -gerrit commit 0c19aacfd35eff7df6bc71a2afdcf399e39f6cfb Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Wed Jul 15 20:49:00 2015 +0200 cbfstool: add extended attributes structure to cbfs_file This is a forward and backward compatible approach to extending the cbfs format. Unfortunately we forgot to add a header length or offset to the file name, making old implementations depend on it starting 24 bytes after the cbfs_file structure. To work around that, add another, extensible structure after the file name, and point to it through an offset, so we can add more variable length structures in the future when necessary. The offset field which points to the file data is adjusted appropriately and so old implementations still know where to find both any file's data and its successor in the directory. Files within CBFS that don't use advanced features remain fully usable by old implementations. Files that use advanced features still don't break the data structures. Change-Id: I325965286c44f31abd95df684d340cebb0e68b75 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- util/cbfstool/cbfs.h | 8 ++++++++ util/cbfstool/cbfs_image.c | 11 +++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 05eabe8..c53ac0e 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -74,6 +74,7 @@ struct cbfs_file { /* length of file data */ uint32_t len; uint32_t type; + /* offset to struct cbfs_file_attributes or 0 */ uint32_t attributes; /* length of header incl. variable data */ uint32_t offset; @@ -82,6 +83,10 @@ struct cbfs_file { _Static_assert(sizeof(struct cbfs_file) == 24, "cbfs_file size mismatch"); +struct cbfs_file_attributes { + uint32_t len; +} __PACKED; + struct cbfs_stage { uint32_t compression; uint64_t entry; @@ -142,6 +147,9 @@ struct cbfs_payload { #define CBFS_COMPONENT_NULL 0xFFFFFFFF #define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) ) +#define CBFS_FILE_ATTRIBUTES(_p) (((_p)->attributes == 0) ? NULL : \ + (struct cbfs_file_attributes *)(((uint8_t *)(_p)) + ntohl((_p)->attributes))) + /* cbfs_image.c */ uint32_t get_cbfs_entry_type(const char *name, uint32_t default_value); uint32_t get_cbfs_compression(const char *name, uint32_t unknown); diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 47aa5aa..9724543 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -118,7 +118,8 @@ int cbfs_parse_comp_algo(const char *name) static size_t cbfs_calculate_file_header_size(const char *name) { return (sizeof(struct cbfs_file) + - align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN)); + align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN) + + sizeof(struct cbfs_file_attributes)); } /* Only call on legacy CBFSes possessing a master header. */ @@ -1035,11 +1036,17 @@ int cbfs_create_empty_entry(struct cbfs_file *entry, memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic)); entry->type = htonl(CBFS_COMPONENT_NULL); entry->len = htonl(len); - entry->attributes = 0; + /* FIXME: it doesn't make much sense to have the calculation elsewhere + * while setting all kinds of offsets here, with more to come. */ entry->offset = htonl(cbfs_calculate_file_header_size(name)); + entry->attributes = htonl(cbfs_calculate_file_header_size(name) - + sizeof(struct cbfs_file_attributes)); memset(entry->filename, 0, ntohl(entry->offset) - sizeof(*entry)); strcpy(entry->filename, name); memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, len); + + struct cbfs_file_attributes *attr = CBFS_FILE_ATTRIBUTES(entry); + attr->len = sizeof(struct cbfs_file_attributes); return 0; }

1 0

New patch to review for coreboot: cbfstool: rename checksum to attributes
by Patrick Georgi 15 Jul '15

15 Jul '15

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

1 0

New patch to review for coreboot: cbfstool: Remove extra comma after {0, NULL} list element
by Patrick Georgi 15 Jul '15

15 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10932 -gerrit commit dbd02be98f068da9f324fd2cf522afede4556969 Author: Sol Boucher <solb(a)chromium.org> Date: Thu May 7 21:00:05 2015 -0700 cbfstool: Remove extra comma after {0, NULL} list element Trailing commas are useful for lists that can be extended. These lists are 0-terminated, and there should be no elements following that. Change-Id: Iea8c6d5579d6363e77e1f5af666948160c4a9bf9 Signed-off-by: Sol Boucher <solb(a)chromium.org> Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Original-Change-Id: I1a117a9473e895feaf455bb30d0f945f57de51eb Original-Signed-off-by: Sol Boucher <solb(a)chromium.org> --- util/cbfstool/cbfs_image.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index f5fddcb..828d367 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -77,13 +77,13 @@ static const struct typedesc_t types_cbfs_entry[] = { {CBFS_COMPONENT_MRC_CACHE, "mrc_cache"}, {CBFS_COMPONENT_DELETED, "deleted"}, {CBFS_COMPONENT_NULL, "null"}, - {0, NULL}, + {0, NULL} }; static const struct typedesc_t types_cbfs_compression[] = { {CBFS_COMPRESS_NONE, "none"}, {CBFS_COMPRESS_LZMA, "LZMA"}, - {0, NULL}, + {0, NULL} }; static const char *lookup_name_by_type(const struct typedesc_t *desc, uint32_t type,

1 0

New patch to review for coreboot: cbfstool: Factor out compression algorithm list
by Patrick Georgi 15 Jul '15

15 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10931 -gerrit commit 43ae3c69931e581ef52ae7fdc0fc37da073e16be Author: Sol Boucher <solb(a)chromium.org> Date: Thu May 7 21:00:05 2015 -0700 cbfstool: Factor out compression algorithm list Parse compression algorithm arguments using a single list. Change-Id: Idc5b14a53377b29964f24221e42db6e09a497d48 Signed-off-by: Sol Boucher <solb(a)chromium.org> Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Original-Change-Id: I1a117a9473e895feaf455bb30d0f945f57de51eb Original-Signed-off-by: Sol Boucher <solb(a)chromium.org> --- util/cbfstool/cbfs_image.c | 12 ++++++++++++ util/cbfstool/cbfs_image.h | 4 ++++ util/cbfstool/cbfstool.c | 14 +++++++------- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 783999c..f5fddcb 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -96,11 +96,23 @@ static const char *lookup_name_by_type(const struct typedesc_t *desc, uint32_t t return default_value; } +static int lookup_type_by_name(const struct typedesc_t *desc, const char *name) +{ + int i; + for (i = 0; desc[i].name && strcasecmp(name, desc[i].name); ++i); + return desc[i].name ? (int)desc[i].type : -1; +} + static const char *get_cbfs_entry_type_name(uint32_t type) { return lookup_name_by_type(types_cbfs_entry, type, "(unknown)"); } +int cbfs_parse_comp_algo(const char *name) +{ + return lookup_type_by_name(types_cbfs_compression, name); +} + /* CBFS image */ static size_t cbfs_calculate_file_header_size(const char *name) diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 5df5dd2..cb2935b 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -32,6 +32,10 @@ struct cbfs_image { struct cbfs_header header; }; +/* Given the string name of a compression algorithm, return the corresponding + * enum comp_algo if it's supported, or a number < 0 otherwise. */ +int cbfs_parse_comp_algo(const char *name); + /* Given a pointer, serialize the header from host-native byte format * to cbfs format, i.e. big-endian. */ void cbfs_put_header(void *dest, const struct cbfs_header *header); diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index cae1227..b6a486f 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -973,15 +973,15 @@ int main(int argc, char **argv) WARN("Unknown type '%s' ignored\n", optarg); break; - case 'c': - if (!strncasecmp(optarg, "lzma", 5)) - param.compression = CBFS_COMPRESS_LZMA; - else if (!strncasecmp(optarg, "none", 5)) - param.compression = CBFS_COMPRESS_NONE; + case 'c': { + int algo = cbfs_parse_comp_algo(optarg); + if (algo >= 0) + param.compression = algo; else - WARN("Unknown compression '%s'" - " ignored.\n", optarg); + WARN("Unknown compression '%s' ignored.\n", + optarg); break; + } case 'M': param.fmap = optarg; break;

1 0

New patch to review for coreboot: cbfstool: rename field
by Patrick Georgi 15 Jul '15

15 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10930 -gerrit commit e867c61e5339ce9b5a492485014828945832dd62 Author: Sol Boucher <solb(a)chromium.org> Date: Thu May 7 21:00:05 2015 -0700 cbfstool: rename field With introducing hash algorithms, 'algo' is ambiguous, so rename it to 'compression' instead. Change-Id: Ief3d39067df650d03030b5ca9e8677861ce682ed Signed-off-by: Sol Boucher <solb(a)chromium.org> Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Original-Change-Id: I1a117a9473e895feaf455bb30d0f945f57de51eb Original-Signed-off-by: Sol Boucher <solb(a)chromium.org> --- util/cbfstool/cbfstool.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 901fe5c..cae1227 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -75,14 +75,14 @@ static struct param { bool fill_partial_downward; bool show_immutable; int fit_empty_entries; - enum comp_algo algo; + enum comp_algo compression; /* for linux payloads */ char *initrd; char *cmdline; } param = { /* All variables not listed are initialized as zero. */ .arch = CBFS_ARCHITECTURE_UNKNOWN, - .algo = CBFS_COMPRESS_NONE, + .compression = CBFS_COMPRESS_NONE, .headeroffset = ~0, .region_name = SECTION_NAME_PRIMARY_CBFS, }; @@ -226,7 +226,7 @@ static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset) { struct buffer output; int ret; - ret = parse_elf_to_stage(buffer, &output, param.algo, offset, + ret = parse_elf_to_stage(buffer, &output, param.compression, offset, param.ignore_section); if (ret != 0) return -1; @@ -242,16 +242,16 @@ static int cbfstool_convert_mkpayload(struct buffer *buffer, struct buffer output; int ret; /* per default, try and see if payload is an ELF binary */ - ret = parse_elf_to_payload(buffer, &output, param.algo); + ret = parse_elf_to_payload(buffer, &output, param.compression); /* If it's not an ELF, see if it's a UEFI FV */ if (ret != 0) - ret = parse_fv_to_payload(buffer, &output, param.algo); + ret = parse_fv_to_payload(buffer, &output, param.compression); /* If it's neither ELF nor UEFI Fv, try bzImage */ if (ret != 0) ret = parse_bzImage_to_payload(buffer, &output, - param.initrd, param.cmdline, param.algo); + param.initrd, param.cmdline, param.compression); /* Not a supported payload type */ if (ret != 0) { @@ -273,7 +273,7 @@ static int cbfstool_convert_mkflatpayload(struct buffer *buffer, if (parse_flat_binary_to_payload(buffer, &output, param.loadaddress, param.entrypoint, - param.algo) != 0) { + param.compression) != 0) { return -1; } buffer_delete(buffer); @@ -975,9 +975,9 @@ int main(int argc, char **argv) break; case 'c': if (!strncasecmp(optarg, "lzma", 5)) - param.algo = CBFS_COMPRESS_LZMA; + param.compression = CBFS_COMPRESS_LZMA; else if (!strncasecmp(optarg, "none", 5)) - param.algo = CBFS_COMPRESS_NONE; + param.compression = CBFS_COMPRESS_NONE; else WARN("Unknown compression '%s'" " ignored.\n", optarg);

1 0

New patch to review for coreboot: cbfstool: move bit swapping macros to swab.h
by Patrick Georgi 15 Jul '15

15 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10929 -gerrit commit f45c9c71cd0b664ca515f4950d70a2ea5c8867cc Author: Sol Boucher <solb(a)chromium.org> Date: Thu May 7 21:00:05 2015 -0700 cbfstool: move bit swapping macros to swab.h Change-Id: Id22232c45225011951e01c370e0f473af574d758 Signed-off-by: Sol Boucher <solb(a)chromium.org> Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Original-Change-Id: I1a117a9473e895feaf455bb30d0f945f57de51eb Original-Signed-off-by: Sol Boucher <solb(a)chromium.org> --- util/cbfstool/common.h | 9 --------- util/cbfstool/swab.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index 06ee00b..5fb1906 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -28,15 +28,6 @@ /* Endianess */ #include "swab.h" -#if !defined(__APPLE__) && !defined(__NetBSD__) -#define ntohl(x) (is_big_endian() ? (uint32_t)(x) : swab32(x)) -#define htonl(x) (is_big_endian() ? (uint32_t)(x) : swab32(x)) -#elif defined(__NetBSD__) -#include <arpa/inet.h> -#endif -#define ntohll(x) (is_big_endian() ? (uint64_t)(x) : swab64(x)) -#define htonll(x) (is_big_endian() ? (uint64_t)(x) : swab64(x)) -int is_big_endian(void); /* Message output */ extern int verbose; diff --git a/util/cbfstool/swab.h b/util/cbfstool/swab.h index c5e4370..22ae8b4 100644 --- a/util/cbfstool/swab.h +++ b/util/cbfstool/swab.h @@ -15,6 +15,15 @@ * */ +#if !defined(__APPLE__) && !defined(__NetBSD__) +#define ntohl(x) (is_big_endian() ? (uint32_t)(x) : swab32(x)) +#define htonl(x) (is_big_endian() ? (uint32_t)(x) : swab32(x)) +#elif defined(__NetBSD__) +#include <arpa/inet.h> +#endif +#define ntohll(x) (is_big_endian() ? (uint64_t)(x) : swab64(x)) +#define htonll(x) (is_big_endian() ? (uint64_t)(x) : swab64(x)) + /* casts are necessary for constants, because we never know how for sure * how U/UL/ULL map to __u16, __u32, __u64. At least not in a portable way. */ @@ -41,4 +50,7 @@ (((uint64_t)(x) & (uint64_t)0x00ff000000000000ULL) >> 40) | \ (((uint64_t)(x) & (uint64_t)0xff00000000000000ULL) >> 56) )) +/* common.c */ +int is_big_endian(void); + #endif /* _SWAB_H */

1 0

New patch to review for coreboot: cbfstool: use variable length array to model cbfs_file's filename
by Patrick Georgi 15 Jul '15

15 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10928 -gerrit commit 72fc8046ed073ffb8c83eb0ff081e042900f6f34 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Wed Jul 15 16:42:38 2015 +0200 cbfstool: use variable length array to model cbfs_file's filename Change-Id: Ib056983630b2899d7e6cbcb43f6b7153f0f8e282 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- util/cbfstool/cbfs.h | 2 +- util/cbfstool/cbfs_image.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 6286eff..1996b1c 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -77,6 +77,7 @@ struct cbfs_file { uint32_t checksum; /* length of header incl. variable data */ uint32_t offset; + char filename[]; } __PACKED; _Static_assert(sizeof(struct cbfs_file) == 24, "cbfs_file size mismatch"); @@ -140,7 +141,6 @@ struct cbfs_payload { */ #define CBFS_COMPONENT_NULL 0xFFFFFFFF -#define CBFS_NAME(_c) (((char *) (_c)) + sizeof(struct cbfs_file)) #define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) ) /* cbfs_image.c */ uint32_t get_cbfs_entry_type(const char *name, uint32_t default_value); diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 2ce4bdd..783999c 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -641,7 +641,7 @@ struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name) for (entry = cbfs_find_first_entry(image); entry && cbfs_is_valid_entry(image, entry); entry = cbfs_find_next_entry(image, entry)) { - if (strcasecmp(CBFS_NAME(entry), name) == 0) { + if (strcasecmp(entry->filename, name) == 0) { DEBUG("cbfs_get_entry: found %s\n", name); return entry; } @@ -692,13 +692,13 @@ int cbfs_remove_entry(struct cbfs_image *image, const char *name) next = cbfs_find_next_entry(image, entry); assert(next); DEBUG("cbfs_remove_entry: Removed %s @ 0x%x\n", - CBFS_NAME(entry), cbfs_get_entry_addr(image, entry)); + entry->filename, cbfs_get_entry_addr(image, entry)); entry->type = htonl(CBFS_COMPONENT_DELETED); len = (cbfs_get_entry_addr(image, next) - cbfs_get_entry_addr(image, entry)); entry->offset = htonl(cbfs_calculate_file_header_size("")); entry->len = htonl(len - ntohl(entry->offset)); - memset(CBFS_NAME(entry), 0, ntohl(entry->offset) - sizeof(*entry)); + memset(entry->filename, 0, ntohl(entry->offset) - sizeof(*entry)); memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, ntohl(entry->len)); return 0; @@ -787,7 +787,7 @@ static int cbfs_print_decoded_payload_segment_info( int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry, void *arg) { - const char *name = CBFS_NAME(entry); + const char *name = entry->filename; struct cbfs_payload_segment *payload; FILE *fp = (FILE *)arg; @@ -1025,8 +1025,8 @@ int cbfs_create_empty_entry(struct cbfs_file *entry, entry->len = htonl(len); entry->checksum = 0; // TODO Build a checksum algorithm. entry->offset = htonl(cbfs_calculate_file_header_size(name)); - memset(CBFS_NAME(entry), 0, ntohl(entry->offset) - sizeof(*entry)); - strcpy(CBFS_NAME(entry), name); + memset(entry->filename, 0, ntohl(entry->offset) - sizeof(*entry)); + strcpy(entry->filename, name); memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, len); return 0; }

1 0

New patch to review for coreboot: cbfstool: improve specification of struct cbfs_file
by Patrick Georgi 15 Jul '15

15 Jul '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10927 -gerrit commit dda090577853006f48ecac53f7f245f852444c6f Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Wed Jul 15 16:40:44 2015 +0200 cbfstool: improve specification of struct cbfs_file Lock down its size and document some of the fields Change-Id: I09fd6c80185345da0ae17d0f4498b50995fd1ec5 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- util/cbfstool/cbfs.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 14a7a37..6286eff 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -71,12 +71,16 @@ struct cbfs_header { struct cbfs_file { uint8_t magic[8]; + /* length of file data */ uint32_t len; uint32_t type; uint32_t checksum; + /* length of header incl. variable data */ uint32_t offset; } __PACKED; +_Static_assert(sizeof(struct cbfs_file) == 24, "cbfs_file size mismatch"); + struct cbfs_stage { uint32_t compression; uint64_t entry;

1 0

New patch to review for coreboot: model_fxx/powernow: add dual core Socket F TDPs
by Jonathan A. Kollasch 15 Jul '15

15 Jul '15

Jonathan A. Kollasch (jakllsch(a)kollasch.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10926 -gerrit commit 0bcac64931042d7bdc4ea198bea8638d78ef0068 Author: Jonathan A. Kollasch <jakllsch(a)kollasch.net> Date: Wed Jul 15 14:34:17 2015 -0500 model_fxx/powernow: add dual core Socket F TDPs Values based on correlation of brand strings, brand numbers and the TDP listings on AMD's web site (Wikipedia for Athlon 64 FX-7x TDPs). Change-Id: I7e6d12d0b6cc4fefc3f84076234c62c40e08304c Signed-off-by: Jonathan A. Kollasch <jakllsch(a)kollasch.net> --- src/cpu/amd/model_fxx/powernow_acpi.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/cpu/amd/model_fxx/powernow_acpi.c b/src/cpu/amd/model_fxx/powernow_acpi.c index ac505ee..1ce746d 100644 --- a/src/cpu/amd/model_fxx/powernow_acpi.c +++ b/src/cpu/amd/model_fxx/powernow_acpi.c @@ -106,7 +106,12 @@ static void pstates_algorithm(u32 pcontrol_blk, u8 plen, u8 onlyBSP) u8 index; msr_t msr; u32 fid_multiplier; - static struct power_limit_encoding TDP[20] = { + static const struct power_limit_encoding TDP[] = { + {0x10, 0x1, 0x2, 45}, /* Opteron EE */ + {0x10, 0x1, 0x6, 68}, /* Opteron HE */ + {0x10, 0x1, 0xa, 95}, /* Opteron */ + {0x10, 0x1, 0xc, 119}, /* Opteron SE */ + {0x10, 0x1, 0xe, 125}, /* Athlon 64 FX-7x */ {0x11, 0x0, 0x8, 62}, {0x11, 0x1, 0x8, 89}, {0x11, 0x1, 0xa, 103},

1 0

Patch set updated for coreboot: x86 realmode: Set up the 8254 timer before running option rom
by Marc Jones 15 Jul '15

15 Jul '15

Marc Jones (marc.jones(a)se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10903 -gerrit commit 39c6a59ff0259296783638b6a06f6d3e902b98cc Author: zbao <fishbaozi(a)gmail.com> Date: Thu Jun 25 16:58:53 2015 -0400 x86 realmode: Set up the 8254 timer before running option rom If the 8254 is not set up, the external graphics option rom hangs and never returns. The code is tested on AMD/bettong. Change-Id: I0022de9d9a275a7d4b7a331ae7fcf793b9f4c5f5 Signed-off-by: Zheng Bao <zheng.bao(a)amd.com> Signed-off-by: Zheng Bao <fishbaozi(a)gmail.com> --- src/device/oprom/realmode/x86.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c index 14bcbc0..796c9fe 100644 --- a/src/device/oprom/realmode/x86.c +++ b/src/device/oprom/realmode/x86.c @@ -31,6 +31,7 @@ #include <device/pci_ids.h> #include <lib/jpeg.h> #include <pc80/i8259.h> +#include <pc80/i8254.h> #include <string.h> #include <vbe.h> @@ -326,6 +327,7 @@ void run_bios(struct device *dev, unsigned long addr) * in some option roms. */ setup_i8259(); + setup_i8254(); /* Set up some legacy information in the F segment */ setup_rombios();

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2015