coreboot February 2013

coreboot@coreboot.org

27 participants
790 discussions

Re: [coreboot] Different Google copyright notices: »The Chromium OS Authors. ?«
by David Hendricks 05 Feb '13

05 Feb '13

To close the loop on this-- We had a discussion off-line today and decided that since we're contributing code to a third-party project which is not necessarily part of Chromium OS we should assign copyright to "Google Inc." rather than "The Chromium OS Authors." This coincides with the typical process Google employees use for releasing open-source code. A lot of confusion seems to stem from using "The Chromium OS Authors" when checking code into a repository hosted on chromium.org, which is our standard procedure. I've added a pre-submit check for developers working on Chrome/Chromium OS so that developers on our use the correct copyright line for files in our repository before sending patches upstream: https://gerrit.chromium.org/gerrit/#/c/42569/ . On Thu, Jan 31, 2013 at 8:48 PM, ron minnich <rminnich(a)gmail.com> wrote: > On Thu, Jan 31, 2013 at 6:09 PM, Hung-Te Lin <hungte(a)chromium.org> wrote: > > > For same reason, for new commits we can be more careful to use latest > > correct copyright string, but it seems no harm to keep old files as-is. > What > > do you think? > > don't change old strings. > > thanks > > ron > > -- > coreboot mailing list: coreboot(a)coreboot.org > http://www.coreboot.org/mailman/listinfo/coreboot > -- David Hendricks (dhendrix) Systems Software Engineer, Google Inc.

1 0

Patch set updated for coreboot: 7b6ad2c crossgcc: Save the script itself when cross build is over.
by Zheng Bao 05 Feb '13

05 Feb '13

Zheng Bao (zheng.bao(a)amd.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2247 -gerrit commit 7b6ad2cebc6a5403b9b0400281f03d8157ab2da3 Author: Zheng Bao <fishbaozi(a)gmail.com> Date: Tue Feb 5 10:51:53 2013 +0800 crossgcc: Save the script itself when cross build is over. In case that the new toolchains don't work well, we can trace back and reproduce the old tools by checking the xgcc folder. It is useful when my team members need to get my old toolchains on their host machines. Change-Id: I54e4bc6afcfbbf622165af6eae27bbb6efc2e8cc Signed-off-by: Zheng Bao <zheng.bao(a)amd.com> Signed-off-by: zbao <fishbaozi(a)gmail.com> Signed-off-by: Paul Menzel <paulepanter(a)users.sourceforge.net> --- util/crossgcc/buildgcc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index c69e7cd..24357e9 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -595,6 +595,8 @@ test -r $IASL_DIR/generate/unix/.failed && printf "${RED}failed${NC}\n" || \ test -r $IASL_DIR/generate/unix/.failed && exit 1 fi +cp `pwd`/$0 $DESTDIR$TARGETDIR/$0.commit.`git describe` + if [ $SAVETEMPS -eq 0 ]; then printf "Cleaning up... " rm -rf ${GMP_DIR} build-gmp

1 0

Patch merged into coreboot/master: ed08bcc Hook up corebootPkg as Tianocore payload
by gerrit＠coreboot.org 05 Feb '13

05 Feb '13

the following patch was just integrated into master: commit ed08bcc12dddfd65edb38353530fec5fae17258d Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Mon Feb 4 19:15:06 2013 +0100 Hook up corebootPkg as Tianocore payload This unplugs Stefan's PIANO project. Change Tianocore payload configuration to use corebootPkg. As argument you have to give it the COREBOOT.FD generated by the Tianocore build system. It automatically determines base address and entry point. Compression setting is honored (ie. no compression if you don't want), but corebootPkg currently assumes that coreboot is doing it. Loading a 6MB payload into CBFS without compression will fail more often than not. Change-Id: If9c64c9adb4a846a677c8af40f149ce697059ee6 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> Reviewed-on: http://review.coreboot.org/2280 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Build-Tested: build bot (Jenkins) at Mon Feb 4 19:28:52 2013, giving +1 Reviewed-By: Stefan Reinauer <stefan.reinauer(a)coreboot.org> at Mon Feb 4 22:53:57 2013, giving +2 See http://review.coreboot.org/2280 for details. -gerrit

2 1

New patch to review for coreboot: 95e511f cbfstool: support parsing UEFI firmware volumes
by Stefan Reinauer 04 Feb '13

