New patch to review for coreboot: b361bde cbfstool: Allow smaller alignment size for locate command.
Hung-Te Lin (hungte@chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2730
-gerrit
commit b361bdea249884d62163923956fcd09c5c44958f Author: Hung-Te Lin hungte@chromium.org Date: Fri Mar 15 14:44:05 2013 +0800
cbfstool: Allow smaller alignment size for locate command.
The "locate" command was primarily used to finding a location for ELF stage to fit in (one) memory page. To support adding data blobs that only need alignment without memory page boundary limitation, we can extend the locate command to allow any alignment (even smaller than input file size).
Verified by manually testing a file (324 bytes) with alignment=0x10: cbfstool coreboot.rom locate -f test -n test -a 0x10 # output: 0x71fdd0 cbfstool coreboot.rom add -f test -n test -t raw -b 0x71fdd0 cbfstool coreboot.rom print -v -v # output: test 0x71fd80 raw 324 # output: cbfs_file=0x71fd80, offset=0x50, content_address=0x71fdd0+0x144
Change-Id: I0893adde51ebf46da1c34913f9c35507ed8ff731 Signed-off-by: Hung-Te Lin hungte@chromium.org --- util/cbfstool/cbfs_image.c | 83 ++++++++++++++++++---------------------------- util/cbfstool/cbfs_image.h | 4 +-- 2 files changed, 35 insertions(+), 52 deletions(-)
diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 2cdbf23..d3e502d 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -773,54 +773,50 @@ int cbfs_create_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, return 0; }
-/* Finds a place to hold whole stage data in same memory page. - */ -static int is_in_same_page(uint32_t start, uint32_t size, uint32_t page) { - if (!page) - return 1; - return (start / page) == (start + size - 1) / page; +/* Finds a place in given range (start, end) to hold <size> of bytes and aligned + * to <align> of bytes; otherwise return 0. */ +static uint32_t fit_in_range(uint32_t start, uint32_t end, uint32_t size, + uint32_t align) { + uint32_t offset = align_up(start, align); + + /* 0 is used to indicate failure so start can't be 0. This is typically + * true because we usually have a header before start address. */ + assert(start != 0); + + while (offset < start) + offset += align; + + if (offset >= start && offset + size <= end) + return offset; + + return 0; }
int32_t cbfs_locate_entry(struct cbfs_image *image, const char *name, - uint32_t size, uint32_t page_size) { + uint32_t size, uint32_t align) { struct cbfs_file *entry; size_t need_len; - uint32_t addr, addr_next, addr2, addr3, header_len; - assert(size < page_size); + uint32_t addr, addr_next, offset, header_len;
- if (page_size % ntohl(image->header->align)) - WARN("locate_entry: page does not align with CBFS image.\n"); + if (!align) + align = 1; + + if (align % ntohl(image->header->align)) + WARN("%s: Alignment (%d) is smaller than CBFS image (%d).\n", + __func__, align, ntohl(image->header->align));
/* TODO Old cbfstool always assume input is a stage file (and adding * sizeof(cbfs_stage) for header. We should fix that by adding "-t" - * (type) param in future. For right now, follow old behavior. */ + * (type) param in future. For right now, we assume cbfs_stage is the + * largest structure and add it into header size. */ + assert(sizeof(struct cbfs_stage) >= sizeof(struct cbfs_payload)); header_len = (cbfs_calculate_file_header_size(name) + sizeof(struct cbfs_stage)); need_len = header_len + size;
- // Merge empty entries to build get max available pages. + // Merge empty entries to build get max available alignment. cbfs_walk(image, cbfs_merge_empty_entry, NULL);
- /* Three cases of content location on memory page: - * case 1. - * | PAGE 1 | PAGE 2 | - * | <header><content>| Fit. Return start of content. - * - * case 2. - * | PAGE 1 | PAGE 2 | - * | <header><content> | Fits when we shift content to align - * shift-> | <header>|<content> | at starting of PAGE 2. - * - * case 3. (large content filling whole page) - * | PAGE 1 | PAGE 2 | PAGE 3| - * | <header>< content > | | Can't fit. If we shift content to - * | { free space . } PAGE 2, header can't fit in free - * | shift-> <header><content> space, so we must use PAGE 3. - * - * The returned address will be used to re-link stage file, and then - * assigned to add-stage command (-b), which will be then re-calculated - * by ELF loader and positioned by cbfs_add_entry. - */ for (entry = cbfs_find_first_entry(image); entry && cbfs_is_valid_entry(image, entry); entry = cbfs_find_next_entry(image, entry)) { @@ -834,24 +830,11 @@ int32_t cbfs_locate_entry(struct cbfs_image *image, const char *name, image, entry)); if (addr_next - addr < need_len) continue; - if (is_in_same_page(addr + header_len, size, page_size)) { - DEBUG("cbfs_locate_entry: FIT (PAGE1)."); - return addr + header_len; - }
- addr2 = align_up(addr, page_size); - if (addr2 < addr_next && addr_next - addr2 >= size && - addr2 - addr >= header_len) { - DEBUG("cbfs_locate_entry: OVERLAP (PAGE2)."); - return addr2; - } - - addr3 = addr2 + page_size; - if (addr3 < addr_next && addr_next - addr3 >= size && - addr3 - addr >= header_len) { - DEBUG("cbfs_locate_entry: OVERLAP+ (PAGE3)."); - return addr3; - } + offset = fit_in_range(addr + header_len, addr_next, size, + align); + if (offset) + return offset; } return -1; } diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 57bbfa1..16ba568 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -76,10 +76,10 @@ int cbfs_remove_entry(struct cbfs_image *image, const char *name); int cbfs_create_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, size_t len, const char *name);
-/* Finds a location to put given content in same memory page. +/* Finds a location to put given content in aligned location. * Returns a valid offset, or -1 on failure. */ int32_t cbfs_locate_entry(struct cbfs_image *image, const char *name, - uint32_t size, uint32_t page_size); + uint32_t size, uint32_t align);
/* Callback function used by cbfs_walk. * Returns 0 on success, or non-zero to stop further iteration. */
-
Hung-Te Lin