From 6d720f38e06d14cc8a89635f66dc124dcd5ac150 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 8 Dec 2015 17:00:23 -0600 Subject: cbfs/vboot: remove firmware component support The Chrome OS verified boot path supported multiple CBFS instances in the boot media as well as stand-alone assets sitting in each vboot RW slot. Remove the support for the stand-alone assets and always use CBFS accesses as the way to retrieve data. This is implemented by adding a cbfs_locator object which is queried for locating the current CBFS. Additionally, it is also signalled prior to when a program is about to be loaded by coreboot for the subsequent stage/payload. This provides the same opportunity as previous for vboot to hook in and perform its logic. BUG=chromium:445938 BRANCH=None TEST=Built and ran on glados. CQ-DEPEND=CL:307121,CL:31691,CL:31690 Change-Id: I6a3a15feb6edd355d6ec252c36b6f7885b383099 Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/12689 Tested-by: build bot (Jenkins) Tested-by: Raptor Engineering Automated Test Stand Reviewed-by: Patrick Georgi Reviewed-by: Stefan Reinauer --- src/lib/Makefile.inc | 4 -- src/lib/cbfs.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++- src/lib/cbfs_boot_props.c | 60 ----------------------------- src/lib/prog_loaders.c | 14 +++++++ 4 files changed, 108 insertions(+), 66 deletions(-) delete mode 100644 src/lib/cbfs_boot_props.c (limited to 'src/lib') diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 59b1317438..0aada5373f 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -23,7 +23,6 @@ bootblock-y += assets.c bootblock-y += prog_loaders.c bootblock-y += prog_ops.c bootblock-y += cbfs.c -bootblock-y += cbfs_boot_props.c bootblock-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c bootblock-$(CONFIG_GENERIC_GPIO_LIB) += gpio.c bootblock-y += libgcc.c @@ -47,7 +46,6 @@ verstage-y += delay.c verstage-y += cbfs.c verstage-y += halt.c verstage-y += fmap.c -verstage-y += cbfs_boot_props.c verstage-y += libgcc.c verstage-y += memcmp.c verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c @@ -76,7 +74,6 @@ $(foreach arch,$(ARCH_SUPPORTED),\ romstage-y += fmap.c romstage-$(CONFIG_I2C_TPM) += delay.c romstage-y += cbfs.c -romstage-y += cbfs_boot_props.c romstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c romstage-$(CONFIG_COMPRESS_RAMSTAGE) += lzma.c lzmadecode.c romstage-y += libgcc.c @@ -117,7 +114,6 @@ ramstage-y += delay.c ramstage-y += fallback_boot.c ramstage-y += compute_ip_checksum.c ramstage-y += cbfs.c -ramstage-y += cbfs_boot_props.c ramstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c ramstage-y += lzma.c lzmadecode.c ramstage-y += stack.c diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index c782818ced..1d0869c950 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -37,8 +37,6 @@ int cbfs_boot_locate(struct cbfsf *fh, const char *name, uint32_t *type) const struct region_device *boot_dev; struct cbfs_props props; - boot_device_init(); - if (cbfs_boot_region_properties(&props)) return -1; @@ -255,3 +253,97 @@ out: return 0; } + +static int cbfs_master_header_props(struct cbfs_props *props) +{ + struct cbfs_header header; + const struct region_device *bdev; + int32_t rel_offset; + size_t offset; + + bdev = boot_device_ro(); + + if (bdev == NULL) + return -1; + + /* Find location of header using signed 32-bit offset from + * end of CBFS region. */ + offset = CONFIG_CBFS_SIZE - sizeof(int32_t); + if (rdev_readat(bdev, &rel_offset, offset, sizeof(int32_t)) < 0) + return -1; + + offset = CONFIG_CBFS_SIZE + rel_offset; + if (rdev_readat(bdev, &header, offset, sizeof(header)) < 0) + return -1; + + header.magic = ntohl(header.magic); + header.romsize = ntohl(header.romsize); + header.offset = ntohl(header.offset); + + if (header.magic != CBFS_HEADER_MAGIC) + return -1; + + props->offset = header.offset; + props->size = header.romsize; + props->size -= props->offset; + + printk(BIOS_SPEW, "CBFS @ %zx size %zx\n", props->offset, props->size); + + return 0; +} + +/* This struct is marked as weak to allow a particular platform to + * override the master header logic. This implementation should work for most + * devices. */ +const struct cbfs_locator __attribute__((weak)) cbfs_master_header_locator = { + .name = "Master Header Locator", + .locate = cbfs_master_header_props, +}; + +extern const struct cbfs_locator vboot_locator; + +static const struct cbfs_locator *locators[] = { +#if CONFIG_VBOOT_VERIFY_FIRMWARE + &vboot_locator, +#endif + &cbfs_master_header_locator, +}; + +int cbfs_boot_region_properties(struct cbfs_props *props) +{ + int i; + + boot_device_init(); + + for (i = 0; i < ARRAY_SIZE(locators); i++) { + const struct cbfs_locator *ops; + + ops = locators[i]; + + if (ops->locate == NULL) + continue; + + if (ops->locate(props)) + continue; + + LOG("'%s' located CBFS at [%zx:%zx)\n", + ops->name, props->offset, props->offset + props->size); + + return 0; + } + + return -1; +} + +void cbfs_prepare_program_locate(void) +{ + int i; + + boot_device_init(); + + for (i = 0; i < ARRAY_SIZE(locators); i++) { + if (locators[i]->prepare == NULL) + continue; + locators[i]->prepare(); + } +} diff --git a/src/lib/cbfs_boot_props.c b/src/lib/cbfs_boot_props.c deleted file mode 100644 index 7ff3726c4b..0000000000 --- a/src/lib/cbfs_boot_props.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 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. - */ - -#include -#include -#include -#include -#include - -/* This function is marked as weak to allow a particular platform to - * override the logic. This implementation should work for most devices. */ -int __attribute__((weak)) cbfs_boot_region_properties(struct cbfs_props *props) -{ - struct cbfs_header header; - const struct region_device *bdev; - int32_t rel_offset; - size_t offset; - - bdev = boot_device_ro(); - - if (bdev == NULL) - return -1; - - /* Find location of header using signed 32-bit offset from - * end of CBFS region. */ - offset = CONFIG_CBFS_SIZE - sizeof(int32_t); - if (rdev_readat(bdev, &rel_offset, offset, sizeof(int32_t)) < 0) - return -1; - - offset = CONFIG_CBFS_SIZE + rel_offset; - if (rdev_readat(bdev, &header, offset, sizeof(header)) < 0) - return -1; - - header.magic = ntohl(header.magic); - header.romsize = ntohl(header.romsize); - header.offset = ntohl(header.offset); - - if (header.magic != CBFS_HEADER_MAGIC) - return -1; - - props->offset = header.offset; - props->size = header.romsize; - props->size -= props->offset; - - printk(BIOS_SPEW, "CBFS @ %zx size %zx\n", props->offset, props->size); - - return 0; -} diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c index a5598c7003..e27eca1f3a 100644 --- a/src/lib/prog_loaders.c +++ b/src/lib/prog_loaders.c @@ -33,6 +33,20 @@ /* Only can represent up to 1 byte less than size_t. */ const struct mem_region_device addrspace_32bit = MEM_REGION_DEV_INIT(0, ~0UL); +int prog_locate(struct prog *prog) +{ + struct cbfsf file; + + cbfs_prepare_program_locate(); + + if (cbfs_boot_locate(&file, prog_name(prog), NULL)) + return -1; + + cbfs_file_data(prog_rdev(prog), &file); + + return 0; +} + void run_romstage(void) { struct prog romstage = -- cgit v1.2.3