04 Feb '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2281 -gerrit commit 95e511f5504dab3fabac2f18036712f4d5e4e3fe Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Mon Feb 4 15:39:13 2013 -0800 cbfstool: support parsing UEFI firmware volumes This removes the hack implemented in http://review.coreboot.org/#/c/2280 (and should make using 64bit Tiano easier, but that's not yet supported) Change-Id: Ie30129c4102dfbd41584177f39057b31f5a937fd Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- src/arch/x86/Makefile.inc | 14 +----- util/cbfstool/cbfs-mkpayload.c | 107 ++++++++++++++++++++++++++++++++++++++++- util/cbfstool/cbfstool.c | 14 +++++- util/cbfstool/coff.h | 86 +++++++++++++++++++++++++++++++++ util/cbfstool/common.h | 2 + util/cbfstool/fv.h | 49 +++++++++++++++++++ 6 files changed, 257 insertions(+), 15 deletions(-) diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index fc1e0e0..67789ce 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -101,19 +101,7 @@ ifeq ($(CONFIG_PAYLOAD_FILO),y) endif ifeq ($(CONFIG_PAYLOAD_TIANOCORE),y) @printf " PAYLOAD Tiano Core (compression: $(CBFS_PAYLOAD_COMPRESS_FLAG))\n" - $(eval $(shell \ - TMPFILE=`mktemp`; \ - head -c1200 $(CONFIG_TIANOCORE_FILE) | \ - tail -c1100 > $$TMPFILE && \ - LC_ALL=C objdump -x $$TMPFILE | \ - grep .text | while read idx nam size vma lma off align; do \ - printf "TIANO_ENTRY:=%d " 0x$$vma; \ - expr `printf "%d - %d - 100" 0x$$vma 0x$$off`; \ - done && \ - rm $$TMPFILE)) - $(eval TIANO_BASE:=$(word 2,$(TIANO_ENTRY))) - $(eval TIANO_ENTRY:=$(word 1,$(TIANO_ENTRY))) - $(CBFSTOOL) $@.tmp add-flat-binary -f $(CONFIG_TIANOCORE_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -l $(TIANO_BASE) -e $(TIANO_ENTRY) -c $(CBFS_PAYLOAD_COMPRESS_FLAG) + $(CBFSTOOL) $@.tmp add-payload -f $(CONFIG_TIANOCORE_FILE) -n $(CONFIG_CBFS_PREFIX)/payload -c $(CBFS_PAYLOAD_COMPRESS_FLAG) endif ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y) @printf " CONFIG $(DOTCONFIG)\n" diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c index 302d506..99142f4 100644 --- a/util/cbfstool/cbfs-mkpayload.c +++ b/util/cbfstool/cbfs-mkpayload.c @@ -26,6 +26,8 @@ #include "common.h" #include "cbfs.h" #include "elf.h" +#include "fv.h" +#include "coff.h" int parse_elf_to_payload(const struct buffer *input, struct buffer *output, comp_algo algo) @@ -43,7 +45,7 @@ int parse_elf_to_payload(const struct buffer *input, int i; if(!iself((unsigned char *)input->data)){ - ERROR("The payload file is not in ELF format!\n"); + INFO("The payload file is not in ELF format!\n"); return -1; } @@ -247,3 +249,106 @@ int parse_flat_binary_to_payload(const struct buffer *input, return 0; } + +int parse_fv_to_payload(const struct buffer *input, + struct buffer *output, comp_algo algo) +{ + comp_func_ptr compress; + struct cbfs_payload_segment *segs; + int doffset, len = 0; + firmware_volume_header_t *fv; + ffs_file_header_t *fh; + common_section_header_t *cs; + dos_header_t *dh; + coff_header_t *ch; + pe_opt_header_t *ph; + int dh_offset; + + uint32_t loadaddress; + uint32_t entrypoint; + + compress = compression_function(algo); + if (!compress) + return -1; + + DEBUG("start: parse_fv_to_payload\n"); + + fv = (firmware_volume_header_t *)input->data; + if (fv->signature != FV_SIGNATURE) { + INFO("Not a UEFI firmware volume.\n"); + return -1; + } + + fh = (ffs_file_header_t *)(input->data + fv->header_length); + if (fh->file_type != FILETYPE_SEC) { + ERROR("Not a usable UEFI firmware volume.\n"); + return -1; + } + + cs = (common_section_header_t *)&fh[1]; + if (cs->section_type != SECTION_PE32) { + ERROR("Not a usable UEFI firmware volume.\n"); + return -1; + } + + dh = (dos_header_t *)&cs[1]; + if (dh->signature != 0x5a4d) { + ERROR("Not a usable UEFI firmware volume.\n"); + return -1; + } + + dh_offset = (unsigned long)dh - (unsigned long)input->data; + DEBUG("dos header offset = %x\n", dh_offset); + + ch = (coff_header_t *)(((void *)dh)+dh->e_lfanew); + if (ch->machine != 0x14c) { + ERROR("Not a usable UEFI firmware volume.\n"); + return -1; + } + + ph = (pe_opt_header_t *)&ch[1]; + if (ph->signature != 267) { + ERROR("Not a usable UEFI firmware volume.\n"); + return -1; + } + + DEBUG("image base %x\n", ph->image_addr); + DEBUG("entry point %x\n", ph->entry_point); + + loadaddress = ph->image_addr - dh_offset; + entrypoint = ph->image_addr + ph->entry_point; + + if (buffer_create(output, (2 * sizeof(*segs) + input->size), + input->name) != 0) + return -1; + + memset(output->data, 0, output->size); + + segs = (struct cbfs_payload_segment *)output->data; + doffset = (2 * sizeof(*segs)); + + /* Prepare code segment */ + segs[0].type = PAYLOAD_SEGMENT_CODE; + segs[0].load_addr = htonll(loadaddress); + segs[0].mem_len = htonl(input->size); + segs[0].offset = htonl(doffset); + + compress(input->data, input->size, output->data + doffset, &len); + segs[0].compression = htonl(algo); + segs[0].len = htonl(len); + + if ((unsigned int)len >= input->size) { + WARN("Compressing data would make it bigger - disabled.\n"); + segs[0].compression = 0; + segs[0].len = htonl(input->size); + memcpy(output->data + doffset, input->data, input->size); + } + + /* prepare entry point segment */ + segs[1].type = PAYLOAD_SEGMENT_ENTRY; + segs[1].load_addr = htonll(entrypoint); + output->size = doffset + ntohl(segs[0].len); + + return 0; + +} diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 3881628..97fd88d 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -138,8 +138,20 @@ static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset) { static int cbfstool_convert_mkpayload(struct buffer *buffer, uint32_t *offset) { struct buffer output; - if (parse_elf_to_payload(buffer, &output, param.algo) != 0) + int ret; + /* per default, try and see if payload is an ELF binary */ + ret = parse_elf_to_payload(buffer, &output, param.algo); + + /* 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); + + /* Not a supported payload type */ + if (ret != 0) { + ERROR("Not a supported payload type (ELF / FV).\n"); return -1; + } + buffer_delete(buffer); // direct assign, no dupe. memcpy(buffer, &output, sizeof(*buffer)); diff --git a/util/cbfstool/coff.h b/util/cbfstool/coff.h new file mode 100644 index 0000000..ebe4538 --- /dev/null +++ b/util/cbfstool/coff.h @@ -0,0 +1,86 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2013 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 + */ + +typedef struct { + uint16_t signature; + uint16_t lastsize; + uint16_t nblocks; + uint16_t nreloc; + uint16_t hdrsize; + uint16_t minalloc; + uint16_t maxalloc; + uint16_t ss; + uint16_t sp; + uint16_t checksum; + uint16_t ip; + uint16_t cs; + uint16_t relocpos; + uint16_t noverlay; + uint16_t reserved1[4]; + uint16_t oem_id; + uint16_t oem_info; + uint16_t reserved2[10]; + uint32_t e_lfanew; +} dos_header_t; + +typedef struct { + uint8_t signature[4]; + uint16_t machine; + uint16_t num_sections; + uint32_t timestamp; + uint32_t symboltable; + uint32_t num_symbols; + uint16_t opt_header_size; + uint16_t characteristics; +} coff_header_t; + +typedef struct { + uint16_t signature; + uint8_t major_linker_version; + uint8_t minor_linker_version; + uint32_t code_size; + uint32_t data_size; + uint32_t bss_size; + uint32_t entry_point; + uint32_t code_offset; + uint32_t data_offset; + uint32_t image_addr; + uint32_t section_alignment; + uint32_t file_alignment; + uint16_t major_os_version; + uint16_t minor_os_version; + uint16_t major_image_version; + uint16_t minor_image_version; + uint16_t major_subsystem_version; + uint16_t minor_subsystem_version; + uint32_t reserved; + uint32_t image_size; + uint32_t header_size; + uint32_t checksum; + uint16_t subsystem; + uint16_t characteristics; + uint32_t stack_reserve_size; + uint32_t stack_commit_size; + uint32_t heap_reserve_size; + uint32_t heap_commit_size; + uint32_t loader_flags; + uint32_t number_of_va_and_sizes; + /* data directory not needed */ +} pe_opt_header_t; + diff --git a/util/cbfstool/common.h b/util/cbfstool/common.h index 16c04c9..e197143 100644 --- a/util/cbfstool/common.h +++ b/util/cbfstool/common.h @@ -100,6 +100,8 @@ uint64_t intfiletype(const char *name); /* cbfs-mkpayload.c */ int parse_elf_to_payload(const struct buffer *input, struct buffer *output, comp_algo algo); +int parse_fv_to_payload(const struct buffer *input, + struct buffer *output, comp_algo algo); int parse_flat_binary_to_payload(const struct buffer *input, struct buffer *output, uint32_t loadaddress, diff --git a/util/cbfstool/fv.h b/util/cbfstool/fv.h new file mode 100644 index 0000000..1ea50e0 --- /dev/null +++ b/util/cbfstool/fv.h @@ -0,0 +1,49 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2013 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 + */ + +#define FV_SIGNATURE 0x4856465f +typedef struct { + uint8_t padding[16]; + uint8_t guid[16]; + uint64_t fv_length; + uint32_t signature; + uint32_t attributes; + uint16_t header_length; + uint16_t checksum; + uint16_t ext_header_offs; + uint8_t reserved; + uint8_t revision; + /* not used here: block map entries */ +} firmware_volume_header_t; + +#define FILETYPE_SEC 0x03 +typedef struct { + uint8_t name[16]; + uint16_t integrity; + uint8_t file_type; + uint8_t attributes; + uint8_t size[3]; + uint8_t state; +} ffs_file_header_t; + +#define SECTION_PE32 0x10 +typedef struct { + uint8_t size[3]; + uint8_t section_type; +} common_section_header_t;

