Alexandru Gagniuc (mr.nuke.me@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5120
-gerrit
commit 5f53409fe35a68d9e43c9f8d96f352b2e4642b7a Author: Ronald G. Minnich rminnich@google.com Date: Tue Feb 4 17:35:44 2014 -0800
Add an xdr function for the cbfs_file header
And use it in fit.c and remove one more use of htonl.
Change-Id: Ibf18dcc0a7f08d75c2374115de0db7a4bf64ec1e Signed-off-by: Ronald G. Minnich rminnich@google.com --- util/cbfstool/cbfs.h | 3 +++ util/cbfstool/common.c | 9 +++++++++ util/cbfstool/common.h | 1 + util/cbfstool/fit.c | 19 +++++++++++++++---- util/cbfstool/xdr.c | 9 +++++++++ 5 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 527c867..1839646 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -126,6 +126,9 @@ uint32_t get_cbfs_entry_type(const char *name, uint32_t default_value); const char *get_cbfs_entry_type_name(uint32_t type); uint32_t get_cbfs_compression(const char *name, uint32_t unknown);
+/* common.c */ +void cbfs_file_get_header(struct buffer *buf, struct cbfs_file *file); + /* elfheaders.c */ int elf_headers(const struct buffer *pinput, diff --git a/util/cbfstool/common.c b/util/cbfstool/common.c index 98d9517..f594e84 100644 --- a/util/cbfstool/common.c +++ b/util/cbfstool/common.c @@ -103,6 +103,15 @@ void buffer_delete(struct buffer *buffer) { buffer->size = 0; }
+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->offset = xdr_be.get32(buf); +} + static struct { uint32_t arch; const char *name; diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index 5bcbcbe..5d3b900 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -110,5 +110,6 @@ struct xdr {
/* xdr.c */ extern struct xdr xdr_le, xdr_be; +int bgets(struct buffer *input, void *output, size_t len);
#endif diff --git a/util/cbfstool/fit.c b/util/cbfstool/fit.c index a368dad..84f0bff 100644 --- a/util/cbfstool/fit.c +++ b/util/cbfstool/fit.c @@ -188,17 +188,28 @@ static void add_microcodde_entries(struct cbfs_image *image, } }
+static int fit_header(void *ptr, uint32_t *current_offset, uint32_t *file_length) +{ + struct buffer buf; + struct cbfs_file header; + buf.data = ptr; + buf.size = sizeof(header); + cbfs_file_get_header(&buf, &header); + *current_offset = header.offset; + *file_length = header.len; + return 0; +} + static int parse_microcode_blob(struct cbfs_image *image, struct cbfs_file *mcode_file, struct microcode_entry *mcus, int *total_mcus) { int num_mcus; - int current_offset; - int file_length; + uint32_t current_offset; + uint32_t file_length;
current_offset = (int)((char *)mcode_file - image->buffer.data); - current_offset += ntohl(mcode_file->offset); - file_length = ntohl(mcode_file->len); + fit_header(mcode_file, ¤t_offset, &file_length);
num_mcus = 0; while (file_length > sizeof(struct microcode_header)) diff --git a/util/cbfstool/xdr.c b/util/cbfstool/xdr.c index d779675..ddc282e 100644 --- a/util/cbfstool/xdr.c +++ b/util/cbfstool/xdr.c @@ -25,6 +25,15 @@ #include <stdint.h> #include "common.h"
+int bgets(struct buffer *input, void *output, size_t len) +{ + len = input->size < len ? input->size : len; + memmove(output, input->data, len); + input->data += len; + input->size -= len; + return len; +} + /* The assumption in all this code is that we're given a pointer to enough data. * Hence, we do not check for underflow. */
-
Alexandru Gagniuc