1 0

Patch merged into coreboot/master: f04e68e Add MMCONF resource to AMD fam15 PCI_DOMAIN
by gerrit＠coreboot.org 04 Feb '13

04 Feb '13

the following patch was just integrated into master: commit f04e68e9e2a651b5db4d769d20d78d807426f109 Author: Steven Sherk <steven.sherk(a)se-eng.com> Date: Wed Jan 30 16:02:14 2013 -0700 Add MMCONF resource to AMD fam15 PCI_DOMAIN This is a port of the following: commit d5c998be99709c92f200b3b08aed2ca3fee2d519 The coreboot resource allocator doesn't respect resources claimed in the APIC_CLUSTER. Move the MMCONF resource to the PCI_DOMAIN to prevent overlap with PCI devices. original-Change-Id: I8541795f69bbdd9041b390103fb901d37e07eeb9 Signed-off-by: Marc Jones <marc.jones(a)se-eng.com> URL - http://review.coreboot.org/#/c/2167/ Change-Id: I6e585d5cf0d46bd58337a6801fb0690ab2dd000c Signed-off-by: Steven Sherk <steven.sherk(a)se-eng.com> Reviewed-on: http://review.coreboot.org/2248 Tested-by: build bot (Jenkins) Reviewed-by: Marc Jones <marcj303(a)gmail.com> Build-Tested: build bot (Jenkins) at Mon Feb 4 18:54:08 2013, giving +1 Reviewed-By: Marc Jones <marcj303(a)gmail.com> at Mon Feb 4 23:59:41 2013, giving +2 See http://review.coreboot.org/2248 for details. -gerrit

1 0

Patch set updated for coreboot: 8028a29 cbfstool: Use cbfs_image API for "locate" command.
by Stefan Reinauer 04 Feb '13

04 Feb '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2213 -gerrit commit 8028a29671c6005641eaeefbc1ff534bafaeae9b Author: Hung-Te Lin <hungte(a)chromium.org> Date: Tue Jan 29 03:46:02 2013 +0800 cbfstool: Use cbfs_image API for "locate" command. To support platforms without top-aligned address mapping like ARM, "locate" command now outputs platform independent ROM offset by default. To retrieve x86 style top-aligned virtual address, add "-T". To test: cbfstool coreboot.rom locate -f stage -n stage -a 0x100000 -T # Example output: 0xffffdc10 Change-Id: I474703c4197b36524b75407a91faab1194edc64d Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> --- src/arch/x86/Makefile.inc | 2 +- util/cbfstool/cbfs_image.c | 139 +++++++++++++++++++++++++++++++++++++++++++++ util/cbfstool/cbfs_image.h | 15 +++++ util/cbfstool/cbfstool.c | 48 +++++++++++++--- 4 files changed, 195 insertions(+), 9 deletions(-) diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 4d02fce..fc1e0e0 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -391,7 +391,7 @@ $(objgenerated)/romstage_xip.ld: $(objgenerated)/romstage_null.ld $(objcbfs)/bas $(objcbfs)/base_xip.txt: $(obj)/coreboot.pre1 $(objcbfs)/romstage_null.bin rm -f $@ - $(CBFSTOOL) $(obj)/coreboot.pre1 locate -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \ + $(CBFSTOOL) $(obj)/coreboot.pre1 locate -T -f $(objcbfs)/romstage_null.bin -n $(CONFIG_CBFS_PREFIX)/romstage -a $(CONFIG_XIP_ROM_SIZE) > $@.tmp \ || { echo "The romstage is larger than XIP size. Please expand the CONFIG_XIP_ROM_SIZE" ; exit 1; } mv $@.tmp $@ diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index f8e2ae7..2f38cec 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -359,6 +359,49 @@ int cbfs_print_directory(struct cbfs_image *image) { return 0; } +int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, + void *arg) { + struct cbfs_file *next; + uint32_t type, addr, last_addr; + + type = ntohl(entry->type); + if (type == CBFS_COMPONENT_DELETED) { + // Ready to be recycled. + type = CBFS_COMPONENT_NULL; + entry->type = htonl(type); + } + if (type != CBFS_COMPONENT_NULL) + return 0; + + next = cbfs_find_next_entry(image, entry); + + while (next && cbfs_is_valid_entry(next)) { + type = ntohl(next->type); + if (type == CBFS_COMPONENT_DELETED) { + type = CBFS_COMPONENT_NULL; + next->type = htonl(type); + } + if (type != CBFS_COMPONENT_NULL) + return 0; + + addr = cbfs_get_entry_addr(image, entry); + last_addr = cbfs_get_entry_addr( + image, cbfs_find_next_entry(image, next)); + + // Now, we find two deleted/empty entries; try to merge now. + DEBUG("join_empty_entry: combine 0x%x+0x%x and 0x%x+0x%x.\n", + cbfs_get_entry_addr(image, entry), ntohl(entry->len), + cbfs_get_entry_addr(image, next), ntohl(next->len)); + cbfs_create_empty_entry(image, entry, + (last_addr - addr - + cbfs_calculate_file_header_size("")), + ""); + DEBUG("new empty entry: length=0x%x\n", ntohl(entry->len)); + next = cbfs_find_next_entry(image, entry); + } + return 0; +} + int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback, void *arg) { int count = 0; @@ -435,3 +478,99 @@ int cbfs_is_valid_entry(struct cbfs_file *entry) { sizeof(entry->magic)) == 0); } +int cbfs_create_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, + size_t len, const char *name) { + memset(entry, CBFS_CONTENT_DEFAULT_VALUE, sizeof(*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->offset = htonl(cbfs_calculate_file_header_size(name)); + memset(CBFS_NAME(entry), 0, ntohl(entry->offset) - sizeof(*entry)); + strcpy(CBFS_NAME(entry), name); + memset(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, len); + 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; +} + +int32_t cbfs_locate_entry(struct cbfs_image *image, const char *name, + uint32_t size, uint32_t page_size) { + struct cbfs_file *entry; + size_t need_len; + uint32_t addr, addr_next, addr2, addr3, header_len; + assert(size < page_size); + + if (page_size % ntohl(image->header->align)) + WARN("locate_entry: page does not align with CBFS image.\n"); + + /* 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. */ + 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. + 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(entry); + entry = cbfs_find_next_entry(image, entry)) { + + uint32_t type = ntohl(entry->type); + if (type != CBFS_COMPONENT_NULL) + continue; + + addr = cbfs_get_entry_addr(image, entry); + addr_next = cbfs_get_entry_addr(image, cbfs_find_next_entry( + 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; + } + } + return -1; +} diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 73b262d..d99bee8 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -49,6 +49,16 @@ int cbfs_export_entry(struct cbfs_image *image, const char *entry_name, /* Removes an entry from CBFS image. Returns 0 on success, otherwise non-zero. */ int cbfs_remove_entry(struct cbfs_image *image, const char *name); +/* Initializes a new empty (type = NULL) entry with size and name in CBFS image. + * Returns 0 on success, otherwise (ex, not found) non-zero. */ +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. + * 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); + /* Callback function used by cbfs_walk. * Returns 0 on success, or non-zero to stop further iteration. */ typedef int (*cbfs_entry_callback)(struct cbfs_image *image, @@ -90,4 +100,9 @@ int cbfs_print_header_info(struct cbfs_image *image); int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry, void *arg); +/* Merge empty entries starting from given entry. + * Returns 0 on success, otherwise non-zero. */ +int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, + void *arg); + #endif diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index e653a33..98f6b62 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -48,6 +48,7 @@ static struct param { uint32_t size; uint32_t alignment; uint32_t offset; + uint32_t top_aligned; comp_algo algo; } param = { /* All variables not listed are initialized as zero. */ @@ -363,7 +364,9 @@ static int cbfs_create(void) static int cbfs_locate(void) { - uint32_t filesize, location; + struct cbfs_image image; + struct buffer buffer; + int32_t address; if (!param.filename) { ERROR("You need to specify -f/--filename.\n"); @@ -375,13 +378,37 @@ static int cbfs_locate(void) return 1; } - filesize = getfilesize(param.filename); + if (cbfs_image_from_file(&image, param.cbfs_name) != 0) { + ERROR("Failed to load %s.\n", param.cbfs_name); + return 1; + } + + if (cbfs_get_entry(&image, param.name)) + WARN("'%s' already in CBFS.\n", param.name); + + if (buffer_from_file(&buffer, param.filename) != 0) { + ERROR("Cannot load %s.\n", param.filename); + cbfs_image_delete(&image); + return 1; + } - location = cbfs_find_location(param.cbfs_name, filesize, - param.name, param.alignment); + address = cbfs_locate_entry(&image, param.name, buffer.size, + param.alignment); + buffer_delete(&buffer); - printf("0x%x\n", location); - return location == 0 ? 1 : 0; + if (address == -1) { + ERROR("'%s' can't fit in CBFS for align 0x%x.\n", + param.name, param.alignment); + cbfs_image_delete(&image); + return 1; + } + + if (param.top_aligned) + address = address - ntohl(image.header->romsize); + + cbfs_image_delete(&image); + printf("0x%x\n", address); + return 0; } static int cbfs_print(void) @@ -432,7 +459,7 @@ static const struct command commands[] = { {"add-flat-binary", "f:n:l:e:c:b:vh?", cbfs_add_flat_binary}, {"remove", "n:vh?", cbfs_remove}, {"create", "s:B:a:o:m:vh?", cbfs_create}, - {"locate", "f:n:a:vh?", cbfs_locate}, + {"locate", "f:n:a:Tvh?", cbfs_locate}, {"print", "vh?", cbfs_print}, {"extract", "n:f:vh?", cbfs_extract}, }; @@ -443,6 +470,7 @@ static struct option long_options[] = { {"compression", required_argument, 0, 'c' }, {"base-address", required_argument, 0, 'b' }, {"load-address", required_argument, 0, 'l' }, + {"top-aligned", required_argument, 0, 'T' }, {"entry-point", required_argument, 0, 'e' }, {"size", required_argument, 0, 's' }, {"bootblock", required_argument, 0, 'B' }, @@ -461,6 +489,7 @@ static void usage(char *name) ("cbfstool: Management utility for CBFS formatted ROM images\n\n" "USAGE:\n" " %s [-h]\n" " %s FILE COMMAND [-v] [PARAMETERS]...\n\n" "OPTIONs:\n" + " -T Output top-aligned memory address\n" " -v Provide verbose output\n" " -h Display this help message\n\n" "COMMANDs:\n" @@ -477,7 +506,7 @@ static void usage(char *name) "Remove a component\n" " create -s size -B bootblock -m ARCH [-a align] [-o offset] " "Create a ROM file\n" - " locate -f FILE -n NAME -a align " + " locate -f FILE -n NAME [-a align] [-T] " "Find a place for a file of that size\n" " print " "Show the contents of the ROM\n" @@ -578,6 +607,9 @@ int main(int argc, char **argv) case 'f': param.filename = optarg; break; + case 'T': + param.top_aligned = 1; + break; case 'v': verbose++; break;

1 0

Patch set updated for coreboot: 31bd2dc cbfstool: Use cbfs_image API for "create" command.
by Stefan Reinauer 04 Feb '13

04 Feb '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2214 -gerrit commit 31bd2dc2eac41f1ab266832ca74be60935bee910 Author: Hung-Te Lin <hungte(a)chromium.org> Date: Tue Jan 29 09:45:12 2013 +0800 cbfstool: Use cbfs_image API for "create" command. Usage Changes: To support platforms with different memory layout, "create" takes two extra optional parameters: "-b": base address (or offset) for bootblock. When omitted, put bootblock in end of ROM (x86 style). "-H": header offset. When omitted, put header right before bootblock, and update a top-aligned virtual address reference in end of ROM. Example: (can be found in ARM MAkefile): cbfstool coreboot.rom create -m armv7 -s 4096K -B bootblock.bin \ -a 64 -b 0x0000 -H 0x2040 -o 0x5000 Verified to boot on ARM (Snow) and X86 (QEMU). Change-Id: Ida2a9e32f9a459787b577db5e6581550d9d7017b Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> --- src/arch/armv7/Makefile.inc | 3 +- util/cbfstool/cbfs_image.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ util/cbfstool/cbfs_image.h | 16 +++++++++ util/cbfstool/cbfstool.c | 69 ++++++++++++++++++++++++++++++++--- 4 files changed, 171 insertions(+), 5 deletions(-) diff --git a/src/arch/armv7/Makefile.inc b/src/arch/armv7/Makefile.inc index 715ce1e..f2f4a47 100644 --- a/src/arch/armv7/Makefile.inc +++ b/src/arch/armv7/Makefile.inc @@ -45,9 +45,10 @@ prebuild-files = \ $(if $(call extract_nth,4,$(file)),-b $(call extract_nth,4,$(file))) &&) prebuilt-files = $(foreach file,$(cbfs-files), $(call extract_nth,1,$(file))) +# TODO Change -b, -H, -o to Kconfig variables. $(obj)/coreboot.pre1: $(objcbfs)/bootblock.bin $$(prebuilt-files) $(CBFSTOOL) $(CBFSTOOL) $@.tmp create -m armv7 -s $(CONFIG_COREBOOT_ROMSIZE_KB)K \ - -B $(objcbfs)/bootblock.bin -a 64 + -B $(objcbfs)/bootblock.bin -a 64 -b 0x0000 -H 0x2040 -o 0x5000 $(prebuild-files) true mv $@.tmp $@ else diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 2f38cec..83e8a9d 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -130,6 +130,94 @@ static int cbfs_fix_legacy_size(struct cbfs_image *image) { return 0; } +int cbfs_image_create(struct cbfs_image *image, + uint32_t arch, + size_t size, + uint32_t align, + struct buffer *bootblock, + int32_t bootblock_offset, + int32_t header_offset, + int32_t entries_offset) +{ + struct cbfs_header *header; + struct cbfs_file *entry; + uint32_t cbfs_len; + + 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); + + if (buffer_create(&image->buffer, size, "(new)") != 0) + return -1; + image->header = NULL; + memset(image->buffer.data, CBFS_CONTENT_DEFAULT_VALUE, size); + + // Adjust legcay top-aligned address to ROM offset. + if (IS_TOP_ALIGNED_ADDRESS(entries_offset)) + entries_offset += (int32_t)size; + if (IS_TOP_ALIGNED_ADDRESS(bootblock_offset)) + bootblock_offset += (int32_t)size; + if (IS_TOP_ALIGNED_ADDRESS(header_offset)) + header_offset += (int32_t) size; + + DEBUG("cbfs_create_image: (real offset) bootblock=0x%x, " + "header=0x%x, entries_offset=0x%x\n", + bootblock_offset, header_offset, entries_offset); + + if (align == 0) + align = 64; // default align size. + + // Prepare bootblock + if (bootblock_offset + bootblock->size > size) { + ERROR("Bootblock (0x%x+0x%zx) exceed ROM size (0x%zx)\n", + bootblock_offset, bootblock->size, size); + return -1; + } + memcpy(image->buffer.data + bootblock_offset, bootblock->data, + bootblock->size); + + // Prepare header + if (header_offset + sizeof(*header) > size) { + ERROR("Header (0x%x+0x%zx) exceed ROM size (0x%zx)\n", + header_offset, sizeof(*header), size); + return -1; + } + header = (struct cbfs_header *)(image->buffer.data + header_offset); + image->header = header; + header->magic = htonl(CBFS_HEADER_MAGIC); + header->version = htonl(CBFS_HEADER_VERSION); + header->romsize = htonl(size); + header->bootblocksize = htonl(bootblock->size); + header->align = htonl(align); + header->offset = htonl(entries_offset); + header->architecture = htonl(arch); + + // Prepare entries + if (align_up(entries_offset, align) != entries_offset) { + ERROR("Offset (0x%x) must be aligned to 0x%x.\n", + entries_offset, align); + return -1; + } + if (entries_offset + sizeof(*entry) > size) { + ERROR("Offset (0x%x+0x%zx) exceed ROM size(0x%zx)\n", + entries_offset, sizeof(*entry), size); + return -1; + } + entry = (struct cbfs_file *)(image->buffer.data + entries_offset); + // To calculate available length, find + // e = min(bootblock, header, size) where e > entries_offset. + cbfs_len = size; + if (bootblock_offset > entries_offset && bootblock_offset < cbfs_len) + cbfs_len = bootblock_offset; + if (header_offset > entries_offset && header_offset < cbfs_len) + cbfs_len = header_offset; + cbfs_len -= entries_offset + align; + cbfs_create_empty_entry(image, entry, cbfs_len, ""); + LOG("Created CBFS image (capacity = %d bytes)\n", cbfs_len); + return 0; +} + int cbfs_image_from_file(struct cbfs_image *image, const char *filename) { if (buffer_from_file(&image->buffer, filename) != 0) return -1; diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index d99bee8..5e1c871 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -22,6 +22,8 @@ #include "common.h" #include "cbfs.h" +#define IS_TOP_ALIGNED_ADDRESS(x) ((uint32_t)(x) > 0x80000000) + /* CBFS image processing */ struct cbfs_image { @@ -29,6 +31,20 @@ struct cbfs_image { struct cbfs_header *header; }; +/* Creates an empty CBFS image by given size, and description to its content + * (bootblock, align, header location, starting offset of CBFS entries. + * The output image will contain a valid cbfs_header, with one cbfs_file + * entry with type CBFS_COMPONENT_NULL, with max available size. + * Returns 0 on success, otherwise none-zero. */ +int cbfs_image_create(struct cbfs_image *image, + uint32_t arch, + size_t size, + uint32_t align, + struct buffer *bootblock, + int32_t bootblock_offset, + int32_t header_offset, + int32_t entries_offset); + /* Loads a CBFS image from file. Returns 0 on success, otherwise non-zero. */ int cbfs_image_from_file(struct cbfs_image *image, const char *filename); diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 98f6b62..2aa1df0 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -43,7 +43,10 @@ static struct param { char *bootblock; uint32_t type; uint32_t baseaddress; + uint32_t baseaddress_assigned; uint32_t loadaddress; + uint32_t headeroffset; + uint32_t headeroffset_assigned; uint32_t entrypoint; uint32_t size; uint32_t alignment; @@ -343,23 +346,72 @@ static int cbfs_remove(void) static int cbfs_create(void) { + struct cbfs_image image; + struct buffer bootblock; + if (param.size == 0) { ERROR("You need to specify a valid -s/--size.\n"); return 1; } if (!param.bootblock) { - ERROR("You need to specify -b/--bootblock.\n"); + ERROR("You need to specify -B/--bootblock.\n"); return 1; } + // TODO Remove arch or pack into param. if (arch == CBFS_ARCHITECTURE_UNKNOWN) { ERROR("You need to specify -m/--machine arch\n"); return 1; } - return create_cbfs_image(param.cbfs_name, param.size, param.bootblock, - param.alignment, param.offset); + if (buffer_from_file(&bootblock, param.bootblock) != 0) { + return 1; + } + + // Setup default boot offset and header offset. + if (!param.baseaddress_assigned) { + // put boot block before end of ROM. + param.baseaddress = param.size - bootblock.size; + DEBUG("bootblock in end of ROM.\n"); + } + if (!param.headeroffset_assigned) { + // Put header before bootblock, and make a reference in end of + // bootblock. + param.headeroffset = ( + param.baseaddress - + sizeof(struct cbfs_header)); + if (bootblock.size >= sizeof(uint32_t)) { + // TODO this only works for 32b top-aligned system now... + uint32_t ptr = param.headeroffset - param.size; + uint32_t *sig = (uint32_t *)(bootblock.data + + bootblock.size - + sizeof(ptr)); + *sig = ptr; + DEBUG("CBFS header reference in end of bootblock.\n"); + } + } + + if (cbfs_image_create(&image, + arch, + param.size, + param.alignment, + &bootblock, + param.baseaddress, + param.headeroffset, + param.offset) != 0) { + ERROR("Failed to create %s.\n", param.cbfs_name); + return 1; + } + buffer_delete(&bootblock); + + if (cbfs_image_write_file(&image, param.cbfs_name) != 0) { + ERROR("Failed to write %s.\n", param.cbfs_name); + cbfs_image_delete(&image); + return 1; + } + cbfs_image_delete(&image); + return 0; } static int cbfs_locate(void) @@ -458,7 +510,7 @@ static const struct command commands[] = { {"add-stage", "f:n:t:c:b:vh?", cbfs_add_stage}, {"add-flat-binary", "f:n:l:e:c:b:vh?", cbfs_add_flat_binary}, {"remove", "n:vh?", cbfs_remove}, - {"create", "s:B:a:o:m:vh?", cbfs_create}, + {"create", "s:B:b:H:a:o:m:vh?", cbfs_create}, {"locate", "f:n:a:Tvh?", cbfs_locate}, {"print", "vh?", cbfs_print}, {"extract", "n:f:vh?", cbfs_extract}, @@ -579,6 +631,10 @@ int main(int argc, char **argv) break; case 'b': param.baseaddress = strtoul(optarg, NULL, 0); + // baseaddress may be zero on non-x86, so we + // need an explicit "baseaddress_assigned". + param.baseaddress = strtoul(optarg, NULL, 0); + param.baseaddress_assigned = 1; break; case 'l': param.loadaddress = strtoul(optarg, NULL, 0); @@ -598,6 +654,11 @@ int main(int argc, char **argv) case 'B': param.bootblock = optarg; break; + case 'H': + param.headeroffset = strtoul( + optarg, NULL, 0); + param.headeroffset_assigned = 1; + break; case 'a': param.alignment = strtoul(optarg, NULL, 0); break;

1 0

Patch set updated for coreboot: a107314 cbfstool: Use cbfs_image API for "remove" command.
by Stefan Reinauer 04 Feb '13

04 Feb '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2208 -gerrit commit a10731406c91a55d5d0e6dea43fe892164e72a7a Author: Hung-Te Lin <hungte(a)chromium.org> Date: Tue Jan 29 02:38:40 2013 +0800 cbfstool: Use cbfs_image API for "remove" command. To delete a component (file) from existing CBFS ROM image. To test: cbfstool coreboot.rom remove -n fallback/romstage # and compare with old cbfstool output result. Change-Id: If39ef9be0b34d8e3df77afb6c9f944e02f08bc4e Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> --- util/cbfstool/cbfs_image.c | 30 ++++++++++++++++++++++++++++++ util/cbfstool/cbfs_image.h | 3 +++ util/cbfstool/cbfstool.c | 18 ++++++++---------- 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 7d08b43..cc4460c 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -98,6 +98,13 @@ uint32_t get_cbfs_compression(const char *name, uint32_t unknown) { return lookup_type_by_name(types_cbfs_compression, name, unknown); } +/* CBFS image */ + +static int cbfs_calculate_file_header_size(const char *name) { + return (sizeof(struct cbfs_file) + + align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN)); +} + int cbfs_image_from_file(struct cbfs_image *image, const char *filename) { if (buffer_from_file(&image->buffer, filename) != 0) return -1; @@ -166,6 +173,29 @@ int cbfs_export_entry(struct cbfs_image *image, const char *entry_name, return 0; } +int cbfs_remove_entry(struct cbfs_image *image, const char *name) { + struct cbfs_file *entry, *next; + size_t len; + entry = cbfs_get_entry(image, name); + if (!entry) { + ERROR("CBFS file %s not found.\n", name); + return -1; + } + 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->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(CBFS_SUBHEADER(entry), CBFS_CONTENT_DEFAULT_VALUE, + ntohl(entry->len)); + return 0; +} + int cbfs_print_header_info(struct cbfs_image *image) { char *name = strdup(image->buffer.name); assert(image && image->header); diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 09051c3..73b262d 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -46,6 +46,9 @@ struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name); int cbfs_export_entry(struct cbfs_image *image, const char *entry_name, const char *filename); +/* Removes an entry from CBFS image. Returns 0 on success, otherwise non-zero. */ +int cbfs_remove_entry(struct cbfs_image *image, const char *name); + /* Callback function used by cbfs_walk. * Returns 0 on success, or non-zero to stop further iteration. */ typedef int (*cbfs_entry_callback)(struct cbfs_image *image, diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 9d22552..e653a33 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -312,33 +312,31 @@ static int cbfs_add_flat_binary(void) static int cbfs_remove(void) { - void *rom; + struct cbfs_image image; if (!param.name) { ERROR("You need to specify -n/--name.\n"); return 1; } - rom = loadrom(param.cbfs_name); - if (rom == NULL) { + if (cbfs_image_from_file(&image, param.cbfs_name) != 0) { ERROR("Could not load ROM image '%s'.\n", param.cbfs_name); return 1; } - if (remove_file_from_cbfs(param.name)) { + if (cbfs_remove_entry(&image, param.name) != 0) { ERROR("Removing file '%s' failed.\n", - param.name); - free(rom); + param.name); + cbfs_image_delete(&image); return 1; } - - if (writerom(param.cbfs_name, rom, romsize)) { - free(rom); + if (cbfs_image_write_file(&image, param.cbfs_name) != 0) { + cbfs_image_delete(&image); return 1; } - free(rom); + cbfs_image_delete(&image); return 0; }

1 0

Patch set updated for coreboot: 9e64ffd cbfstool: Add cbfs_image new CBFS image manipulation API.
by Stefan Reinauer 04 Feb '13

04 Feb '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2194 -gerrit commit 9e64ffdcdc818dbbf3894fed0e75c2b47ff4a93e Author: Hung-Te Lin <hungte(a)chromium.org> Date: Tue Jan 29 01:56:17 2013 +0800 cbfstool: Add cbfs_image new CBFS image manipulation API. Current cbfstool implementation is relying on global variables to pass processed data, and the calculation of address is based on x86 architecture (ex, always assuming 0x0000 as invalid address), not easy to be used on platforms without top-aligned memory mapping. This CL is a first step to start a new cbfstool without global variables, and to prevent assuming memory layout in x86 mode. The first published APIs are for reading and writing existing CBFS ROM image files (and to find file entries in a ROM file). Read cbfs_image.h for detail usage of each API function. Change-Id: I28c737c8f290e51332119188248ac9e28042024c Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> --- util/cbfstool/Makefile | 2 +- util/cbfstool/Makefile.inc | 1 + util/cbfstool/cbfs.h | 2 + util/cbfstool/cbfs_image.c | 128 +++++++++++++++++++++++++++++++++++++++++++++ util/cbfstool/cbfs_image.h | 65 +++++++++++++++++++++++ 5 files changed, 197 insertions(+), 1 deletion(-) diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index 17b00a7..3ace744 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -7,7 +7,7 @@ CFLAGS += -D_7ZIP_ST BINARY:=$(obj)/cbfstool -COMMON:=cbfstool.o common.o compress.o +COMMON:=cbfstool.o common.o cbfs_image.o compress.o COMMON+=cbfs-mkstage.o cbfs-mkpayload.o # LZMA COMMON+=lzma/lzma.o diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc index 5795507..2cee794 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.inc @@ -2,6 +2,7 @@ cbfsobj := cbfsobj += cbfstool.o cbfsobj += common.o cbfsobj += compress.o +cbfsobj += cbfs_image.o cbfsobj += cbfs-mkstage.o cbfsobj += cbfs-mkpayload.o # LZMA diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 3dbeefd..4a3ff94 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -42,6 +42,8 @@ struct cbfs_header { #define CBFS_ARCHITECTURE_X86 0x00000001 #define CBFS_ARCHITECTURE_ARMV7 0x00000010 +#define CBFS_FILE_MAGIC "LARCHIVE" + struct cbfs_file { uint8_t magic[8]; uint32_t len; diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c new file mode 100644 index 0000000..5754453 --- /dev/null +++ b/util/cbfstool/cbfs_image.c @@ -0,0 +1,128 @@ +/* + * CBFS Image Manipulation + * + * Copyright (C) 2013 The Chromium OS Authors. All rights reserved. + * + * 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 <stdio.h> +#include <stdlib.h> +#include <string.h> + +#include "common.h" +#include "cbfs_image.h" + +/* The file name align is not defined in CBFS spec -- only a preference by + * (old) cbfstool. */ +#define CBFS_FILENAME_ALIGN (16) + +/* To make CBFS more friendly to ROM, fill -1 (0xFF) instead of zero. */ +#define CBFS_CONTENT_DEFAULT_VALUE (-1) + +static uint32_t align_up(uint32_t value, uint32_t align) { + if (value % align) + value += align - (value % align); + return value; +} + +int cbfs_image_from_file(struct cbfs_image *image, const char *filename) { + if (buffer_from_file(&image->buffer, filename) != 0) + return -1; + DEBUG("read_cbfs_image: %s (%zd bytes)\n", image->buffer.name, + image->buffer.size); + image->header = cbfs_find_header(image->buffer.data, + image->buffer.size); + if (!image->header) { + ERROR("%s does not have CBFS master header.\n", filename); + cbfs_image_delete(image); + return -1; + } + + return 0; +} + +int cbfs_image_write_file(struct cbfs_image *image, const char *filename) { + assert(image && image->buffer.data); + return buffer_write_file(&image->buffer, filename); +} + +int cbfs_image_delete(struct cbfs_image *image) { + buffer_delete(&image->buffer); + image->header = NULL; + return 0; +} + +struct cbfs_header *cbfs_find_header(char *data, size_t size) { + size_t offset; + int found = 0; + uint32_t x86sig; + struct cbfs_header *header, *result = NULL; + + // Try x86 style (check signature in bottom) header first. + x86sig = *(uint32_t *)(data + size - sizeof(uint32_t)); + offset = (x86sig + (uint32_t)size); + DEBUG("x86sig: 0x%x, offset: 0x%zx\n", x86sig, offset); + if (offset >= size - sizeof(*header) || + ntohl(((struct cbfs_header *)(data + offset))->magic) != + CBFS_HEADER_MAGIC) + offset = 0; + + for (; offset + sizeof(*header) < size; offset++) { + header = (struct cbfs_header *)(data + offset); + if (ntohl(header->magic) !=(CBFS_HEADER_MAGIC)) + continue; + if (ntohl(header->version) != CBFS_HEADER_VERSION1 && + ntohl(header->version) != CBFS_HEADER_VERSION2) { + // Probably not a real CBFS header? + continue; + } + found++; + result = header; + } + if (found > 1) { + ERROR("multiple (%d) CBFS headers found!\n", + found); + result = NULL; + } + return result; +} + + +struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image) { + assert(image && image->header); + return (struct cbfs_file *)(image->buffer.data + + ntohl(image->header->offset)); +} + +struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image, + struct cbfs_file *entry) { + uint32_t addr = cbfs_get_entry_addr(image, entry); + int align = ntohl(image->header->align); + assert(entry && cbfs_is_valid_entry(entry)); + addr += ntohl(entry->offset) + ntohl(entry->len); + addr = align_up(addr, align); + return (struct cbfs_file *)(image->buffer.data + addr); +} + +uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry) { + assert(image && image->buffer.data && entry); + return (int32_t)((char *)entry - image->buffer.data); +} + +int cbfs_is_valid_entry(struct cbfs_file *entry) { + return (entry &&memcmp(entry->magic, CBFS_FILE_MAGIC, + sizeof(entry->magic)) == 0); +} + diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h new file mode 100644 index 0000000..9535c2d --- /dev/null +++ b/util/cbfstool/cbfs_image.h @@ -0,0 +1,65 @@ +/* + * CBFS Image Manipulation + * + * Copyright (C) 2013 The Chromium OS Authors. All rights reserved. + * + * 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_IMAGE_H +#define __CBFS_IMAGE_H +#include "common.h" +#include "cbfs.h" + +/* CBFS image processing */ + +struct cbfs_image { + struct buffer buffer; + struct cbfs_header *header; +}; + +/* Loads a CBFS image from file. Returns 0 on success, otherwise non-zero. */ +int cbfs_image_from_file(struct cbfs_image *image, const char *filename); + +/* Writes a CBFS image into file. Returns 0 on success, otherwise non-zero. */ +int cbfs_image_write_file(struct cbfs_image *image, const char *filename); + +/* Releases the CBFS image. Returns 0 on success, otherwise non-zero. */ +int cbfs_image_delete(struct cbfs_image *image); + +/* Primitive CBFS utilities */ + +/* Returns a pointer to the only valid CBFS header in give buffer, otherwise + * NULL (including when multiple headers were found). If there is a X86 ROM + * style signature (pointer at 0xfffffffc) found in ROM, it will be selected as + * the only header.*/ +struct cbfs_header *cbfs_find_header(char *data, size_t size); + +/* Returns the first cbfs_file entry in CBFS image by CBFS header (no matter if + * the entry has valid content or not), otherwise NULL. */ +struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image); + +/* Returns next cbfs_file entry (no matter if its content is valid or not), or + * NULL on failure. */ +struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image, + struct cbfs_file *entry); + +/* Returns ROM address (offset) of entry. + * This is different from entry->offset (pointer to content). */ +uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry); + +/* Returns 1 if entry has valid data (by checking magic number), otherwise 0. */ +int cbfs_is_valid_entry(struct cbfs_file *entry); + +#endif

1 0

Patch set updated for coreboot: cf0babc cbfstool: Fix incorrect CBFS free space by old cbfstool.
by Stefan Reinauer 04 Feb '13

04 Feb '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2211 -gerrit commit cf0babc23e90128ab8a63d076666865a55ed5425 Author: Hung-Te Lin <hungte(a)chromium.org> Date: Tue Jan 29 03:16:20 2013 +0800 cbfstool: Fix incorrect CBFS free space by old cbfstool. Old cbfstool may produce CBFS image with calculation error in size of last empty entry, and then corrupts master header data when you really use every bit in last entry. This fix will correct free space size when you load ROM images with cbfs_image_from_file. Change-Id: I2ada319728ef69ab9296ae446c77d37e05d05fce Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> --- util/cbfstool/cbfs_image.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index cc4460c..f8e2ae7 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -105,6 +105,31 @@ static int cbfs_calculate_file_header_size(const char *name) { align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN)); } +static int cbfs_fix_legacy_size(struct cbfs_image *image) { + // A bug in old cbfstool may produce extra few bytes (by alignment) and + // cause cbfstool to overwrite things after free space -- which is + // usually CBFS header on x86. We need to workaround that. + + struct cbfs_file *entry, *first = NULL, *last = NULL; + for (first = entry = cbfs_find_first_entry(image); + entry && cbfs_is_valid_entry(entry); + entry = cbfs_find_next_entry(image, entry)) { + last = entry; + } + if ((char *)first < (char *)image->header && + (char *)entry > (char *)image->header) { + WARN("CBFS image was created with old cbfstool with size bug. " + "Fixing size in last entry...\n"); + last->len = htonl(ntohl(last->len) - + ntohl(image->header->align)); + DEBUG("Last entry has been changed from 0x%x to 0x%x.\n", + cbfs_get_entry_addr(image, entry), + cbfs_get_entry_addr(image, + cbfs_find_next_entry(image, last))); + } + return 0; +} + int cbfs_image_from_file(struct cbfs_image *image, const char *filename) { if (buffer_from_file(&image->buffer, filename) != 0) return -1; @@ -117,6 +142,7 @@ int cbfs_image_from_file(struct cbfs_image *image, const char *filename) { cbfs_image_delete(image); return -1; } + cbfs_fix_legacy_size(image); return 0; }

1 0

← Newer
1
...
65
66
67
68
69
70
71
...
79
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot February 2013