coreboot-gerrit May 2015

coreboot-gerrit@coreboot.org

1 participants
1299 discussions

Patch merged into coreboot/master: 342535c Remove Kconfig variable that has no effect
by gerrit＠coreboot.org 19 May '15

19 May '15

the following patch was just integrated into master: commit 342535cc589d7cf16db230e41f26e456f3c3599a Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue May 19 21:24:15 2015 +0200 Remove Kconfig variable that has no effect MAINBOARD_HAS_BOOTBLOCK_INIT is only declared once and selected elsewhere (with no overlap), and never read. Remove it. Change-Id: Ica1f16182b556dbf4a3b747237af74bcc4c0608c Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Reviewed-on: http://review.coreboot.org/10254 Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> Tested-by: build bot (Jenkins) See http://review.coreboot.org/10254 for details. -gerrit

1 0

Patch merged into coreboot/master: a6225fa Remove Kconfig variable that has no effect
by gerrit＠coreboot.org 19 May '15

19 May '15

the following patch was just integrated into master: commit a6225fa0cfb54782ec4676343329f888128453a6 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue May 19 21:24:15 2015 +0200 Remove Kconfig variable that has no effect CPU_HAS_BOOTBLOCK_INIT is only declared once and selected elsewhere (with no overlap), and never read. Remove it. Change-Id: I3f294b0724a87876a7e2f274e6933fe10321a69d Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> Reviewed-on: http://review.coreboot.org/10253 Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> Tested-by: build bot (Jenkins) See http://review.coreboot.org/10253 for details. -gerrit

1 0

Patch set updated for coreboot: 37e8211 cbfs: simplify program loading
by Aaron Durbin 19 May '15

19 May '15

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10257 -gerrit commit 37e82118c64af554355922a4bd2b7d98043c7af9 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue May 19 08:37:23 2015 -0500 cbfs: simplify program loading By first removing struct cbfsf and using region_devices throughout program loading we can significantly decrease the complexity. This patch is mainly for review purposes as it can squashed into the new cbfs API patch. Change-Id: I13fcd0fa548375463eb06cbce0ec85ebd8e41d8f Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/arch/arm/armv7/bootblock_simple.c | 3 - src/device/oprom/realmode/x86.c | 7 +- src/include/cbfs.h | 44 +--- src/include/fallback.h | 2 +- src/include/memlayout.h | 2 - src/include/program_loading.h | 18 +- src/include/rmodule.h | 3 +- src/include/romstage_handoff.h | 10 - src/include/symbols.h | 1 - src/lib/Makefile.inc | 4 + src/lib/cbfs.c | 73 ++---- src/lib/cbfs_boot_props.c | 8 +- src/lib/hardwaremain.c | 2 - src/lib/loaders/Makefile.inc | 27 --- src/lib/loaders/cbfs_payload_loader.c | 42 ---- src/lib/loaders/cbfs_ramstage_loader.c | 55 ----- src/lib/loaders/cbfs_romstage_loader.c | 31 --- src/lib/loaders/load_and_run_payload.c | 118 ---------- src/lib/loaders/load_and_run_ramstage.c | 109 --------- src/lib/loaders/load_and_run_romstage.c | 85 ------- src/lib/prog_loaders.c | 244 +++++++++++++++++++++ src/lib/rmodule.c | 20 +- src/lib/selfboot.c | 15 +- src/soc/nvidia/tegra132/ccplex.c | 8 +- .../google/chromeos/vboot2/vboot_loader.c | 132 +++++------ 25 files changed, 372 insertions(+), 691 deletions(-) diff --git a/src/arch/arm/armv7/bootblock_simple.c b/src/arch/arm/armv7/bootblock_simple.c index ff15e24..b010693 100644 --- a/src/arch/arm/armv7/bootblock_simple.c +++ b/src/arch/arm/armv7/bootblock_simple.c @@ -22,7 +22,6 @@ #include <arch/exception.h> #include <arch/stages.h> #include <bootblock_common.h> -#include <cbfs.h> #include <console/console.h> #include <delay.h> #include <program_loading.h> @@ -46,8 +45,6 @@ void main(void) exception_init(); #endif - cbfs_set_header_offset(0); - bootblock_soc_init(); bootblock_mainboard_init(); diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c index 7f8c166..db22ccc 100644 --- a/src/device/oprom/realmode/x86.c +++ b/src/device/oprom/realmode/x86.c @@ -378,9 +378,6 @@ static u32 VSA_vrRead(u16 classIndex) void do_vsmbios(void) { - struct prog vsa = { - .name = "vsa", - }; printk(BIOS_DEBUG, "Preparing for VSA...\n"); /* Set up C interrupt handlers */ @@ -392,8 +389,8 @@ void do_vsmbios(void) /* Make sure the code is placed. */ setup_realmode_code(); - if (cbfs_boot_load_stage(&vsa) || - (uintptr_t)prog_entry(&vsa) != VSA2_ENTRY_POINT) { + if ((uintptr_t)cbfs_boot_load_stage_by_name("vsa") != + VSA2_ENTRY_POINT) { printk(BIOS_ERR, "Failed to load VSA.\n"); return; } diff --git a/src/include/cbfs.h b/src/include/cbfs.h index f914ffb..00c43f2 100644 --- a/src/include/cbfs.h +++ b/src/include/cbfs.h @@ -28,13 +28,10 @@ * CBFS operations consist of the following concepts: * - region_device for the boot media * - cbfsd which is a descriptor for representing a cbfs instance - * - cbfsf which is a file handle for manipulating cbfs files */ /* Descriptor for cbfs lookup operations. */ struct cbfsd; -/* File handle representing a cbfs file. */ -struct cbfsf; /*********************************************** * Perform CBFS operations on the boot device. * @@ -42,40 +39,24 @@ struct cbfsf; /* Return mapping of option rom found in boot device. NULL on error. */ void *cbfs_boot_map_optionrom(uint16_t vendor, uint16_t device); -/* Load stage into memory filling in prog. Return 0 on success. < 0 on error. */ -int cbfs_boot_load_stage(struct prog *prog); +/* Load stage by name into memory. Returns entry address on success. NULL on + * failure. */ +void *cbfs_boot_load_stage_by_name(const char *name); /* Locate file by name and optional type. Return 0 on success. < 0 on error. */ -int cbfs_boot_locate(struct cbfsf *fh, const char *name, uint32_t *type); +int cbfs_boot_locate(struct region_device *fh, const char *name, + uint32_t *type); /* Map file into memory leaking the mapping. Only should be used when * leaking mappings are a no-op. Returns NULL on error, else returns * the mapping and sets the size of the file. */ void *cbfs_boot_map_with_leak(const char *name, uint32_t type, size_t *size); -/************************************************* - * Perform CBFS operations on the provided file. * - *************************************************/ - -/* Map file into memory. Return NULL on error. */ -void *cbfs_file_mmap(const struct cbfsf *fh, size_t offset, size_t size); -/* Unmap previously mapped file. Returns 0 on success. < 0 on error. */ -int cbfs_file_munmap(const struct cbfsf *fh, void *mapping); -/* Read size bytes into b at offset in file. Returns the number of bytes - * read on success. Returns < 0 on error. */ -ssize_t cbfs_file_readat(const struct cbfsf *fh, void *b, size_t offset, - size_t size); /* Load stage into memory filling in prog. Return 0 on success. < 0 on error. */ -int cbfs_file_stage_load(const struct cbfsf *fh, struct prog *prog); - -/******************************************************* - * Perform CBFS operations on the provided descriptor. * - *******************************************************/ +int cbfs_prog_stage_load(struct prog *prog); /* Locate file by name and optional type. Returns 0 on succcess else < 0 on * error.*/ -int cbfs_locate(struct cbfsf *fh, const struct cbfsd *cbfs, const char *name, - uint32_t *type); -void cbfs_set_header_offset(size_t offset); -size_t cbfs_get_header_offset(void); +int cbfs_locate(struct region_device *fh, const struct cbfsd *cbfs, + const char *name, uint32_t *type); /***************************************************************** * Support structures and functions. Direct field access should * @@ -88,15 +69,6 @@ struct cbfsd { size_t align; }; -struct cbfsf { - struct region_device rdev; -}; - -static inline size_t cbfs_file_size(const struct cbfsf *fh) -{ - return region_sz(&fh->rdev.region); -} - /* The cbfs_props struct describes the properties associated with a CBFS. */ struct cbfs_props { /* Each file is aligned. */ diff --git a/src/include/fallback.h b/src/include/fallback.h index 7f3c823..740f130 100644 --- a/src/include/fallback.h +++ b/src/include/fallback.h @@ -1,7 +1,7 @@ #ifndef FALLBACK_H #define FALLBACK_H -#if !defined(__ASSEMBLER__) && !defined(__PRE_RAM__) +#if !defined(__ASSEMBLER__) void boot_successful(void); diff --git a/src/include/memlayout.h b/src/include/memlayout.h index 263dc5c..a80e03e 100644 --- a/src/include/memlayout.h +++ b/src/include/memlayout.h @@ -102,6 +102,4 @@ . += sz; #endif -#define CBFS_HEADER_OFFSET(addr) REGION(cbfs_header_offset, addr, 4, 4) - #endif /* __MEMLAYOUT_H */ diff --git a/src/include/program_loading.h b/src/include/program_loading.h index 5fc0fd6..cf3900d 100644 --- a/src/include/program_loading.h +++ b/src/include/program_loading.h @@ -22,6 +22,7 @@ #include <stdint.h> #include <stddef.h> +#include <region.h> enum { /* Last segment of program. Can be used to take different actions for @@ -49,10 +50,13 @@ enum prog_type { struct prog { enum prog_type type; const char *name; + /* Source of program content to load. */ + struct region_device rdev; /* The area can mean different things depending on what type the - * program is. e.g. a payload prog uses this field for the backing - * store of the payload_segments and data. After loading the segments - * area is updated to reflect the bounce buffer used. */ + * program is. A stage after being loaded reflects the memory occupied + * by the program, Since payloads are multi-segment one can't express + * the memory layout with one range. Instead this field is updated + * to reflect the bounce buffer used. */ struct buffer_area area; /* Entry to program with optional argument. It's up to the architecture * to decide if argument is passed. */ @@ -107,10 +111,10 @@ struct prog_loader_ops { /* Determine if the loader is the active one. If so returns 1 else 0 * or < 0 on error. */ int (*is_loader_active)(struct prog *prog); - /* Returns < 0 on error or 0 on success. This function needs to do - * different things depending on the prog type. See definition - * of struct prog above. */ - int (*prepare)(struct prog *prog); + /* Returns < 0 on error or 0 on success. This function locates + * the rdev representing the file data associated with the passed in + * prog. */ + int (*locate)(struct prog *prog); }; /************************ diff --git a/src/include/rmodule.h b/src/include/rmodule.h index 5dc795c..0c41212 100644 --- a/src/include/rmodule.h +++ b/src/include/rmodule.h @@ -54,7 +54,6 @@ int rmodule_calc_region(unsigned int region_alignment, size_t rmodule_size, /* Support for loading rmodule stages. This API is only available when * using dynamic cbmem because it uses the dynamic cbmem API to obtain * the backing store region for the stage. */ -struct cbfsf; struct prog; struct rmod_stage_load { @@ -63,7 +62,7 @@ struct rmod_stage_load { }; /* Both of the following functions return 0 on success, -1 on error. */ -int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfsf *fh); +int rmodule_stage_load(struct rmod_stage_load *rsl); int rmodule_stage_load_from_cbfs(struct rmod_stage_load *rsl); struct rmodule { diff --git a/src/include/romstage_handoff.h b/src/include/romstage_handoff.h index 09934ca..b78bec3 100644 --- a/src/include/romstage_handoff.h +++ b/src/include/romstage_handoff.h @@ -38,8 +38,6 @@ struct romstage_handoff { uint8_t reserved[2]; }; -#if defined(__ROMSTAGE__) -#if CONFIG_EARLY_CBMEM_INIT /* The romstage_handoff_find_or_add() function provides the necessary logic * for initializing the romstage_handoff structure in cbmem. Different components * of the romstage may be responsible for setting up different fields. Therefore @@ -62,14 +60,6 @@ static inline struct romstage_handoff *romstage_handoff_find_or_add(void) return handoff; } -#else /* CONFIG_EARLY_CBMEM_INIT */ -static inline struct romstage_handoff *romstage_handoff_find_or_add(void) -{ - return NULL; -} -#endif /* CONFIG_EARLY_CBMEM_INIT */ - -#endif /* defined(__PRE_RAM__) */ #endif /* ROMSTAGE_HANDOFF_H */ diff --git a/src/include/symbols.h b/src/include/symbols.h index 279c5a2..c3ced87 100644 --- a/src/include/symbols.h +++ b/src/include/symbols.h @@ -27,7 +27,6 @@ extern u8 _esram[]; #define _sram_size (_esram - _sram) extern u8 _dram[]; -extern u32 _cbfs_header_offset[]; extern u8 _preram_cbmem_console[]; extern u8 _epreram_cbmem_console[]; diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 1160b28..2416736 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -18,6 +18,7 @@ # subdirs-y += loaders +bootblock-y += prog_loaders.c bootblock-y += prog_ops.c bootblock-y += cbfs.c bootblock-y += cbfs_boot_props.c @@ -35,6 +36,7 @@ bootblock-y += region.c bootblock-y += boot_device.c bootblock-y += fmap.c +verstage-y += prog_loaders.c verstage-y += prog_ops.c verstage-y += delay.c verstage-y += cbfs.c @@ -58,6 +60,7 @@ verstage-$(CONFIG_GENERIC_UDELAY) += timer.c verstage-$(CONFIG_GENERIC_GPIO_LIB) += gpio.c verstage-y += mem_pool.c +romstage-y += prog_loaders.c romstage-y += prog_ops.c romstage-y += memchr.c romstage-y += memcmp.c @@ -89,6 +92,7 @@ endif romstage-$(CONFIG_GENERIC_UDELAY) += timer.c +ramstage-y += prog_loaders.c ramstage-y += prog_ops.c ramstage-y += hardwaremain.c ramstage-y += selfboot.c diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index fb012d1..23dfee7 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -35,22 +35,7 @@ #define DEBUG(x...) #endif -void cbfs_set_header_offset(size_t offset) -{ - if (IS_ENABLED(CONFIG_MULTIPLE_CBFS_INSTANCES)) { - _cbfs_header_offset[0] = offset; - LOG("header set to: %#zx\n", offset); - } -} - -size_t cbfs_get_header_offset(void) -{ - if (IS_ENABLED(CONFIG_MULTIPLE_CBFS_INSTANCES)) - return _cbfs_header_offset[0]; - return 0; -} - -int cbfs_boot_locate(struct cbfsf *fh, const char *name, uint32_t *type) +int cbfs_boot_locate(struct region_device *fh, const char *name, uint32_t *type) { struct cbfsd cbfs; struct region_device rdev; @@ -79,38 +64,22 @@ int cbfs_boot_locate(struct cbfsf *fh, const char *name, uint32_t *type) void *cbfs_boot_map_with_leak(const char *name, uint32_t type, size_t *size) { - struct cbfsf fh; + struct region_device fh; size_t fsize; if (cbfs_boot_locate(&fh, name, &type)) return NULL; - fsize = cbfs_file_size(&fh); + fsize = region_device_sz(&fh); if (size != NULL) *size = fsize; - return cbfs_file_mmap(&fh, 0, fsize); -} - -void *cbfs_file_mmap(const struct cbfsf *fh, size_t offset, size_t size) -{ - return rdev_mmap(&fh->rdev, offset, size); + return rdev_mmap(&fh, 0, fsize); } -int cbfs_file_munmap(const struct cbfsf *fh, void *mapping) -{ - return rdev_munmap(&fh->rdev, mapping); -} - -ssize_t cbfs_file_readat(const struct cbfsf *fh, void *b, size_t offset, - size_t size) -{ - return rdev_readat(&fh->rdev, b, offset, size); -} - -int cbfs_locate(struct cbfsf *fh, const struct cbfsd *cbfs, const char *name, - uint32_t *type) +int cbfs_locate(struct region_device *fh, const struct cbfsd *cbfs, + const char *name, uint32_t *type) { size_t offset; const struct region_device *rd; @@ -174,7 +143,7 @@ int cbfs_locate(struct cbfsf *fh, const struct cbfsd *cbfs, const char *name, * represent the cbfs file. */ offset += file.offset; datasz = file.len; - if (rdev_chain(&fh->rdev, rd, offset, datasz)) + if (rdev_chain(fh, rd, offset, datasz)) break; /* Success. */ @@ -217,29 +186,35 @@ void *cbfs_boot_map_optionrom(uint16_t vendor, uint16_t device) return cbfs_boot_map_with_leak(name, CBFS_TYPE_OPTIONROM, NULL); } -int cbfs_boot_load_stage(struct prog *stage) +void *cbfs_boot_load_stage_by_name(const char *name) { - struct cbfsf fh; + struct prog stage = { + .name = name, + }; uint32_t type = CBFS_TYPE_STAGE; - if (cbfs_boot_locate(&fh, stage->name, &type)) - return -1; + if (cbfs_boot_locate(&stage.rdev, name, &type)) + return NULL; + + if (cbfs_prog_stage_load(&stage)) + return NULL; - return cbfs_file_stage_load(&fh, stage); + return prog_entry(&stage); } -int cbfs_file_stage_load(const struct cbfsf *fh, struct prog *pstage) +int cbfs_prog_stage_load(struct prog *pstage) { struct cbfs_stage stage; uint8_t *load; void *entry; size_t fsize; size_t foffset; + const struct region_device *fh = &pstage->rdev; - if (cbfs_file_readat(fh, &stage, 0, sizeof(stage)) != sizeof(stage)) + if (rdev_readat(fh, &stage, 0, sizeof(stage)) != sizeof(stage)) return 0; - fsize = cbfs_file_size(fh); + fsize = region_device_sz(fh); fsize -= sizeof(stage); foffset = 0; foffset += sizeof(stage); @@ -252,17 +227,17 @@ int cbfs_file_stage_load(const struct cbfsf *fh, struct prog *pstage) entry = (void *)(uintptr_t)stage.entry; if (stage.compression == CBFS_COMPRESS_NONE) { - if (cbfs_file_readat(fh, load, foffset, fsize) != fsize) + if (rdev_readat(fh, load, foffset, fsize) != fsize) return -1; } else if (stage.compression == CBFS_COMPRESS_LZMA) { - void *map = cbfs_file_mmap(fh, foffset, fsize); + void *map = rdev_mmap(fh, foffset, fsize); if (map == NULL) return -1; fsize = inflate(map, load); - cbfs_file_munmap(fh, map); + rdev_munmap(fh, map); if (!fsize) return -1; diff --git a/src/lib/cbfs_boot_props.c b/src/lib/cbfs_boot_props.c index 7e7bb8a..21e64d3 100644 --- a/src/lib/cbfs_boot_props.c +++ b/src/lib/cbfs_boot_props.c @@ -31,23 +31,19 @@ int __attribute__((weak)) cbfs_boot_region_properties(struct cbfs_props *props) const struct region_device *bdev; int32_t rel_offset; size_t offset; - size_t base_offset; bdev = boot_device_ro(); if (bdev == NULL) return -1; - base_offset = cbfs_get_header_offset(); - base_offset += CONFIG_CBFS_SIZE; - /* Find location of header using signed 32-bit offset from * end of CBFS region. */ - offset = base_offset - sizeof(int32_t); + offset = CONFIG_CBFS_SIZE - sizeof(int32_t); if (rdev_readat(bdev, &rel_offset, offset, sizeof(int32_t)) < 0) return -1; - offset = base_offset + rel_offset; + offset = CONFIG_CBFS_SIZE + rel_offset; if (rdev_readat(bdev, &header, offset, sizeof(header)) < 0) return -1; diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c index 295edcd..274a9c7 100644 --- a/src/lib/hardwaremain.c +++ b/src/lib/hardwaremain.c @@ -228,8 +228,6 @@ static boot_state_t bs_write_tables(void *arg) static boot_state_t bs_payload_load(void *arg) { - timestamp_add_now(TS_LOAD_PAYLOAD); - payload_load(); return BS_PAYLOAD_BOOT; diff --git a/src/lib/loaders/Makefile.inc b/src/lib/loaders/Makefile.inc deleted file mode 100644 index 9dca06b..0000000 --- a/src/lib/loaders/Makefile.inc +++ /dev/null @@ -1,27 +0,0 @@ -# -# This file is part of the coreboot project. -# -# Copyright (C) 2014 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 -# - -bootblock-y += load_and_run_romstage.c -bootblock-y += cbfs_romstage_loader.c -romstage-y += cbfs_ramstage_loader.c -romstage-y += load_and_run_ramstage.c -ramstage-y += cbfs_payload_loader.c -ramstage-y += load_and_run_payload.c -verstage-y += cbfs_romstage_loader.c -verstage-y += load_and_run_romstage.c diff --git a/src/lib/loaders/cbfs_payload_loader.c b/src/lib/loaders/cbfs_payload_loader.c deleted file mode 100644 index fffb558..0000000 --- a/src/lib/loaders/cbfs_payload_loader.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 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 - */ - -#include <cbfs.h> -#include <program_loading.h> - -static int cbfs_locate_payload(struct prog *payload) -{ - void *buffer; - size_t size; - const uint32_t type = CBFS_TYPE_PAYLOAD; - - buffer = cbfs_boot_map_with_leak(payload->name, type, &size); - - if (buffer == NULL) - return -1; - - prog_set_area(payload, buffer, size); - - return 0; -} - -const struct prog_loader_ops cbfs_payload_loader = { - .name = "CBFS", - .prepare = cbfs_locate_payload, -}; diff --git a/src/lib/loaders/cbfs_ramstage_loader.c b/src/lib/loaders/cbfs_ramstage_loader.c deleted file mode 100644 index bbbf695..0000000 --- a/src/lib/loaders/cbfs_ramstage_loader.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2008-2009 coresystems GmbH - * Copyright (C) 2014 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 - */ -#include <console/console.h> -#include <cbfs.h> -#include <program_loading.h> - -#if CONFIG_RELOCATABLE_RAMSTAGE -#include <rmodule.h> -#include <cbmem.h> - -static int cbfs_load_ramstage(struct prog *ramstage) -{ - struct rmod_stage_load rmod_ram = { - .cbmem_id = CBMEM_ID_RAMSTAGE, - .prog = ramstage, - }; - - if (rmodule_stage_load_from_cbfs(&rmod_ram)) { - printk(BIOS_DEBUG, "Could not load ramstage.\n"); - return -1; - } - - return 0; -} - -#else /* CONFIG_RELOCATABLE_RAMSTAGE */ - -static int cbfs_load_ramstage(struct prog *ramstage) -{ - return cbfs_boot_load_stage(ramstage); -} - -#endif /* CONFIG_RELOCATABLE_RAMSTAGE */ - -const struct prog_loader_ops cbfs_ramstage_loader = { - .name = "CBFS", - .prepare = cbfs_load_ramstage, -}; diff --git a/src/lib/loaders/cbfs_romstage_loader.c b/src/lib/loaders/cbfs_romstage_loader.c deleted file mode 100644 index 7dde2ec..0000000 --- a/src/lib/loaders/cbfs_romstage_loader.c +++ /dev/null @@ -1,31 +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. - * - * 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. - */ - -#include <cbfs.h> -#include <program_loading.h> - -static int cbfs_load_romstage(struct prog *romstage) -{ - return cbfs_boot_load_stage(romstage); -} - -const struct prog_loader_ops cbfs_romstage_loader = { - .name = "CBFS", - .prepare = cbfs_load_romstage, -}; diff --git a/src/lib/loaders/load_and_run_payload.c b/src/lib/loaders/load_and_run_payload.c deleted file mode 100644 index 4928e0c..0000000 --- a/src/lib/loaders/load_and_run_payload.c +++ /dev/null @@ -1,118 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 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 - */ - -#include <stdint.h> -#include <stdlib.h> -#include <cbmem.h> -#include <console/console.h> -#include <fallback.h> -#include <lib.h> -#include <program_loading.h> -#include <symbols.h> -#include <timestamp.h> - -extern const struct prog_loader_ops vboot_loader; -extern const struct prog_loader_ops cbfs_payload_loader; - -static const struct prog_loader_ops *payload_ops[] = { -#if CONFIG_VBOOT_VERIFY_FIRMWARE - &vboot_loader, -#endif - &cbfs_payload_loader, -}; - -static struct prog global_payload = { - .name = CONFIG_CBFS_PREFIX "/payload", - .type = PROG_PAYLOAD, -}; - -void __attribute__((weak)) mirror_payload(struct prog *payload) -{ - return; -} - -void payload_load(void) -{ - int i; - const struct prog_loader_ops *ops; - struct prog *payload = &global_payload; - - for (i = 0; i < ARRAY_SIZE(payload_ops); i++) { - /* Default loader state is active. */ - int ret = 1; - - ops = payload_ops[i]; - - if (ops->is_loader_active != NULL) - ret = ops->is_loader_active(payload); - - if (ret == 0) { - printk(BIOS_DEBUG, "%s payload loader inactive.\n", - ops->name); - continue; - } else if (ret < 0) { - printk(BIOS_DEBUG, "%s payload loader failure.\n", - ops->name); - continue; - } - - if (ops->prepare(payload) < 0) { - printk(BIOS_DEBUG, "%s: could not locate payload.\n", - ops->name); - continue; - } - printk(BIOS_DEBUG, "%s: located payload @ %p, %zu bytes.\n", - ops->name, prog_start(payload), prog_size(payload)); - break; - } - - if (i == ARRAY_SIZE(payload_ops)) - goto out; - - mirror_payload(payload); - - /* Pass cbtables to payload if architecture desires it. */ - prog_set_entry(payload, selfload(payload), - cbmem_find(CBMEM_ID_CBTABLE)); - -out: - if (prog_entry(payload) == NULL) - die("Payload not loaded.\n"); -} - -void payload_run(void) -{ - struct prog *payload = &global_payload; - - /* Reset to booting from this image as late as possible */ - boot_successful(); - - printk(BIOS_DEBUG, "Jumping to boot code at %p(%p)\n", - prog_entry(payload), prog_entry_arg(payload)); - post_code(POST_ENTER_ELF_BOOT); - - timestamp_add_now(TS_SELFBOOT_JUMP); - - /* Before we go off to run the payload, see if - * we stayed within our bounds. - */ - checkstack(_estack, 0); - - prog_run(payload); -} diff --git a/src/lib/loaders/load_and_run_ramstage.c b/src/lib/loaders/load_and_run_ramstage.c deleted file mode 100644 index 504dbff..0000000 --- a/src/lib/loaders/load_and_run_ramstage.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 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 - */ - -#include <stdlib.h> -#include <console/console.h> -#include <arch/stages.h> -#include <cbfs.h> -#include <program_loading.h> -#include <romstage_handoff.h> -#include <stage_cache.h> -#include <timestamp.h> - -extern const struct prog_loader_ops cbfs_ramstage_loader; -extern const struct prog_loader_ops vboot_loader; - -static const struct prog_loader_ops *loaders[] = { -#if CONFIG_VBOOT_VERIFY_FIRMWARE - &vboot_loader, -#endif - &cbfs_ramstage_loader, -}; - -void __attribute__((weak)) stage_cache_add(int stage_id, struct prog *stage) {} -void __attribute__((weak)) stage_cache_load_stage(int stage_id, - struct prog *stage) {} -void __attribute__((weak)) ramstage_cache_invalid(void) {} - -static void load_ramstage(const struct prog_loader_ops *ops, - struct prog *ramstage) -{ - timestamp_add_now(TS_START_COPYRAM); - - if (ops->prepare(ramstage)) - return; - - stage_cache_add(STAGE_RAMSTAGE, ramstage); - - timestamp_add_now(TS_END_COPYRAM); - - prog_run(ramstage); -} - -static void run_ramstage_from_resume(struct romstage_handoff *handoff, - struct prog *ramstage) -{ - if (handoff != NULL && handoff->s3_resume) { - /* Load the cached ramstage to runtime location. */ - stage_cache_load_stage(STAGE_RAMSTAGE, ramstage); - - if (prog_entry(ramstage) != NULL) { - printk(BIOS_DEBUG, "Jumping to image.\n"); - prog_run(ramstage); - } - ramstage_cache_invalid(); - } -} - -void run_ramstage(void) -{ - const struct prog_loader_ops *ops; - int i; - struct prog ramstage = { - .name = CONFIG_CBFS_PREFIX "/ramstage", - .type = PROG_RAMSTAGE, - }; - - run_ramstage_from_resume(romstage_handoff_find_or_add(), &ramstage); - - for (i = 0; i < ARRAY_SIZE(loaders); i++) { - /* Default loader state is active. */ - int ret = 1; - - ops = loaders[i]; - - if (ops->is_loader_active != NULL) - ret = ops->is_loader_active(&ramstage); - - if (ret == 0) { - printk(BIOS_DEBUG, "%s ramstage loader inactive.\n", - ops->name); - continue; - } else if (ret < 0) { - printk(BIOS_DEBUG, "%s ramstage loader failure.\n", - ops->name); - continue; - } - - printk(BIOS_DEBUG, "%s ramstage loader active.\n", ops->name); - load_ramstage(ops, &ramstage); - } - - die("Ramstage was not loaded!\n"); -} diff --git a/src/lib/loaders/load_and_run_romstage.c b/src/lib/loaders/load_and_run_romstage.c deleted file mode 100644 index b54c691..0000000 --- a/src/lib/loaders/load_and_run_romstage.c +++ /dev/null @@ -1,85 +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. - * - * 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 <stdlib.h> -#include <console/console.h> -#include <arch/stages.h> -#include <cbfs.h> -#include <halt.h> -#include <program_loading.h> -#include <rules.h> -#include <timestamp.h> - -extern const struct prog_loader_ops cbfs_romstage_loader; -extern const struct prog_loader_ops vboot_loader; - -static const struct prog_loader_ops *loaders[] = { -#if CONFIG_VBOOT_VERIFY_FIRMWARE - &vboot_loader, -#endif -#if !ENV_VERSTAGE || (ENV_VERSTAGE && !CONFIG_RETURN_FROM_VERSTAGE) - &cbfs_romstage_loader, -#endif -}; - -void run_romstage(void) -{ - int i; - struct prog romstage = { - .name = CONFIG_CBFS_PREFIX "/romstage", - .type = PROG_ROMSTAGE, - }; - - for (i = 0; i < ARRAY_SIZE(loaders); i++) { - /* Default loader state is active. */ - int ret = 1; - const struct prog_loader_ops *ops; - - ops = loaders[i]; - - if (ops->is_loader_active != NULL) - ret = ops->is_loader_active(&romstage); - - if (ret == 0) { - printk(BIOS_DEBUG, "%s romstage loader inactive.\n", - ops->name); - continue; - } else if (ret < 0) { - printk(BIOS_DEBUG, "%s romstage loader failure.\n", - ops->name); - continue; - } - - printk(BIOS_DEBUG, "%s romstage loader active.\n", ops->name); - - timestamp_add_now(TS_START_COPYROM); - - if (ops->prepare(&romstage)) - continue; - - timestamp_add_now(TS_END_COPYROM); - - prog_run(&romstage); - } - - if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) - die("Couldn't load romstage.\n"); - halt(); -} diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c new file mode 100644 index 0000000..299c305 --- /dev/null +++ b/src/lib/prog_loaders.c @@ -0,0 +1,244 @@ +/* + * 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. + * + * 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. + */ + + +#include <stdlib.h> +#include <console/console.h> +#include <arch/stages.h> +#include <cbfs.h> +#include <cbmem.h> +#include <fallback.h> +#include <halt.h> +#include <lib.h> +#include <program_loading.h> +#include <romstage_handoff.h> +#include <rmodule.h> +#include <rules.h> +#include <stage_cache.h> +#include <symbols.h> +#include <timestamp.h> + +#define DEFAULT_CBFS_LOADER_PRESENT \ + (!ENV_VERSTAGE || (ENV_VERSTAGE && !CONFIG_RETURN_FROM_VERSTAGE)) + +#if DEFAULT_CBFS_LOADER_PRESENT +static int cbfs_boot_prog_locate(struct prog *prog) +{ + return cbfs_boot_locate(&prog->rdev, prog->name, NULL); +} + +static const struct prog_loader_ops cbfs_default_loader = { + .locate = cbfs_boot_prog_locate, +}; +#endif + +extern const struct prog_loader_ops vboot_loader; + +static const struct prog_loader_ops *loaders[] = { +#if CONFIG_VBOOT_VERIFY_FIRMWARE + &vboot_loader, +#endif +#if DEFAULT_CBFS_LOADER_PRESENT + &cbfs_default_loader, +#endif +}; + +static int prog_locate(struct prog *prog) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(loaders); i++) { + /* Default loader state is active. */ + int ret = 1; + const struct prog_loader_ops *ops; + + ops = loaders[i]; + + if (ops->is_loader_active != NULL) + ret = ops->is_loader_active(prog); + + if (ret == 0) { + printk(BIOS_DEBUG, "%s loader inactive.\n", + ops->name); + continue; + } else if (ret < 0) { + printk(BIOS_DEBUG, "%s loader failure.\n", + ops->name); + continue; + } + + printk(BIOS_DEBUG, "%s loader active.\n", ops->name); + + if (ops->locate(prog)) + continue; + + printk(BIOS_DEBUG, "'%s' located at offset: %zx size: %zx\n", + prog->name, region_device_offset(&prog->rdev), + region_device_sz(&prog->rdev)); + + return 0; + } + + return -1; +} + +void run_romstage(void) +{ + struct prog romstage = { + .name = CONFIG_CBFS_PREFIX "/romstage", + .type = PROG_ROMSTAGE, + }; + + /* The only time the default CBFS loader isn't present is during + * VERSTAGE in which it returns back to the calling stage. */ + if (!DEFAULT_CBFS_LOADER_PRESENT) + return; + + if (prog_locate(&romstage)) + goto fail; + + timestamp_add_now(TS_START_COPYROM); + + if (cbfs_prog_stage_load(&romstage)) + goto fail; + + timestamp_add_now(TS_END_COPYROM); + + prog_run(&romstage); + +fail: + if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) + die("Couldn't load romstage.\n"); + halt(); +} + +void __attribute__((weak)) stage_cache_add(int stage_id, struct prog *stage) {} +void __attribute__((weak)) stage_cache_load_stage(int stage_id, + struct prog *stage) {} +void __attribute__((weak)) ramstage_cache_invalid(void) {} + +static void run_ramstage_from_resume(struct romstage_handoff *handoff, + struct prog *ramstage) +{ + if (handoff != NULL && handoff->s3_resume) { + /* Load the cached ramstage to runtime location. */ + stage_cache_load_stage(STAGE_RAMSTAGE, ramstage); + + if (prog_entry(ramstage) != NULL) { + printk(BIOS_DEBUG, "Jumping to image.\n"); + prog_run(ramstage); + } + ramstage_cache_invalid(); + } +} + +static int load_relocatable_ramstage(struct prog *ramstage) +{ + struct rmod_stage_load rmod_ram = { + .cbmem_id = CBMEM_ID_RAMSTAGE, + .prog = ramstage, + }; + + return rmodule_stage_load(&rmod_ram); +} + +void run_ramstage(void) +{ + struct prog ramstage = { + .name = CONFIG_CBFS_PREFIX "/ramstage", + .type = PROG_RAMSTAGE, + }; + + /* Only x86 systems currently take the same firmware path on resume. */ + if (IS_ENABLED(CONFIG_ARCH_X86) && IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)) + run_ramstage_from_resume(romstage_handoff_find_or_add(), + &ramstage); + + if (prog_locate(&ramstage)) + goto fail; + + timestamp_add_now(TS_START_COPYRAM); + + if (IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE) && + load_relocatable_ramstage(&ramstage)) + goto fail; + else if (cbfs_prog_stage_load(&ramstage)) + goto fail; + + stage_cache_add(STAGE_RAMSTAGE, &ramstage); + + timestamp_add_now(TS_END_COPYRAM); + + prog_run(&ramstage); + +fail: + die("Ramstage was not loaded!\n"); +} + +static struct prog global_payload = { + .name = CONFIG_CBFS_PREFIX "/payload", + .type = PROG_PAYLOAD, +}; + +void __attribute__((weak)) mirror_payload(struct prog *payload) +{ + return; +} + +void payload_load(void) +{ + struct prog *payload = &global_payload; + + timestamp_add_now(TS_LOAD_PAYLOAD); + + if (prog_locate(payload)) + goto out; + + mirror_payload(payload); + + /* Pass cbtables to payload if architecture desires it. */ + prog_set_entry(payload, selfload(payload), + cbmem_find(CBMEM_ID_CBTABLE)); + +out: + if (prog_entry(payload) == NULL) + die("Payload not loaded.\n"); +} + +void payload_run(void) +{ + struct prog *payload = &global_payload; + + /* Reset to booting from this image as late as possible */ + boot_successful(); + + printk(BIOS_DEBUG, "Jumping to boot code at %p(%p)\n", + prog_entry(payload), prog_entry_arg(payload)); + + post_code(POST_ENTER_ELF_BOOT); + + timestamp_add_now(TS_SELFBOOT_JUMP); + + /* Before we go off to run the payload, see if + * we stayed within our bounds. + */ + checkstack(_estack, 0); + + prog_run(payload); +} diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c index d886800..d3418f4 100644 --- a/src/lib/rmodule.c +++ b/src/lib/rmodule.c @@ -253,7 +253,7 @@ int rmodule_calc_region(unsigned int region_alignment, size_t rmodule_size, return region_alignment - sizeof(struct rmodule_header); } -int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfsf *fh) +int rmodule_stage_load(struct rmod_stage_load *rsl) { struct rmodule rmod_stage; size_t region_size; @@ -262,11 +262,14 @@ int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfsf *fh) int load_offset; struct cbfs_stage stage; void *rmod_loc; + struct region_device *fh; - if (fh == NULL || rsl->prog == NULL || rsl->prog->name == NULL) + if (rsl->prog == NULL || rsl->prog->name == NULL) return -1; - if (cbfs_file_readat(fh, &stage, 0, sizeof(stage)) != sizeof(stage)) + fh = &rsl->prog->rdev; + + if (rdev_readat(fh, &stage, 0, sizeof(stage)) != sizeof(stage)) return -1; rmodule_offset = @@ -284,19 +287,19 @@ int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfsf *fh) rsl->prog->name, rmod_loc, stage.memlen); if (stage.compression == CBFS_COMPRESS_NONE) { - if (cbfs_file_readat(fh, rmod_loc, sizeof(stage), stage.len) != + if (rdev_readat(fh, rmod_loc, sizeof(stage), stage.len) != stage.len) return -1; } else if (stage.compression == CBFS_COMPRESS_LZMA) { size_t fsize; - void *map = cbfs_file_mmap(fh, sizeof(stage), stage.len); + void *map = rdev_mmap(fh, sizeof(stage), stage.len); if (map == NULL) return -1; fsize = ulzma(map, rmod_loc); - cbfs_file_munmap(fh, map); + rdev_munmap(fh, map); if (!fsize) return -1; @@ -318,11 +321,10 @@ int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfsf *fh) int rmodule_stage_load_from_cbfs(struct rmod_stage_load *rsl) { - struct cbfsf fh; uint32_t type = CBFS_TYPE_STAGE; - if (cbfs_boot_locate(&fh, rsl->prog->name, &type)) + if (cbfs_boot_locate(&rsl->prog->rdev, rsl->prog->name, &type)) return -1; - return rmodule_stage_load(rsl, &fh); + return rmodule_stage_load(rsl); } diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index edf36e7..6b4b0af 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -211,13 +211,11 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) static int build_self_segment_list( struct segment *head, - struct prog *payload, uintptr_t *entry) + struct cbfs_payload *cbfs_payload, uintptr_t *entry) { struct segment *new; struct segment *ptr; struct cbfs_payload_segment *segment, *first_segment; - struct cbfs_payload *cbfs_payload; - cbfs_payload = prog_start(payload); memset(head, 0, sizeof(*head)); head->next = head->prev = head; first_segment = segment = &cbfs_payload->segments; @@ -457,9 +455,15 @@ void *selfload(struct prog *payload) { uintptr_t entry = 0; struct segment head; + void *data; + + data = rdev_mmap_full(&payload->rdev); + + if (data == NULL) + return NULL; /* Preprocess the self segments */ - if (!build_self_segment_list(&head, payload, &entry)) + if (!build_self_segment_list(&head, data, &entry)) goto out; /* Load the segments */ @@ -468,8 +472,11 @@ void *selfload(struct prog *payload) printk(BIOS_SPEW, "Loaded segments\n"); + rdev_munmap(&payload->rdev, data); + return (void *)entry; out: + rdev_munmap(&payload->rdev, data); return NULL; } diff --git a/src/soc/nvidia/tegra132/ccplex.c b/src/soc/nvidia/tegra132/ccplex.c index 7f16d54..c480887 100644 --- a/src/soc/nvidia/tegra132/ccplex.c +++ b/src/soc/nvidia/tegra132/ccplex.c @@ -77,7 +77,7 @@ int ccplex_load_mts(void) { ssize_t nread; struct stopwatch sw; - struct cbfsf fh; + struct region_device fh; /* * MTS location is hard coded to this magic address. The hardware will @@ -93,11 +93,11 @@ int ccplex_load_mts(void) } /* Read MTS file into the carveout region. */ - nread = cbfs_file_readat(&fh, mts, 0, cbfs_file_size(&fh)); + nread = rdev_readat(&fh, mts, 0, region_device_sz(&fh)); - if (nread != cbfs_file_size(&fh)) { + if (nread != region_device_sz(&fh)) { printk(BIOS_DEBUG, "MTS bytes read (%zu) != file length(%u)!\n", - nread, cbfs_file_size(&fh)); + nread, region_device_sz(&fh)); return -1; } diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c index 6e100a2..c711fde 100644 --- a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c +++ b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c @@ -98,7 +98,8 @@ static int vboot_loader_active(struct prog *prog) printk(BIOS_DEBUG, "VBOOT: Loading verstage.\n"); /* load verstage from RO */ - if (cbfs_boot_load_stage(&verstage)) + if (cbfs_boot_locate(&verstage.rdev, verstage.name, NULL) || + cbfs_prog_stage_load(&verstage)) die("failed to load verstage"); /* verify and select a slot */ @@ -118,29 +119,30 @@ static int vboot_loader_active(struct prog *prog) wd = vboot_get_working_data(); - if (vboot_is_slot_selected(wd)) { - if (IS_ENABLED(CONFIG_MULTIPLE_CBFS_INSTANCES) && - run_verification) { - /* RW A or B */ - struct region_device fw_main; - - if (vb2_get_selected_region(wd, &fw_main)) - die("failed to reference selected region\n"); - cbfs_set_header_offset(region_device_offset(&fw_main)); - } + if (vboot_is_slot_selected(wd)) return 1; - } return 0; } -static int vboot_fw_region(int fw_index, const struct region_device *fw_main, - struct region_device *fw) +static int vboot_locate_by_components(const struct region_device *fw_main, + struct prog *prog) { struct vboot_components *fw_info; size_t metadata_sz; size_t offset; size_t size; + struct region_device *fw = &prog->rdev; + int fw_index = 0; + + if (prog->type == PROG_ROMSTAGE) + fw_index = CONFIG_VBOOT_ROMSTAGE_INDEX; + else if (prog->type == PROG_RAMSTAGE) + fw_index = CONFIG_VBOOT_RAMSTAGE_INDEX; + else if (prog->type == PROG_PAYLOAD) + fw_index = CONFIG_VBOOT_BOOT_LOADER_INDEX; + else + die("Invalid program type for vboot."); metadata_sz = sizeof(*fw_info); metadata_sz += MAX_PARSED_FW_COMPONENTS * sizeof(fw_info->entries[0]); @@ -153,7 +155,7 @@ static int vboot_fw_region(int fw_index, const struct region_device *fw_main, } if (fw_index >= fw_info->num_components) { - printk(BIOS_INFO, "invalid stage index: %d\n", fw_index); + printk(BIOS_INFO, "invalid index: %d\n", fw_index); rdev_munmap(fw_main, fw_info); return -1; } @@ -163,16 +165,44 @@ static int vboot_fw_region(int fw_index, const struct region_device *fw_main, rdev_munmap(fw_main, fw_info); if (rdev_chain(fw, fw_main, offset, size)) { - printk(BIOS_INFO, "invalid stage address or size\n"); + printk(BIOS_INFO, "invalid offset or size\n"); return -1; } return 0; } +static int vboot_locate_by_multi_cbfs(const struct region_device *fw_main, + struct prog *prog) +{ + struct cbfsd cbfs; + struct region_device rdev; + struct cbfs_props props; + + if (cbfs_boot_region_properties(&props)) + return -1; + + if (rdev_chain(&rdev, fw_main, props.offset, props.size)) + return -1; + + cbfs.rdev = &rdev; + cbfs.align = props.align; + + return cbfs_locate(&prog->rdev, &cbfs, prog->name, NULL); +} + +static int vboot_prog_locate(const struct region_device *fw_main, + struct prog *prog) +{ + if (IS_ENABLED(CONFIG_MULTIPLE_CBFS_INSTANCES)) + return vboot_locate_by_multi_cbfs(fw_main, prog); + else + return vboot_locate_by_components(fw_main, prog); +} + /* This function is only called when vboot_loader_active() returns 1. That * means we are taking vboot paths. */ -static int vboot_prepare(struct prog *prog) +static int vboot_locate(struct prog *prog) { struct vb2_working_data *wd; struct region_device fw_main; @@ -183,79 +213,15 @@ static int vboot_prepare(struct prog *prog) if (verstage_should_load() && !IS_ENABLED(CONFIG_RETURN_FROM_VERSTAGE)) return 0; - /* In the multi cbfs case the cbfs offset pointer has already been - * updated after firmware verification. */ - if (IS_ENABLED(CONFIG_MULTIPLE_CBFS_INSTANCES)) { - if (!ENV_RAMSTAGE && cbfs_boot_load_stage(prog) != 0) - return -1; - - /* Need to load payload. */ - if (ENV_RAMSTAGE) { - void *payload; - size_t size; - - payload = cbfs_boot_map_with_leak(prog->name, - CBFS_TYPE_PAYLOAD, - &size); - - if (payload == NULL) - die("Couldn't load payload\n"); - - prog_set_area(prog, payload, size); - } - return 0; - } - wd = vboot_get_working_data(); if (vb2_get_selected_region(wd, &fw_main)) die("failed to reference selected region\n"); - /* Load payload in ramstage. */ - if (ENV_RAMSTAGE) { - struct region_device payload; - void *payload_ptr; - - if (vboot_fw_region(CONFIG_VBOOT_BOOT_LOADER_INDEX, - &fw_main, &payload)) - die("Couldn't load payload."); - - payload_ptr = rdev_mmap_full(&payload); - - if (payload_ptr == NULL) - die("Couldn't load payload."); - - prog_set_area(prog, payload_ptr, region_device_sz(&payload)); - } else { - struct cbfsf stage; - int stage_index = 0; - - if (prog->type == PROG_ROMSTAGE) - stage_index = CONFIG_VBOOT_ROMSTAGE_INDEX; - else if (prog->type == PROG_RAMSTAGE) - stage_index = CONFIG_VBOOT_RAMSTAGE_INDEX; - else - die("Invalid program type for vboot."); - - if (vboot_fw_region(stage_index, &fw_main, &stage.rdev)) - die("Vboot stage load failed."); - - if (ENV_ROMSTAGE && IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE)) { - struct rmod_stage_load rmod_ram = { - .cbmem_id = CBMEM_ID_RAMSTAGE, - .prog = prog, - }; - - if (rmodule_stage_load(&rmod_ram, &stage)) - die("Vboot couldn't load stage"); - } else if (cbfs_file_stage_load(&stage, prog)) - die("Vboot couldn't load stage"); - } - - return 0; + return vboot_prog_locate(&fw_main, prog); } const struct prog_loader_ops vboot_loader = { .name = "VBOOT", .is_loader_active = vboot_loader_active, - .prepare = vboot_prepare, + .locate = vboot_locate, };

1 0

New patch to review for coreboot: 0336b05 cbfs: simplify program loading
by Aaron Durbin 19 May '15

19 May '15

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10257 -gerrit commit 0336b055fba5e045eb293d14c24fccba1543052b Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue May 19 08:37:23 2015 -0500 cbfs: simplify program loading By first removing struct cbfsf and using region_devices throughout program loading we can significantly decrease the complexity. This patch is mainly for review purposes as it can squashed into the new cbfs API patch. Change-Id: I13fcd0fa548375463eb06cbce0ec85ebd8e41d8f Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/arch/arm/armv7/bootblock_simple.c | 3 - src/device/oprom/realmode/x86.c | 7 +- src/include/cbfs.h | 44 +--- src/include/fallback.h | 2 +- src/include/memlayout.h | 2 - src/include/program_loading.h | 18 +- src/include/rmodule.h | 3 +- src/include/romstage_handoff.h | 10 - src/include/symbols.h | 1 - src/lib/Makefile.inc | 4 + src/lib/cbfs.c | 73 ++---- src/lib/cbfs_boot_props.c | 8 +- src/lib/hardwaremain.c | 2 - src/lib/loaders/Makefile.inc | 27 --- src/lib/loaders/cbfs_payload_loader.c | 42 ---- src/lib/loaders/cbfs_ramstage_loader.c | 55 ----- src/lib/loaders/cbfs_romstage_loader.c | 31 --- src/lib/loaders/load_and_run_payload.c | 118 ---------- src/lib/loaders/load_and_run_ramstage.c | 109 --------- src/lib/loaders/load_and_run_romstage.c | 85 ------- src/lib/prog_loaders.c | 244 +++++++++++++++++++++ src/lib/rmodule.c | 20 +- src/lib/selfboot.c | 15 +- src/soc/nvidia/tegra132/ccplex.c | 8 +- .../google/chromeos/vboot2/vboot_loader.c | 132 +++++------ 25 files changed, 372 insertions(+), 691 deletions(-) diff --git a/src/arch/arm/armv7/bootblock_simple.c b/src/arch/arm/armv7/bootblock_simple.c index ff15e24..b010693 100644 --- a/src/arch/arm/armv7/bootblock_simple.c +++ b/src/arch/arm/armv7/bootblock_simple.c @@ -22,7 +22,6 @@ #include <arch/exception.h> #include <arch/stages.h> #include <bootblock_common.h> -#include <cbfs.h> #include <console/console.h> #include <delay.h> #include <program_loading.h> @@ -46,8 +45,6 @@ void main(void) exception_init(); #endif - cbfs_set_header_offset(0); - bootblock_soc_init(); bootblock_mainboard_init(); diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c index 7f8c166..db22ccc 100644 --- a/src/device/oprom/realmode/x86.c +++ b/src/device/oprom/realmode/x86.c @@ -378,9 +378,6 @@ static u32 VSA_vrRead(u16 classIndex) void do_vsmbios(void) { - struct prog vsa = { - .name = "vsa", - }; printk(BIOS_DEBUG, "Preparing for VSA...\n"); /* Set up C interrupt handlers */ @@ -392,8 +389,8 @@ void do_vsmbios(void) /* Make sure the code is placed. */ setup_realmode_code(); - if (cbfs_boot_load_stage(&vsa) || - (uintptr_t)prog_entry(&vsa) != VSA2_ENTRY_POINT) { + if ((uintptr_t)cbfs_boot_load_stage_by_name("vsa") != + VSA2_ENTRY_POINT) { printk(BIOS_ERR, "Failed to load VSA.\n"); return; } diff --git a/src/include/cbfs.h b/src/include/cbfs.h index f914ffb..00c43f2 100644 --- a/src/include/cbfs.h +++ b/src/include/cbfs.h @@ -28,13 +28,10 @@ * CBFS operations consist of the following concepts: * - region_device for the boot media * - cbfsd which is a descriptor for representing a cbfs instance - * - cbfsf which is a file handle for manipulating cbfs files */ /* Descriptor for cbfs lookup operations. */ struct cbfsd; -/* File handle representing a cbfs file. */ -struct cbfsf; /*********************************************** * Perform CBFS operations on the boot device. * @@ -42,40 +39,24 @@ struct cbfsf; /* Return mapping of option rom found in boot device. NULL on error. */ void *cbfs_boot_map_optionrom(uint16_t vendor, uint16_t device); -/* Load stage into memory filling in prog. Return 0 on success. < 0 on error. */ -int cbfs_boot_load_stage(struct prog *prog); +/* Load stage by name into memory. Returns entry address on success. NULL on + * failure. */ +void *cbfs_boot_load_stage_by_name(const char *name); /* Locate file by name and optional type. Return 0 on success. < 0 on error. */ -int cbfs_boot_locate(struct cbfsf *fh, const char *name, uint32_t *type); +int cbfs_boot_locate(struct region_device *fh, const char *name, + uint32_t *type); /* Map file into memory leaking the mapping. Only should be used when * leaking mappings are a no-op. Returns NULL on error, else returns * the mapping and sets the size of the file. */ void *cbfs_boot_map_with_leak(const char *name, uint32_t type, size_t *size); -/************************************************* - * Perform CBFS operations on the provided file. * - *************************************************/ - -/* Map file into memory. Return NULL on error. */ -void *cbfs_file_mmap(const struct cbfsf *fh, size_t offset, size_t size); -/* Unmap previously mapped file. Returns 0 on success. < 0 on error. */ -int cbfs_file_munmap(const struct cbfsf *fh, void *mapping); -/* Read size bytes into b at offset in file. Returns the number of bytes - * read on success. Returns < 0 on error. */ -ssize_t cbfs_file_readat(const struct cbfsf *fh, void *b, size_t offset, - size_t size); /* Load stage into memory filling in prog. Return 0 on success. < 0 on error. */ -int cbfs_file_stage_load(const struct cbfsf *fh, struct prog *prog); - -/******************************************************* - * Perform CBFS operations on the provided descriptor. * - *******************************************************/ +int cbfs_prog_stage_load(struct prog *prog); /* Locate file by name and optional type. Returns 0 on succcess else < 0 on * error.*/ -int cbfs_locate(struct cbfsf *fh, const struct cbfsd *cbfs, const char *name, - uint32_t *type); -void cbfs_set_header_offset(size_t offset); -size_t cbfs_get_header_offset(void); +int cbfs_locate(struct region_device *fh, const struct cbfsd *cbfs, + const char *name, uint32_t *type); /***************************************************************** * Support structures and functions. Direct field access should * @@ -88,15 +69,6 @@ struct cbfsd { size_t align; }; -struct cbfsf { - struct region_device rdev; -}; - -static inline size_t cbfs_file_size(const struct cbfsf *fh) -{ - return region_sz(&fh->rdev.region); -} - /* The cbfs_props struct describes the properties associated with a CBFS. */ struct cbfs_props { /* Each file is aligned. */ diff --git a/src/include/fallback.h b/src/include/fallback.h index 7f3c823..740f130 100644 --- a/src/include/fallback.h +++ b/src/include/fallback.h @@ -1,7 +1,7 @@ #ifndef FALLBACK_H #define FALLBACK_H -#if !defined(__ASSEMBLER__) && !defined(__PRE_RAM__) +#if !defined(__ASSEMBLER__) void boot_successful(void); diff --git a/src/include/memlayout.h b/src/include/memlayout.h index 263dc5c..a80e03e 100644 --- a/src/include/memlayout.h +++ b/src/include/memlayout.h @@ -102,6 +102,4 @@ . += sz; #endif -#define CBFS_HEADER_OFFSET(addr) REGION(cbfs_header_offset, addr, 4, 4) - #endif /* __MEMLAYOUT_H */ diff --git a/src/include/program_loading.h b/src/include/program_loading.h index 5fc0fd6..cf3900d 100644 --- a/src/include/program_loading.h +++ b/src/include/program_loading.h @@ -22,6 +22,7 @@ #include <stdint.h> #include <stddef.h> +#include <region.h> enum { /* Last segment of program. Can be used to take different actions for @@ -49,10 +50,13 @@ enum prog_type { struct prog { enum prog_type type; const char *name; + /* Source of program content to load. */ + struct region_device rdev; /* The area can mean different things depending on what type the - * program is. e.g. a payload prog uses this field for the backing - * store of the payload_segments and data. After loading the segments - * area is updated to reflect the bounce buffer used. */ + * program is. A stage after being loaded reflects the memory occupied + * by the program, Since payloads are multi-segment one can't express + * the memory layout with one range. Instead this field is updated + * to reflect the bounce buffer used. */ struct buffer_area area; /* Entry to program with optional argument. It's up to the architecture * to decide if argument is passed. */ @@ -107,10 +111,10 @@ struct prog_loader_ops { /* Determine if the loader is the active one. If so returns 1 else 0 * or < 0 on error. */ int (*is_loader_active)(struct prog *prog); - /* Returns < 0 on error or 0 on success. This function needs to do - * different things depending on the prog type. See definition - * of struct prog above. */ - int (*prepare)(struct prog *prog); + /* Returns < 0 on error or 0 on success. This function locates + * the rdev representing the file data associated with the passed in + * prog. */ + int (*locate)(struct prog *prog); }; /************************ diff --git a/src/include/rmodule.h b/src/include/rmodule.h index 5dc795c..0c41212 100644 --- a/src/include/rmodule.h +++ b/src/include/rmodule.h @@ -54,7 +54,6 @@ int rmodule_calc_region(unsigned int region_alignment, size_t rmodule_size, /* Support for loading rmodule stages. This API is only available when * using dynamic cbmem because it uses the dynamic cbmem API to obtain * the backing store region for the stage. */ -struct cbfsf; struct prog; struct rmod_stage_load { @@ -63,7 +62,7 @@ struct rmod_stage_load { }; /* Both of the following functions return 0 on success, -1 on error. */ -int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfsf *fh); +int rmodule_stage_load(struct rmod_stage_load *rsl); int rmodule_stage_load_from_cbfs(struct rmod_stage_load *rsl); struct rmodule { diff --git a/src/include/romstage_handoff.h b/src/include/romstage_handoff.h index 09934ca..b78bec3 100644 --- a/src/include/romstage_handoff.h +++ b/src/include/romstage_handoff.h @@ -38,8 +38,6 @@ struct romstage_handoff { uint8_t reserved[2]; }; -#if defined(__ROMSTAGE__) -#if CONFIG_EARLY_CBMEM_INIT /* The romstage_handoff_find_or_add() function provides the necessary logic * for initializing the romstage_handoff structure in cbmem. Different components * of the romstage may be responsible for setting up different fields. Therefore @@ -62,14 +60,6 @@ static inline struct romstage_handoff *romstage_handoff_find_or_add(void) return handoff; } -#else /* CONFIG_EARLY_CBMEM_INIT */ -static inline struct romstage_handoff *romstage_handoff_find_or_add(void) -{ - return NULL; -} -#endif /* CONFIG_EARLY_CBMEM_INIT */ - -#endif /* defined(__PRE_RAM__) */ #endif /* ROMSTAGE_HANDOFF_H */ diff --git a/src/include/symbols.h b/src/include/symbols.h index 279c5a2..c3ced87 100644 --- a/src/include/symbols.h +++ b/src/include/symbols.h @@ -27,7 +27,6 @@ extern u8 _esram[]; #define _sram_size (_esram - _sram) extern u8 _dram[]; -extern u32 _cbfs_header_offset[]; extern u8 _preram_cbmem_console[]; extern u8 _epreram_cbmem_console[]; diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 1160b28..2416736 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -18,6 +18,7 @@ # subdirs-y += loaders +bootblock-y += prog_loaders.c bootblock-y += prog_ops.c bootblock-y += cbfs.c bootblock-y += cbfs_boot_props.c @@ -35,6 +36,7 @@ bootblock-y += region.c bootblock-y += boot_device.c bootblock-y += fmap.c +verstage-y += prog_loaders.c verstage-y += prog_ops.c verstage-y += delay.c verstage-y += cbfs.c @@ -58,6 +60,7 @@ verstage-$(CONFIG_GENERIC_UDELAY) += timer.c verstage-$(CONFIG_GENERIC_GPIO_LIB) += gpio.c verstage-y += mem_pool.c +romstage-y += prog_loaders.c romstage-y += prog_ops.c romstage-y += memchr.c romstage-y += memcmp.c @@ -89,6 +92,7 @@ endif romstage-$(CONFIG_GENERIC_UDELAY) += timer.c +ramstage-y += prog_loaders.c ramstage-y += prog_ops.c ramstage-y += hardwaremain.c ramstage-y += selfboot.c diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index fb012d1..23dfee7 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -35,22 +35,7 @@ #define DEBUG(x...) #endif -void cbfs_set_header_offset(size_t offset) -{ - if (IS_ENABLED(CONFIG_MULTIPLE_CBFS_INSTANCES)) { - _cbfs_header_offset[0] = offset; - LOG("header set to: %#zx\n", offset); - } -} - -size_t cbfs_get_header_offset(void) -{ - if (IS_ENABLED(CONFIG_MULTIPLE_CBFS_INSTANCES)) - return _cbfs_header_offset[0]; - return 0; -} - -int cbfs_boot_locate(struct cbfsf *fh, const char *name, uint32_t *type) +int cbfs_boot_locate(struct region_device *fh, const char *name, uint32_t *type) { struct cbfsd cbfs; struct region_device rdev; @@ -79,38 +64,22 @@ int cbfs_boot_locate(struct cbfsf *fh, const char *name, uint32_t *type) void *cbfs_boot_map_with_leak(const char *name, uint32_t type, size_t *size) { - struct cbfsf fh; + struct region_device fh; size_t fsize; if (cbfs_boot_locate(&fh, name, &type)) return NULL; - fsize = cbfs_file_size(&fh); + fsize = region_device_sz(&fh); if (size != NULL) *size = fsize; - return cbfs_file_mmap(&fh, 0, fsize); -} - -void *cbfs_file_mmap(const struct cbfsf *fh, size_t offset, size_t size) -{ - return rdev_mmap(&fh->rdev, offset, size); + return rdev_mmap(&fh, 0, fsize); } -int cbfs_file_munmap(const struct cbfsf *fh, void *mapping) -{ - return rdev_munmap(&fh->rdev, mapping); -} - -ssize_t cbfs_file_readat(const struct cbfsf *fh, void *b, size_t offset, - size_t size) -{ - return rdev_readat(&fh->rdev, b, offset, size); -} - -int cbfs_locate(struct cbfsf *fh, const struct cbfsd *cbfs, const char *name, - uint32_t *type) +int cbfs_locate(struct region_device *fh, const struct cbfsd *cbfs, + const char *name, uint32_t *type) { size_t offset; const struct region_device *rd; @@ -174,7 +143,7 @@ int cbfs_locate(struct cbfsf *fh, const struct cbfsd *cbfs, const char *name, * represent the cbfs file. */ offset += file.offset; datasz = file.len; - if (rdev_chain(&fh->rdev, rd, offset, datasz)) + if (rdev_chain(fh, rd, offset, datasz)) break; /* Success. */ @@ -217,29 +186,35 @@ void *cbfs_boot_map_optionrom(uint16_t vendor, uint16_t device) return cbfs_boot_map_with_leak(name, CBFS_TYPE_OPTIONROM, NULL); } -int cbfs_boot_load_stage(struct prog *stage) +void *cbfs_boot_load_stage_by_name(const char *name) { - struct cbfsf fh; + struct prog stage = { + .name = name, + }; uint32_t type = CBFS_TYPE_STAGE; - if (cbfs_boot_locate(&fh, stage->name, &type)) - return -1; + if (cbfs_boot_locate(&stage.rdev, name, &type)) + return NULL; + + if (cbfs_prog_stage_load(&stage)) + return NULL; - return cbfs_file_stage_load(&fh, stage); + return prog_entry(&stage); } -int cbfs_file_stage_load(const struct cbfsf *fh, struct prog *pstage) +int cbfs_prog_stage_load(struct prog *pstage) { struct cbfs_stage stage; uint8_t *load; void *entry; size_t fsize; size_t foffset; + const struct region_device *fh = &pstage->rdev; - if (cbfs_file_readat(fh, &stage, 0, sizeof(stage)) != sizeof(stage)) + if (rdev_readat(fh, &stage, 0, sizeof(stage)) != sizeof(stage)) return 0; - fsize = cbfs_file_size(fh); + fsize = region_device_sz(fh); fsize -= sizeof(stage); foffset = 0; foffset += sizeof(stage); @@ -252,17 +227,17 @@ int cbfs_file_stage_load(const struct cbfsf *fh, struct prog *pstage) entry = (void *)(uintptr_t)stage.entry; if (stage.compression == CBFS_COMPRESS_NONE) { - if (cbfs_file_readat(fh, load, foffset, fsize) != fsize) + if (rdev_readat(fh, load, foffset, fsize) != fsize) return -1; } else if (stage.compression == CBFS_COMPRESS_LZMA) { - void *map = cbfs_file_mmap(fh, foffset, fsize); + void *map = rdev_mmap(fh, foffset, fsize); if (map == NULL) return -1; fsize = inflate(map, load); - cbfs_file_munmap(fh, map); + rdev_munmap(fh, map); if (!fsize) return -1; diff --git a/src/lib/cbfs_boot_props.c b/src/lib/cbfs_boot_props.c index 7e7bb8a..21e64d3 100644 --- a/src/lib/cbfs_boot_props.c +++ b/src/lib/cbfs_boot_props.c @@ -31,23 +31,19 @@ int __attribute__((weak)) cbfs_boot_region_properties(struct cbfs_props *props) const struct region_device *bdev; int32_t rel_offset; size_t offset; - size_t base_offset; bdev = boot_device_ro(); if (bdev == NULL) return -1; - base_offset = cbfs_get_header_offset(); - base_offset += CONFIG_CBFS_SIZE; - /* Find location of header using signed 32-bit offset from * end of CBFS region. */ - offset = base_offset - sizeof(int32_t); + offset = CONFIG_CBFS_SIZE - sizeof(int32_t); if (rdev_readat(bdev, &rel_offset, offset, sizeof(int32_t)) < 0) return -1; - offset = base_offset + rel_offset; + offset = CONFIG_CBFS_SIZE + rel_offset; if (rdev_readat(bdev, &header, offset, sizeof(header)) < 0) return -1; diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c index 295edcd..274a9c7 100644 --- a/src/lib/hardwaremain.c +++ b/src/lib/hardwaremain.c @@ -228,8 +228,6 @@ static boot_state_t bs_write_tables(void *arg) static boot_state_t bs_payload_load(void *arg) { - timestamp_add_now(TS_LOAD_PAYLOAD); - payload_load(); return BS_PAYLOAD_BOOT; diff --git a/src/lib/loaders/Makefile.inc b/src/lib/loaders/Makefile.inc deleted file mode 100644 index 9dca06b..0000000 --- a/src/lib/loaders/Makefile.inc +++ /dev/null @@ -1,27 +0,0 @@ -# -# This file is part of the coreboot project. -# -# Copyright (C) 2014 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 -# - -bootblock-y += load_and_run_romstage.c -bootblock-y += cbfs_romstage_loader.c -romstage-y += cbfs_ramstage_loader.c -romstage-y += load_and_run_ramstage.c -ramstage-y += cbfs_payload_loader.c -ramstage-y += load_and_run_payload.c -verstage-y += cbfs_romstage_loader.c -verstage-y += load_and_run_romstage.c diff --git a/src/lib/loaders/cbfs_payload_loader.c b/src/lib/loaders/cbfs_payload_loader.c deleted file mode 100644 index fffb558..0000000 --- a/src/lib/loaders/cbfs_payload_loader.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 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 - */ - -#include <cbfs.h> -#include <program_loading.h> - -static int cbfs_locate_payload(struct prog *payload) -{ - void *buffer; - size_t size; - const uint32_t type = CBFS_TYPE_PAYLOAD; - - buffer = cbfs_boot_map_with_leak(payload->name, type, &size); - - if (buffer == NULL) - return -1; - - prog_set_area(payload, buffer, size); - - return 0; -} - -const struct prog_loader_ops cbfs_payload_loader = { - .name = "CBFS", - .prepare = cbfs_locate_payload, -}; diff --git a/src/lib/loaders/cbfs_ramstage_loader.c b/src/lib/loaders/cbfs_ramstage_loader.c deleted file mode 100644 index bbbf695..0000000 --- a/src/lib/loaders/cbfs_ramstage_loader.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2008-2009 coresystems GmbH - * Copyright (C) 2014 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 - */ -#include <console/console.h> -#include <cbfs.h> -#include <program_loading.h> - -#if CONFIG_RELOCATABLE_RAMSTAGE -#include <rmodule.h> -#include <cbmem.h> - -static int cbfs_load_ramstage(struct prog *ramstage) -{ - struct rmod_stage_load rmod_ram = { - .cbmem_id = CBMEM_ID_RAMSTAGE, - .prog = ramstage, - }; - - if (rmodule_stage_load_from_cbfs(&rmod_ram)) { - printk(BIOS_DEBUG, "Could not load ramstage.\n"); - return -1; - } - - return 0; -} - -#else /* CONFIG_RELOCATABLE_RAMSTAGE */ - -static int cbfs_load_ramstage(struct prog *ramstage) -{ - return cbfs_boot_load_stage(ramstage); -} - -#endif /* CONFIG_RELOCATABLE_RAMSTAGE */ - -const struct prog_loader_ops cbfs_ramstage_loader = { - .name = "CBFS", - .prepare = cbfs_load_ramstage, -}; diff --git a/src/lib/loaders/cbfs_romstage_loader.c b/src/lib/loaders/cbfs_romstage_loader.c deleted file mode 100644 index 7dde2ec..0000000 --- a/src/lib/loaders/cbfs_romstage_loader.c +++ /dev/null @@ -1,31 +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. - * - * 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. - */ - -#include <cbfs.h> -#include <program_loading.h> - -static int cbfs_load_romstage(struct prog *romstage) -{ - return cbfs_boot_load_stage(romstage); -} - -const struct prog_loader_ops cbfs_romstage_loader = { - .name = "CBFS", - .prepare = cbfs_load_romstage, -}; diff --git a/src/lib/loaders/load_and_run_payload.c b/src/lib/loaders/load_and_run_payload.c deleted file mode 100644 index 4928e0c..0000000 --- a/src/lib/loaders/load_and_run_payload.c +++ /dev/null @@ -1,118 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 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 - */ - -#include <stdint.h> -#include <stdlib.h> -#include <cbmem.h> -#include <console/console.h> -#include <fallback.h> -#include <lib.h> -#include <program_loading.h> -#include <symbols.h> -#include <timestamp.h> - -extern const struct prog_loader_ops vboot_loader; -extern const struct prog_loader_ops cbfs_payload_loader; - -static const struct prog_loader_ops *payload_ops[] = { -#if CONFIG_VBOOT_VERIFY_FIRMWARE - &vboot_loader, -#endif - &cbfs_payload_loader, -}; - -static struct prog global_payload = { - .name = CONFIG_CBFS_PREFIX "/payload", - .type = PROG_PAYLOAD, -}; - -void __attribute__((weak)) mirror_payload(struct prog *payload) -{ - return; -} - -void payload_load(void) -{ - int i; - const struct prog_loader_ops *ops; - struct prog *payload = &global_payload; - - for (i = 0; i < ARRAY_SIZE(payload_ops); i++) { - /* Default loader state is active. */ - int ret = 1; - - ops = payload_ops[i]; - - if (ops->is_loader_active != NULL) - ret = ops->is_loader_active(payload); - - if (ret == 0) { - printk(BIOS_DEBUG, "%s payload loader inactive.\n", - ops->name); - continue; - } else if (ret < 0) { - printk(BIOS_DEBUG, "%s payload loader failure.\n", - ops->name); - continue; - } - - if (ops->prepare(payload) < 0) { - printk(BIOS_DEBUG, "%s: could not locate payload.\n", - ops->name); - continue; - } - printk(BIOS_DEBUG, "%s: located payload @ %p, %zu bytes.\n", - ops->name, prog_start(payload), prog_size(payload)); - break; - } - - if (i == ARRAY_SIZE(payload_ops)) - goto out; - - mirror_payload(payload); - - /* Pass cbtables to payload if architecture desires it. */ - prog_set_entry(payload, selfload(payload), - cbmem_find(CBMEM_ID_CBTABLE)); - -out: - if (prog_entry(payload) == NULL) - die("Payload not loaded.\n"); -} - -void payload_run(void) -{ - struct prog *payload = &global_payload; - - /* Reset to booting from this image as late as possible */ - boot_successful(); - - printk(BIOS_DEBUG, "Jumping to boot code at %p(%p)\n", - prog_entry(payload), prog_entry_arg(payload)); - post_code(POST_ENTER_ELF_BOOT); - - timestamp_add_now(TS_SELFBOOT_JUMP); - - /* Before we go off to run the payload, see if - * we stayed within our bounds. - */ - checkstack(_estack, 0); - - prog_run(payload); -} diff --git a/src/lib/loaders/load_and_run_ramstage.c b/src/lib/loaders/load_and_run_ramstage.c deleted file mode 100644 index 504dbff..0000000 --- a/src/lib/loaders/load_and_run_ramstage.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2014 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 - */ - -#include <stdlib.h> -#include <console/console.h> -#include <arch/stages.h> -#include <cbfs.h> -#include <program_loading.h> -#include <romstage_handoff.h> -#include <stage_cache.h> -#include <timestamp.h> - -extern const struct prog_loader_ops cbfs_ramstage_loader; -extern const struct prog_loader_ops vboot_loader; - -static const struct prog_loader_ops *loaders[] = { -#if CONFIG_VBOOT_VERIFY_FIRMWARE - &vboot_loader, -#endif - &cbfs_ramstage_loader, -}; - -void __attribute__((weak)) stage_cache_add(int stage_id, struct prog *stage) {} -void __attribute__((weak)) stage_cache_load_stage(int stage_id, - struct prog *stage) {} -void __attribute__((weak)) ramstage_cache_invalid(void) {} - -static void load_ramstage(const struct prog_loader_ops *ops, - struct prog *ramstage) -{ - timestamp_add_now(TS_START_COPYRAM); - - if (ops->prepare(ramstage)) - return; - - stage_cache_add(STAGE_RAMSTAGE, ramstage); - - timestamp_add_now(TS_END_COPYRAM); - - prog_run(ramstage); -} - -static void run_ramstage_from_resume(struct romstage_handoff *handoff, - struct prog *ramstage) -{ - if (handoff != NULL && handoff->s3_resume) { - /* Load the cached ramstage to runtime location. */ - stage_cache_load_stage(STAGE_RAMSTAGE, ramstage); - - if (prog_entry(ramstage) != NULL) { - printk(BIOS_DEBUG, "Jumping to image.\n"); - prog_run(ramstage); - } - ramstage_cache_invalid(); - } -} - -void run_ramstage(void) -{ - const struct prog_loader_ops *ops; - int i; - struct prog ramstage = { - .name = CONFIG_CBFS_PREFIX "/ramstage", - .type = PROG_RAMSTAGE, - }; - - run_ramstage_from_resume(romstage_handoff_find_or_add(), &ramstage); - - for (i = 0; i < ARRAY_SIZE(loaders); i++) { - /* Default loader state is active. */ - int ret = 1; - - ops = loaders[i]; - - if (ops->is_loader_active != NULL) - ret = ops->is_loader_active(&ramstage); - - if (ret == 0) { - printk(BIOS_DEBUG, "%s ramstage loader inactive.\n", - ops->name); - continue; - } else if (ret < 0) { - printk(BIOS_DEBUG, "%s ramstage loader failure.\n", - ops->name); - continue; - } - - printk(BIOS_DEBUG, "%s ramstage loader active.\n", ops->name); - load_ramstage(ops, &ramstage); - } - - die("Ramstage was not loaded!\n"); -} diff --git a/src/lib/loaders/load_and_run_romstage.c b/src/lib/loaders/load_and_run_romstage.c deleted file mode 100644 index b54c691..0000000 --- a/src/lib/loaders/load_and_run_romstage.c +++ /dev/null @@ -1,85 +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. - * - * 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 <stdlib.h> -#include <console/console.h> -#include <arch/stages.h> -#include <cbfs.h> -#include <halt.h> -#include <program_loading.h> -#include <rules.h> -#include <timestamp.h> - -extern const struct prog_loader_ops cbfs_romstage_loader; -extern const struct prog_loader_ops vboot_loader; - -static const struct prog_loader_ops *loaders[] = { -#if CONFIG_VBOOT_VERIFY_FIRMWARE - &vboot_loader, -#endif -#if !ENV_VERSTAGE || (ENV_VERSTAGE && !CONFIG_RETURN_FROM_VERSTAGE) - &cbfs_romstage_loader, -#endif -}; - -void run_romstage(void) -{ - int i; - struct prog romstage = { - .name = CONFIG_CBFS_PREFIX "/romstage", - .type = PROG_ROMSTAGE, - }; - - for (i = 0; i < ARRAY_SIZE(loaders); i++) { - /* Default loader state is active. */ - int ret = 1; - const struct prog_loader_ops *ops; - - ops = loaders[i]; - - if (ops->is_loader_active != NULL) - ret = ops->is_loader_active(&romstage); - - if (ret == 0) { - printk(BIOS_DEBUG, "%s romstage loader inactive.\n", - ops->name); - continue; - } else if (ret < 0) { - printk(BIOS_DEBUG, "%s romstage loader failure.\n", - ops->name); - continue; - } - - printk(BIOS_DEBUG, "%s romstage loader active.\n", ops->name); - - timestamp_add_now(TS_START_COPYROM); - - if (ops->prepare(&romstage)) - continue; - - timestamp_add_now(TS_END_COPYROM); - - prog_run(&romstage); - } - - if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) - die("Couldn't load romstage.\n"); - halt(); -} diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c new file mode 100644 index 0000000..b0af71a --- /dev/null +++ b/src/lib/prog_loaders.c @@ -0,0 +1,244 @@ +/* + * 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. + * + * 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 <stdlib.h> +#include <console/console.h> +#include <arch/stages.h> +#include <cbfs.h> +#include <cbmem.h> +#include <fallback.h> +#include <halt.h> +#include <lib.h> +#include <program_loading.h> +#include <romstage_handoff.h> +#include <rmodule.h> +#include <rules.h> +#include <stage_cache.h> +#include <symbols.h> +#include <timestamp.h> + +#define DEFAULT_CBFS_LOADER_PRESENT \ + (!ENV_VERSTAGE || (ENV_VERSTAGE && !CONFIG_RETURN_FROM_VERSTAGE)) + +#if DEFAULT_CBFS_LOADER_PRESENT +static int cbfs_boot_prog_locate(struct prog *prog) +{ + return cbfs_boot_locate(&prog->rdev, prog->name, NULL); +} + +static const struct prog_loader_ops cbfs_default_loader = { + .locate = cbfs_boot_prog_locate, +}; +#endif + +extern const struct prog_loader_ops vboot_loader; + +static const struct prog_loader_ops *loaders[] = { +#if CONFIG_VBOOT_VERIFY_FIRMWARE + &vboot_loader, +#endif +#if DEFAULT_CBFS_LOADER_PRESENT + &cbfs_default_loader, +#endif +}; + +static int prog_locate(struct prog *prog) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(loaders); i++) { + /* Default loader state is active. */ + int ret = 1; + const struct prog_loader_ops *ops; + + ops = loaders[i]; + + if (ops->is_loader_active != NULL) + ret = ops->is_loader_active(prog); + + if (ret == 0) { + printk(BIOS_DEBUG, "%s loader inactive.\n", + ops->name); + continue; + } else if (ret < 0) { + printk(BIOS_DEBUG, "%s loader failure.\n", + ops->name); + continue; + } + + printk(BIOS_DEBUG, "%s loader active.\n", ops->name); + + if (ops->locate(prog)) + continue; + + printk(BIOS_DEBUG, "'%s' located at offset: %zx size: %zx\n", + prog->name, region_device_offset(&prog->rdev), + region_device_sz(&prog->rdev)); + + return 0; + } + + return -1; +} + +void run_romstage(void) +{ + struct prog romstage = { + .name = CONFIG_CBFS_PREFIX "/romstage", + .type = PROG_ROMSTAGE, + }; + + /* The only time the default CBFS loader isn't present is during + * VERSTAGE in which it returns back to the calling stage. */ + if (!DEFAULT_CBFS_LOADER_PRESENT) + return; + + if (prog_locate(&romstage)) + goto fail; + + timestamp_add_now(TS_START_COPYROM); + + if (cbfs_prog_stage_load(&romstage)) + goto fail; + + timestamp_add_now(TS_END_COPYROM); + + prog_run(&romstage); + +fail: + if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) + die("Couldn't load romstage.\n"); + halt(); +} + +void __attribute__((weak)) stage_cache_add(int stage_id, struct prog *stage) {} +void __attribute__((weak)) stage_cache_load_stage(int stage_id, + struct prog *stage) {} +void __attribute__((weak)) ramstage_cache_invalid(void) {} + +static void run_ramstage_from_resume(struct romstage_handoff *handoff, + struct prog *ramstage) +{ + if (handoff != NULL && handoff->s3_resume) { + /* Load the cached ramstage to runtime location. */ + stage_cache_load_stage(STAGE_RAMSTAGE, ramstage); + + if (prog_entry(ramstage) != NULL) { + printk(BIOS_DEBUG, "Jumping to image.\n"); + prog_run(ramstage); + } + ramstage_cache_invalid(); + } +} + +static int load_relocatable_ramstage(struct prog *ramstage) +{ + struct rmod_stage_load rmod_ram = { + .cbmem_id = CBMEM_ID_RAMSTAGE, + .prog = ramstage, + }; + + return rmodule_stage_load(&rmod_ram); +} + +void run_ramstage(void) +{ + struct prog ramstage = { + .name = CONFIG_CBFS_PREFIX "/ramstage", + .type = PROG_RAMSTAGE, + }; + + /* Only x86 systems currently take the same firmware path on resume. */ + if (IS_ENABLED(CONFIG_ARCH_X86) && IS_ENABLED(CONFIG_EARLY_CBMEM_INIT)) + run_ramstage_from_resume(romstage_handoff_find_or_add(), + &ramstage); + + if (prog_locate(&ramstage)) + goto fail; + + timestamp_add_now(TS_START_COPYRAM); + + if (IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE) && + load_relocatable_ramstage(&ramstage)) + goto fail; + else if (cbfs_prog_stage_load(&ramstage)) + goto fail; + + stage_cache_add(STAGE_RAMSTAGE, &ramstage); + + timestamp_add_now(TS_END_COPYRAM); + + prog_run(&ramstage); + +fail: + die("Ramstage was not loaded!\n"); +} + +static struct prog global_payload = { + .name = CONFIG_CBFS_PREFIX "/payload", + .type = PROG_PAYLOAD, +}; + +void __attribute__((weak)) mirror_payload(struct prog *payload) +{ + return; +} + +void payload_load(void) +{ + struct prog *payload = &global_payload; + + timestamp_add_now(TS_LOAD_PAYLOAD); + + if (prog_locate(payload)) + goto out; + + mirror_payload(payload); + + /* Pass cbtables to payload if architecture desires it. */ + prog_set_entry(payload, selfload(payload), + cbmem_find(CBMEM_ID_CBTABLE)); + +out: + if (prog_entry(payload) == NULL) + die("Payload not loaded.\n"); +} + +void payload_run(void) +{ + struct prog *payload = &global_payload; + + /* Reset to booting from this image as late as possible */ + boot_successful(); + + printk(BIOS_DEBUG, "Jumping to boot code at %p(%p)\n", + prog_entry(payload), prog_entry_arg(payload)); + + post_code(POST_ENTER_ELF_BOOT); + + timestamp_add_now(TS_SELFBOOT_JUMP); + + /* Before we go off to run the payload, see if + * we stayed within our bounds. + */ + checkstack(_estack, 0); + + prog_run(payload); +} diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c index d886800..d3418f4 100644 --- a/src/lib/rmodule.c +++ b/src/lib/rmodule.c @@ -253,7 +253,7 @@ int rmodule_calc_region(unsigned int region_alignment, size_t rmodule_size, return region_alignment - sizeof(struct rmodule_header); } -int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfsf *fh) +int rmodule_stage_load(struct rmod_stage_load *rsl) { struct rmodule rmod_stage; size_t region_size; @@ -262,11 +262,14 @@ int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfsf *fh) int load_offset; struct cbfs_stage stage; void *rmod_loc; + struct region_device *fh; - if (fh == NULL || rsl->prog == NULL || rsl->prog->name == NULL) + if (rsl->prog == NULL || rsl->prog->name == NULL) return -1; - if (cbfs_file_readat(fh, &stage, 0, sizeof(stage)) != sizeof(stage)) + fh = &rsl->prog->rdev; + + if (rdev_readat(fh, &stage, 0, sizeof(stage)) != sizeof(stage)) return -1; rmodule_offset = @@ -284,19 +287,19 @@ int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfsf *fh) rsl->prog->name, rmod_loc, stage.memlen); if (stage.compression == CBFS_COMPRESS_NONE) { - if (cbfs_file_readat(fh, rmod_loc, sizeof(stage), stage.len) != + if (rdev_readat(fh, rmod_loc, sizeof(stage), stage.len) != stage.len) return -1; } else if (stage.compression == CBFS_COMPRESS_LZMA) { size_t fsize; - void *map = cbfs_file_mmap(fh, sizeof(stage), stage.len); + void *map = rdev_mmap(fh, sizeof(stage), stage.len); if (map == NULL) return -1; fsize = ulzma(map, rmod_loc); - cbfs_file_munmap(fh, map); + rdev_munmap(fh, map); if (!fsize) return -1; @@ -318,11 +321,10 @@ int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfsf *fh) int rmodule_stage_load_from_cbfs(struct rmod_stage_load *rsl) { - struct cbfsf fh; uint32_t type = CBFS_TYPE_STAGE; - if (cbfs_boot_locate(&fh, rsl->prog->name, &type)) + if (cbfs_boot_locate(&rsl->prog->rdev, rsl->prog->name, &type)) return -1; - return rmodule_stage_load(rsl, &fh); + return rmodule_stage_load(rsl); } diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index edf36e7..6b4b0af 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -211,13 +211,11 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) static int build_self_segment_list( struct segment *head, - struct prog *payload, uintptr_t *entry) + struct cbfs_payload *cbfs_payload, uintptr_t *entry) { struct segment *new; struct segment *ptr; struct cbfs_payload_segment *segment, *first_segment; - struct cbfs_payload *cbfs_payload; - cbfs_payload = prog_start(payload); memset(head, 0, sizeof(*head)); head->next = head->prev = head; first_segment = segment = &cbfs_payload->segments; @@ -457,9 +455,15 @@ void *selfload(struct prog *payload) { uintptr_t entry = 0; struct segment head; + void *data; + + data = rdev_mmap_full(&payload->rdev); + + if (data == NULL) + return NULL; /* Preprocess the self segments */ - if (!build_self_segment_list(&head, payload, &entry)) + if (!build_self_segment_list(&head, data, &entry)) goto out; /* Load the segments */ @@ -468,8 +472,11 @@ void *selfload(struct prog *payload) printk(BIOS_SPEW, "Loaded segments\n"); + rdev_munmap(&payload->rdev, data); + return (void *)entry; out: + rdev_munmap(&payload->rdev, data); return NULL; } diff --git a/src/soc/nvidia/tegra132/ccplex.c b/src/soc/nvidia/tegra132/ccplex.c index 7f16d54..c480887 100644 --- a/src/soc/nvidia/tegra132/ccplex.c +++ b/src/soc/nvidia/tegra132/ccplex.c @@ -77,7 +77,7 @@ int ccplex_load_mts(void) { ssize_t nread; struct stopwatch sw; - struct cbfsf fh; + struct region_device fh; /* * MTS location is hard coded to this magic address. The hardware will @@ -93,11 +93,11 @@ int ccplex_load_mts(void) } /* Read MTS file into the carveout region. */ - nread = cbfs_file_readat(&fh, mts, 0, cbfs_file_size(&fh)); + nread = rdev_readat(&fh, mts, 0, region_device_sz(&fh)); - if (nread != cbfs_file_size(&fh)) { + if (nread != region_device_sz(&fh)) { printk(BIOS_DEBUG, "MTS bytes read (%zu) != file length(%u)!\n", - nread, cbfs_file_size(&fh)); + nread, region_device_sz(&fh)); return -1; } diff --git a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c index 6e100a2..c711fde 100644 --- a/src/vendorcode/google/chromeos/vboot2/vboot_loader.c +++ b/src/vendorcode/google/chromeos/vboot2/vboot_loader.c @@ -98,7 +98,8 @@ static int vboot_loader_active(struct prog *prog) printk(BIOS_DEBUG, "VBOOT: Loading verstage.\n"); /* load verstage from RO */ - if (cbfs_boot_load_stage(&verstage)) + if (cbfs_boot_locate(&verstage.rdev, verstage.name, NULL) || + cbfs_prog_stage_load(&verstage)) die("failed to load verstage"); /* verify and select a slot */ @@ -118,29 +119,30 @@ static int vboot_loader_active(struct prog *prog) wd = vboot_get_working_data(); - if (vboot_is_slot_selected(wd)) { - if (IS_ENABLED(CONFIG_MULTIPLE_CBFS_INSTANCES) && - run_verification) { - /* RW A or B */ - struct region_device fw_main; - - if (vb2_get_selected_region(wd, &fw_main)) - die("failed to reference selected region\n"); - cbfs_set_header_offset(region_device_offset(&fw_main)); - } + if (vboot_is_slot_selected(wd)) return 1; - } return 0; } -static int vboot_fw_region(int fw_index, const struct region_device *fw_main, - struct region_device *fw) +static int vboot_locate_by_components(const struct region_device *fw_main, + struct prog *prog) { struct vboot_components *fw_info; size_t metadata_sz; size_t offset; size_t size; + struct region_device *fw = &prog->rdev; + int fw_index = 0; + + if (prog->type == PROG_ROMSTAGE) + fw_index = CONFIG_VBOOT_ROMSTAGE_INDEX; + else if (prog->type == PROG_RAMSTAGE) + fw_index = CONFIG_VBOOT_RAMSTAGE_INDEX; + else if (prog->type == PROG_PAYLOAD) + fw_index = CONFIG_VBOOT_BOOT_LOADER_INDEX; + else + die("Invalid program type for vboot."); metadata_sz = sizeof(*fw_info); metadata_sz += MAX_PARSED_FW_COMPONENTS * sizeof(fw_info->entries[0]); @@ -153,7 +155,7 @@ static int vboot_fw_region(int fw_index, const struct region_device *fw_main, } if (fw_index >= fw_info->num_components) { - printk(BIOS_INFO, "invalid stage index: %d\n", fw_index); + printk(BIOS_INFO, "invalid index: %d\n", fw_index); rdev_munmap(fw_main, fw_info); return -1; } @@ -163,16 +165,44 @@ static int vboot_fw_region(int fw_index, const struct region_device *fw_main, rdev_munmap(fw_main, fw_info); if (rdev_chain(fw, fw_main, offset, size)) { - printk(BIOS_INFO, "invalid stage address or size\n"); + printk(BIOS_INFO, "invalid offset or size\n"); return -1; } return 0; } +static int vboot_locate_by_multi_cbfs(const struct region_device *fw_main, + struct prog *prog) +{ + struct cbfsd cbfs; + struct region_device rdev; + struct cbfs_props props; + + if (cbfs_boot_region_properties(&props)) + return -1; + + if (rdev_chain(&rdev, fw_main, props.offset, props.size)) + return -1; + + cbfs.rdev = &rdev; + cbfs.align = props.align; + + return cbfs_locate(&prog->rdev, &cbfs, prog->name, NULL); +} + +static int vboot_prog_locate(const struct region_device *fw_main, + struct prog *prog) +{ + if (IS_ENABLED(CONFIG_MULTIPLE_CBFS_INSTANCES)) + return vboot_locate_by_multi_cbfs(fw_main, prog); + else + return vboot_locate_by_components(fw_main, prog); +} + /* This function is only called when vboot_loader_active() returns 1. That * means we are taking vboot paths. */ -static int vboot_prepare(struct prog *prog) +static int vboot_locate(struct prog *prog) { struct vb2_working_data *wd; struct region_device fw_main; @@ -183,79 +213,15 @@ static int vboot_prepare(struct prog *prog) if (verstage_should_load() && !IS_ENABLED(CONFIG_RETURN_FROM_VERSTAGE)) return 0; - /* In the multi cbfs case the cbfs offset pointer has already been - * updated after firmware verification. */ - if (IS_ENABLED(CONFIG_MULTIPLE_CBFS_INSTANCES)) { - if (!ENV_RAMSTAGE && cbfs_boot_load_stage(prog) != 0) - return -1; - - /* Need to load payload. */ - if (ENV_RAMSTAGE) { - void *payload; - size_t size; - - payload = cbfs_boot_map_with_leak(prog->name, - CBFS_TYPE_PAYLOAD, - &size); - - if (payload == NULL) - die("Couldn't load payload\n"); - - prog_set_area(prog, payload, size); - } - return 0; - } - wd = vboot_get_working_data(); if (vb2_get_selected_region(wd, &fw_main)) die("failed to reference selected region\n"); - /* Load payload in ramstage. */ - if (ENV_RAMSTAGE) { - struct region_device payload; - void *payload_ptr; - - if (vboot_fw_region(CONFIG_VBOOT_BOOT_LOADER_INDEX, - &fw_main, &payload)) - die("Couldn't load payload."); - - payload_ptr = rdev_mmap_full(&payload); - - if (payload_ptr == NULL) - die("Couldn't load payload."); - - prog_set_area(prog, payload_ptr, region_device_sz(&payload)); - } else { - struct cbfsf stage; - int stage_index = 0; - - if (prog->type == PROG_ROMSTAGE) - stage_index = CONFIG_VBOOT_ROMSTAGE_INDEX; - else if (prog->type == PROG_RAMSTAGE) - stage_index = CONFIG_VBOOT_RAMSTAGE_INDEX; - else - die("Invalid program type for vboot."); - - if (vboot_fw_region(stage_index, &fw_main, &stage.rdev)) - die("Vboot stage load failed."); - - if (ENV_ROMSTAGE && IS_ENABLED(CONFIG_RELOCATABLE_RAMSTAGE)) { - struct rmod_stage_load rmod_ram = { - .cbmem_id = CBMEM_ID_RAMSTAGE, - .prog = prog, - }; - - if (rmodule_stage_load(&rmod_ram, &stage)) - die("Vboot couldn't load stage"); - } else if (cbfs_file_stage_load(&stage, prog)) - die("Vboot couldn't load stage"); - } - - return 0; + return vboot_prog_locate(&fw_main, prog); } const struct prog_loader_ops vboot_loader = { .name = "VBOOT", .is_loader_active = vboot_loader_active, - .prepare = vboot_prepare, + .locate = vboot_locate, };

1 0

New patch to review for coreboot: ef80d95 intel/haswell: Drop MONOTONIC_TIMER_MSR
by Patrick Georgi 19 May '15

19 May '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10256 -gerrit commit ef80d95fa41d64b7fc097624c0cefbd83f7e7845 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue May 19 21:30:20 2015 +0200 intel/haswell: Drop MONOTONIC_TIMER_MSR The variable was set on all haswell boards, so we can do it like on broadwell where the MSR based timer is assumed to be around, too. Change-Id: Id48ad7454d4cf83c3b1616b64687cdcfee4baa10 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- src/cpu/intel/haswell/Kconfig | 8 +------- src/cpu/intel/haswell/Makefile.inc | 4 ++-- src/mainboard/google/bolt/Kconfig | 1 - src/mainboard/google/falco/Kconfig | 1 - src/mainboard/google/panther/Kconfig | 1 - src/mainboard/google/peppy/Kconfig | 1 - src/mainboard/google/slippy/Kconfig | 1 - src/mainboard/intel/baskingridge/Kconfig | 1 - 8 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/cpu/intel/haswell/Kconfig b/src/cpu/intel/haswell/Kconfig index 00fb1d7..f284807 100644 --- a/src/cpu/intel/haswell/Kconfig +++ b/src/cpu/intel/haswell/Kconfig @@ -11,6 +11,7 @@ config CPU_SPECIFIC_OPTIONS select ARCH_ROMSTAGE_X86_32 select ARCH_RAMSTAGE_X86_32 select BACKUP_DEFAULT_SMM_REGION + select HAVE_MONOTONIC_TIMER select SMP select MMX select SSE @@ -60,11 +61,4 @@ config RESET_ON_INVALID_RAMSTAGE_CACHE the system will reset otherwise the ramstage will be reloaded from cbfs. -config MONOTONIC_TIMER_MSR - def_bool n - depends on INTEL_LYNXPOINT_LP - select HAVE_MONOTONIC_TIMER - help - Provide a monotonic timer using the 24MHz MSR counter. - endif diff --git a/src/cpu/intel/haswell/Makefile.inc b/src/cpu/intel/haswell/Makefile.inc index 57f9120..4297122 100644 --- a/src/cpu/intel/haswell/Makefile.inc +++ b/src/cpu/intel/haswell/Makefile.inc @@ -6,7 +6,7 @@ romstage-y += tsc_freq.c ramstage-y += acpi.c ramstage-$(CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM) += stage_cache.c ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smmrelocate.c -ramstage-$(CONFIG_MONOTONIC_TIMER_MSR) += monotonic_timer.c +ramstage-y += monotonic_timer.c romstage-$(CONFIG_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM) += stage_cache.c @@ -14,7 +14,7 @@ cpu_microcode-$(CONFIG_CPU_MICROCODE_CBFS_GENERATE) += microcode_blob.c smm-$(CONFIG_HAVE_SMI_HANDLER) += finalize.c smm-$(CONFIG_HAVE_SMI_HANDLER) += tsc_freq.c -smm-$(CONFIG_MONOTONIC_TIMER_MSR) += monotonic_timer.c +smm-y += monotonic_timer.c cpu_incs += $(src)/cpu/intel/haswell/cache_as_ram.inc diff --git a/src/mainboard/google/bolt/Kconfig b/src/mainboard/google/bolt/Kconfig index 1ec399e..2239f70 100644 --- a/src/mainboard/google/bolt/Kconfig +++ b/src/mainboard/google/bolt/Kconfig @@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select EXTERNAL_MRC_BLOB - select MONOTONIC_TIMER_MSR select INTEL_INT15 select CHROMEOS_VBNV_CMOS diff --git a/src/mainboard/google/falco/Kconfig b/src/mainboard/google/falco/Kconfig index 0f020f5..a8faaab 100644 --- a/src/mainboard/google/falco/Kconfig +++ b/src/mainboard/google/falco/Kconfig @@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select EXTERNAL_MRC_BLOB - select MONOTONIC_TIMER_MSR select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT select INTEL_INT15 diff --git a/src/mainboard/google/panther/Kconfig b/src/mainboard/google/panther/Kconfig index f172166..31062ed 100644 --- a/src/mainboard/google/panther/Kconfig +++ b/src/mainboard/google/panther/Kconfig @@ -16,7 +16,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select EXTERNAL_MRC_BLOB - select MONOTONIC_TIMER_MSR select INTEL_INT15 select PHYSICAL_REC_SWITCH select CHROMEOS_VBNV_CMOS diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig index 6affd34..d6a208b 100644 --- a/src/mainboard/google/peppy/Kconfig +++ b/src/mainboard/google/peppy/Kconfig @@ -18,7 +18,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select EXTERNAL_MRC_BLOB - select MONOTONIC_TIMER_MSR select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT select INTEL_DP diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index 2857c0a..fd4cb2f 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select EXTERNAL_MRC_BLOB - select MONOTONIC_TIMER_MSR select INTEL_DP select INTEL_DDI select INTEL_INT15 diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig index b636e5b..c3e3361 100644 --- a/src/mainboard/intel/baskingridge/Kconfig +++ b/src/mainboard/intel/baskingridge/Kconfig @@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS - select MONOTONIC_TIMER_MSR select INTEL_INT15 select CHROMEOS_VBNV_CMOS

1 0

New patch to review for coreboot: a13f125 Remove Kconfig variable that has no effect
by Patrick Georgi 19 May '15

19 May '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10255 -gerrit commit a13f125e584acb64c0b1f79ecc49181c915adfce Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue May 19 21:24:15 2015 +0200 Remove Kconfig variable that has no effect DYNAMIC_CBMEM is only selected a couple of times but never declared or read. Remove it. Change-Id: I5016dac2c935d3f261001e9f388a8989540e93ae Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- src/soc/broadcom/cygnus/Kconfig | 1 - src/soc/imgtec/pistachio/Kconfig | 1 - src/soc/marvell/bg4cd/Kconfig | 1 - src/soc/nvidia/tegra132/Kconfig | 1 - src/soc/qualcomm/ipq806x/Kconfig | 1 - 5 files changed, 5 deletions(-) diff --git a/src/soc/broadcom/cygnus/Kconfig b/src/soc/broadcom/cygnus/Kconfig index 1c0eb0e..0802cf0 100644 --- a/src/soc/broadcom/cygnus/Kconfig +++ b/src/soc/broadcom/cygnus/Kconfig @@ -25,7 +25,6 @@ config SOC_BROADCOM_CYGNUS select ARCH_ROMSTAGE_ARMV7 select ARCH_VERSTAGE_ARMV7 select BOOTBLOCK_CONSOLE - select DYNAMIC_CBMEM select EARLY_CONSOLE select GENERIC_UDELAY select HAVE_MONOTONIC_TIMER diff --git a/src/soc/imgtec/pistachio/Kconfig b/src/soc/imgtec/pistachio/Kconfig index 423e988..68f6d61 100644 --- a/src/soc/imgtec/pistachio/Kconfig +++ b/src/soc/imgtec/pistachio/Kconfig @@ -21,7 +21,6 @@ config CPU_IMGTEC_PISTACHIO select CPU_MIPS - select DYNAMIC_CBMEM select GENERIC_UDELAY select HAVE_MONOTONIC_TIMER select HAVE_UART_MEMORY_MAPPED diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig index 18dda55..913f063 100644 --- a/src/soc/marvell/bg4cd/Kconfig +++ b/src/soc/marvell/bg4cd/Kconfig @@ -26,7 +26,6 @@ config SOC_MARVELL_BG4CD select ARCH_VERSTAGE_ARMV7_M select ARM_BOOTBLOCK_CUSTOM if VBOOT_VERIFY_FIRMWARE select BOOTBLOCK_CONSOLE - select DYNAMIC_CBMEM select EARLY_CONSOLE select GENERIC_UDELAY select HAVE_MONOTONIC_TIMER diff --git a/src/soc/nvidia/tegra132/Kconfig b/src/soc/nvidia/tegra132/Kconfig index f9dd14a..a6f076e 100644 --- a/src/soc/nvidia/tegra132/Kconfig +++ b/src/soc/nvidia/tegra132/Kconfig @@ -14,7 +14,6 @@ config SOC_NVIDIA_TEGRA132 select HAVE_UART_MEMORY_MAPPED select EARLY_CONSOLE select ARM_BOOTBLOCK_CUSTOM - select DYNAMIC_CBMEM select SMP select ARM64_USE_SECURE_MONITOR select GENERIC_GPIO_LIB diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig index 4132708..f07d97b 100644 --- a/src/soc/qualcomm/ipq806x/Kconfig +++ b/src/soc/qualcomm/ipq806x/Kconfig @@ -7,7 +7,6 @@ config SOC_QC_IPQ806X select ARCH_RAMSTAGE_ARMV7 select BOOTBLOCK_CONSOLE select CHROMEOS_VBNV_FLASH - select DYNAMIC_CBMEM select HAVE_UART_SPECIAL select SPI_ATOMIC_SEQUENCING select GENERIC_GPIO_LIB

1 0

New patch to review for coreboot: 1d47101 Remove Kconfig variable that has no effect
by Patrick Georgi 19 May '15

19 May '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10254 -gerrit commit 1d471019ecafe774afec443165232b59e8de310b Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue May 19 21:24:15 2015 +0200 Remove Kconfig variable that has no effect MAINBOARD_HAS_BOOTBLOCK_INIT is only declared once and selected elsewhere (with no overlap), and never read. Remove it. Change-Id: Ica1f16182b556dbf4a3b747237af74bcc4c0608c Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- src/arch/riscv/Kconfig | 4 ---- src/mainboard/cubietech/cubieboard/Kconfig | 1 - src/mainboard/google/cosmos/Kconfig | 1 - src/mainboard/google/nyan/Kconfig | 1 - src/mainboard/google/nyan_big/Kconfig | 1 - src/mainboard/google/nyan_blaze/Kconfig | 1 - src/mainboard/google/purin/Kconfig | 1 - src/mainboard/google/rush/Kconfig | 1 - src/mainboard/google/rush_ryu/Kconfig | 1 - src/mainboard/google/storm/Kconfig | 1 - src/mainboard/google/urara/Kconfig | 1 - src/mainboard/google/veyron_brain/Kconfig | 1 - src/mainboard/google/veyron_danger/Kconfig | 1 - src/mainboard/google/veyron_jerry/Kconfig | 1 - src/mainboard/google/veyron_mighty/Kconfig | 1 - src/mainboard/google/veyron_pinky/Kconfig | 1 - src/mainboard/google/veyron_rialto/Kconfig | 1 - src/mainboard/google/veyron_speedy/Kconfig | 1 - src/mainboard/ti/beaglebone/Kconfig | 1 - 19 files changed, 22 deletions(-) diff --git a/src/arch/riscv/Kconfig b/src/arch/riscv/Kconfig index f87d8d2..9618c63 100644 --- a/src/arch/riscv/Kconfig +++ b/src/arch/riscv/Kconfig @@ -24,7 +24,3 @@ config ARCH_RAMSTAGE_RISCV config RISCV_BOOTBLOCK_CUSTOM bool default n - -config MAINBOARD_HAS_BOOTBLOCK_INIT - bool - default n diff --git a/src/mainboard/cubietech/cubieboard/Kconfig b/src/mainboard/cubietech/cubieboard/Kconfig index 68145c3..5aefc22 100644 --- a/src/mainboard/cubietech/cubieboard/Kconfig +++ b/src/mainboard/cubietech/cubieboard/Kconfig @@ -5,7 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select CPU_ALLWINNER_A10 select BOARD_ROMSIZE_KB_4096 select DRIVER_XPOWERS_AXP209 - select MAINBOARD_HAS_BOOTBLOCK_INIT config MAINBOARD_DIR string diff --git a/src/mainboard/google/cosmos/Kconfig b/src/mainboard/google/cosmos/Kconfig index 99d8a64..7f70216 100644 --- a/src/mainboard/google/cosmos/Kconfig +++ b/src/mainboard/google/cosmos/Kconfig @@ -26,7 +26,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET - select MAINBOARD_HAS_BOOTBLOCK_INIT select MAINBOARD_HAS_CHROMEOS select SOC_MARVELL_BG4CD select SPI_FLASH diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig index a91eddd..4dabf7a 100644 --- a/src/mainboard/google/nyan/Kconfig +++ b/src/mainboard/google/nyan/Kconfig @@ -27,7 +27,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select EC_GOOGLE_CHROMEEC_SPI select EC_SOFTWARE_SYNC select TEGRA124_MODEL_CD570M - select MAINBOARD_HAS_BOOTBLOCK_INIT select MAINBOARD_DO_NATIVE_VGA_INIT select BOARD_ROMSIZE_KB_4096 select SPI_FLASH diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig index 9aac110..9bc0a55 100644 --- a/src/mainboard/google/nyan_big/Kconfig +++ b/src/mainboard/google/nyan_big/Kconfig @@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select EC_GOOGLE_CHROMEEC_SPI select EC_SOFTWARE_SYNC select TEGRA124_MODEL_CD570M - select MAINBOARD_HAS_BOOTBLOCK_INIT select MAINBOARD_DO_NATIVE_VGA_INIT select BOARD_ROMSIZE_KB_4096 select SPI_FLASH diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig index d7d92d6..e5bb56c 100644 --- a/src/mainboard/google/nyan_blaze/Kconfig +++ b/src/mainboard/google/nyan_blaze/Kconfig @@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select EC_SOFTWARE_SYNC select SOC_NVIDIA_TEGRA124 select TEGRA124_MODEL_CD570M - select MAINBOARD_HAS_BOOTBLOCK_INIT select MAINBOARD_HAS_CHROMEOS select MAINBOARD_DO_NATIVE_VGA_INIT select BOARD_ROMSIZE_KB_4096 diff --git a/src/mainboard/google/purin/Kconfig b/src/mainboard/google/purin/Kconfig index 2c70c29..7b1d56c 100644 --- a/src/mainboard/google/purin/Kconfig +++ b/src/mainboard/google/purin/Kconfig @@ -26,7 +26,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select CHROMEOS_VBNV_FLASH select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET - select MAINBOARD_HAS_BOOTBLOCK_INIT select MAINBOARD_HAS_CHROMEOS select SOC_BROADCOM_CYGNUS select SPI_FLASH diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig index eb64f12..f0e2420 100644 --- a/src/mainboard/google/rush/Kconfig +++ b/src/mainboard/google/rush/Kconfig @@ -29,7 +29,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH select SOC_NVIDIA_TEGRA132 select MAINBOARD_DO_SOR_INIT - select MAINBOARD_HAS_BOOTBLOCK_INIT select MAINBOARD_HAS_CHROMEOS select VIRTUAL_DEV_SWITCH select BOARD_ROMSIZE_KB_4096 diff --git a/src/mainboard/google/rush_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig index a52589e..5521d4a 100644 --- a/src/mainboard/google/rush_ryu/Kconfig +++ b/src/mainboard/google/rush_ryu/Kconfig @@ -30,7 +30,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH select SOC_NVIDIA_TEGRA132 select MAINBOARD_DO_DSI_INIT - select MAINBOARD_HAS_BOOTBLOCK_INIT select MAINBOARD_HAS_CHROMEOS select BOARD_ROMSIZE_KB_8192 select VIRTUAL_DEV_SWITCH diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig index dfa00cc..838dd82 100644 --- a/src/mainboard/google/storm/Kconfig +++ b/src/mainboard/google/storm/Kconfig @@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS select CONSOLE_CBMEM_DUMP_TO_UART select DRIVERS_I2C_WW_RING select HAVE_HARD_RESET - select MAINBOARD_HAS_BOOTBLOCK_INIT select MAINBOARD_HAS_CHROMEOS select RETURN_FROM_VERSTAGE select SPI_FLASH diff --git a/src/mainboard/google/urara/Kconfig b/src/mainboard/google/urara/Kconfig index 00a00f8..655528a 100644 --- a/src/mainboard/google/urara/Kconfig +++ b/src/mainboard/google/urara/Kconfig @@ -29,7 +29,6 @@ config BOARD_SPECIFIC_OPTIONS select SPI_FLASH_WINBOND select CPU_IMGTEC_PISTACHIO select COMMON_CBFS_SPI_WRAPPER - select MAINBOARD_HAS_BOOTBLOCK_INIT select SPI_FLASH config MAINBOARD_DIR diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig index b2ee7cd..2d6832b 100644 --- a/src/mainboard/google/veyron_brain/Kconfig +++ b/src/mainboard/google/veyron_brain/Kconfig @@ -27,7 +27,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select MAINBOARD_HAS_BOOTBLOCK_INIT select RAM_CODE_SUPPORT select RETURN_FROM_VERSTAGE select SOC_ROCKCHIP_RK3288 diff --git a/src/mainboard/google/veyron_danger/Kconfig b/src/mainboard/google/veyron_danger/Kconfig index 3986c46..01c73b4 100644 --- a/src/mainboard/google/veyron_danger/Kconfig +++ b/src/mainboard/google/veyron_danger/Kconfig @@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select MAINBOARD_HAS_BOOTBLOCK_INIT select RAM_CODE_SUPPORT select RETURN_FROM_VERSTAGE select SOC_ROCKCHIP_RK3288 diff --git a/src/mainboard/google/veyron_jerry/Kconfig b/src/mainboard/google/veyron_jerry/Kconfig index ee5f204..f2f4673 100644 --- a/src/mainboard/google/veyron_jerry/Kconfig +++ b/src/mainboard/google/veyron_jerry/Kconfig @@ -32,7 +32,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS select BOARD_ROMSIZE_KB_4096 - select MAINBOARD_HAS_BOOTBLOCK_INIT select HAVE_HARD_RESET select RETURN_FROM_VERSTAGE select SPI_FLASH diff --git a/src/mainboard/google/veyron_mighty/Kconfig b/src/mainboard/google/veyron_mighty/Kconfig index 9f0cf9a..143aba6 100644 --- a/src/mainboard/google/veyron_mighty/Kconfig +++ b/src/mainboard/google/veyron_mighty/Kconfig @@ -32,7 +32,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS select BOARD_ROMSIZE_KB_4096 - select MAINBOARD_HAS_BOOTBLOCK_INIT select HAVE_HARD_RESET select RETURN_FROM_VERSTAGE select SPI_FLASH diff --git a/src/mainboard/google/veyron_pinky/Kconfig b/src/mainboard/google/veyron_pinky/Kconfig index 1450139..04e5186 100644 --- a/src/mainboard/google/veyron_pinky/Kconfig +++ b/src/mainboard/google/veyron_pinky/Kconfig @@ -32,7 +32,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS select BOARD_ROMSIZE_KB_4096 - select MAINBOARD_HAS_BOOTBLOCK_INIT select HAVE_HARD_RESET select RETURN_FROM_VERSTAGE select SPI_FLASH diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig index 83c78c5..fe20a6b 100644 --- a/src/mainboard/google/veyron_rialto/Kconfig +++ b/src/mainboard/google/veyron_rialto/Kconfig @@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select MAINBOARD_HAS_BOOTBLOCK_INIT select RAM_CODE_SUPPORT select RETURN_FROM_VERSTAGE select SOC_ROCKCHIP_RK3288 diff --git a/src/mainboard/google/veyron_speedy/Kconfig b/src/mainboard/google/veyron_speedy/Kconfig index 5d9ddd5..4eeaa94 100644 --- a/src/mainboard/google/veyron_speedy/Kconfig +++ b/src/mainboard/google/veyron_speedy/Kconfig @@ -32,7 +32,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select MAINBOARD_HAS_BOOTBLOCK_INIT select HAVE_HARD_RESET select RETURN_FROM_VERSTAGE select SPI_FLASH diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig index 57ed9bc..3e94aa0 100644 --- a/src/mainboard/ti/beaglebone/Kconfig +++ b/src/mainboard/ti/beaglebone/Kconfig @@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select CPU_TI_AM335X select BOARD_ROMSIZE_KB_4096 - select MAINBOARD_HAS_BOOTBLOCK_INIT config MAINBOARD_DIR string

1 0

New patch to review for coreboot: ba09df4 Remove Kconfig variable that has no effect
by Patrick Georgi 19 May '15

19 May '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10253 -gerrit commit ba09df40abdaaa6c097941d440319255d146669d Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Tue May 19 21:24:15 2015 +0200 Remove Kconfig variable that has no effect CPU_HAS_BOOTBLOCK_INIT is only declared once and selected elsewhere (with no overlap), and never read. Remove it. Change-Id: I3f294b0724a87876a7e2f274e6933fe10321a69d Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- src/arch/riscv/Kconfig | 4 ---- src/cpu/allwinner/a10/Kconfig | 1 - src/cpu/ti/am335x/Kconfig | 1 - src/soc/broadcom/cygnus/Kconfig | 1 - src/soc/marvell/bg4cd/Kconfig | 1 - src/soc/rockchip/rk3288/Kconfig | 1 - src/soc/samsung/exynos5250/Kconfig | 1 - src/soc/samsung/exynos5420/Kconfig | 1 - 8 files changed, 11 deletions(-) diff --git a/src/arch/riscv/Kconfig b/src/arch/riscv/Kconfig index 5d7b5c2..f87d8d2 100644 --- a/src/arch/riscv/Kconfig +++ b/src/arch/riscv/Kconfig @@ -25,10 +25,6 @@ config RISCV_BOOTBLOCK_CUSTOM bool default n -config CPU_HAS_BOOTBLOCK_INIT - bool - default n - config MAINBOARD_HAS_BOOTBLOCK_INIT bool default n diff --git a/src/cpu/allwinner/a10/Kconfig b/src/cpu/allwinner/a10/Kconfig index e481af0..ce68476 100644 --- a/src/cpu/allwinner/a10/Kconfig +++ b/src/cpu/allwinner/a10/Kconfig @@ -13,7 +13,6 @@ config CPU_SPECIFIC_OPTIONS select HAVE_MONOTONIC_TIMER select HAVE_UART_SPECIAL select BOOTBLOCK_CONSOLE - select CPU_HAS_BOOTBLOCK_INIT ## TODO Change this to some better address not overlapping bootblock when ## cbfstool supports creating header in arbitrary location. diff --git a/src/cpu/ti/am335x/Kconfig b/src/cpu/ti/am335x/Kconfig index 0150e16..8d3c691 100644 --- a/src/cpu/ti/am335x/Kconfig +++ b/src/cpu/ti/am335x/Kconfig @@ -6,7 +6,6 @@ config CPU_TI_AM335X select HAVE_MONOTONIC_TIMER select HAVE_UART_SPECIAL select BOOTBLOCK_CONSOLE - select CPU_HAS_BOOTBLOCK_INIT select GENERIC_UDELAY bool default n diff --git a/src/soc/broadcom/cygnus/Kconfig b/src/soc/broadcom/cygnus/Kconfig index b2f0613..1c0eb0e 100644 --- a/src/soc/broadcom/cygnus/Kconfig +++ b/src/soc/broadcom/cygnus/Kconfig @@ -25,7 +25,6 @@ config SOC_BROADCOM_CYGNUS select ARCH_ROMSTAGE_ARMV7 select ARCH_VERSTAGE_ARMV7 select BOOTBLOCK_CONSOLE - select CPU_HAS_BOOTBLOCK_INIT select DYNAMIC_CBMEM select EARLY_CONSOLE select GENERIC_UDELAY diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig index 9c0dc14..18dda55 100644 --- a/src/soc/marvell/bg4cd/Kconfig +++ b/src/soc/marvell/bg4cd/Kconfig @@ -26,7 +26,6 @@ config SOC_MARVELL_BG4CD select ARCH_VERSTAGE_ARMV7_M select ARM_BOOTBLOCK_CUSTOM if VBOOT_VERIFY_FIRMWARE select BOOTBLOCK_CONSOLE - select CPU_HAS_BOOTBLOCK_INIT select DYNAMIC_CBMEM select EARLY_CONSOLE select GENERIC_UDELAY diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig index 4cdbeea..f659c8f 100644 --- a/src/soc/rockchip/rk3288/Kconfig +++ b/src/soc/rockchip/rk3288/Kconfig @@ -24,7 +24,6 @@ config SOC_ROCKCHIP_RK3288 select ARCH_VERSTAGE_ARMV7 select ARCH_ROMSTAGE_ARMV7 select ARCH_RAMSTAGE_ARMV7 - select CPU_HAS_BOOTBLOCK_INIT select HAVE_MONOTONIC_TIMER select GENERIC_UDELAY select HAVE_UART_MEMORY_MAPPED diff --git a/src/soc/samsung/exynos5250/Kconfig b/src/soc/samsung/exynos5250/Kconfig index ea63e9c..2008650 100644 --- a/src/soc/samsung/exynos5250/Kconfig +++ b/src/soc/samsung/exynos5250/Kconfig @@ -3,7 +3,6 @@ config CPU_SAMSUNG_EXYNOS5250 select ARCH_VERSTAGE_ARMV7 select ARCH_ROMSTAGE_ARMV7 select ARCH_RAMSTAGE_ARMV7 - select CPU_HAS_BOOTBLOCK_INIT select HAVE_MONOTONIC_TIMER select GENERIC_UDELAY select HAVE_UART_SPECIAL diff --git a/src/soc/samsung/exynos5420/Kconfig b/src/soc/samsung/exynos5420/Kconfig index 56ffed1..02c71c0 100644 --- a/src/soc/samsung/exynos5420/Kconfig +++ b/src/soc/samsung/exynos5420/Kconfig @@ -3,7 +3,6 @@ config CPU_SAMSUNG_EXYNOS5420 select ARCH_VERSTAGE_ARMV7 select ARCH_ROMSTAGE_ARMV7 select ARCH_RAMSTAGE_ARMV7 - select CPU_HAS_BOOTBLOCK_INIT select HAVE_MONOTONIC_TIMER select GENERIC_UDELAY select HAVE_UART_SPECIAL

1 0

Patch set updated for coreboot: 167a202 VBT parser.
by Vladimir Serbinenko 19 May '15

19 May '15

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5842 -gerrit commit 167a202fc809a1de00fb569143f4a6bf110e360b Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Sat May 24 16:34:29 2014 +0200 VBT parser. Change-Id: I32f6505dbf683478bf5a25b73db7ab0c60eff29c Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- util/intelvbttool/intelvbttool.c | 441 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 441 insertions(+) diff --git a/util/intelvbttool/intelvbttool.c b/util/intelvbttool/intelvbttool.c new file mode 100644 index 0000000..3ac2fd7 --- /dev/null +++ b/util/intelvbttool/intelvbttool.c @@ -0,0 +1,441 @@ +#include <stdio.h> +#include <sys/mman.h> +#include <stdint.h> +#include <string.h> +#include <stdlib.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <errno.h> + +typedef uint8_t u8; +typedef uint16_t u16; +typedef uint32_t u32; + + +typedef struct { + u16 signature; + u8 size; + u8 reserved[21]; + u16 pcir_offset; + u16 vbt_offset; +} __attribute__((packed)) optionrom_header_t; + +struct vbt_header { + u8 signature[20]; + u16 version; + u16 header_size; + u16 vbt_size; + u8 vbt_checksum; + u8 reserved0; + u32 bdb_offset; + u32 aim_offset[4]; +} __attribute__((packed)); + +struct bdb_header { + u8 signature[16]; + u16 version; + u16 header_size; + u16 bdb_size; +}; + +struct vbios_data { + u8 type; /* 0 == desktop, 1 == mobile */ + u8 relstage; + u8 chipset; + u8 lvds_present:1; + u8 tv_present:1; + u8 rsvd2:6; /* finish byte */ + u8 rsvd3[4]; + u8 signon[155]; + u8 copyright[61]; + u16 code_segment; + u8 dos_boot_mode; + u8 bandwidth_percent; + u8 rsvd4; /* popup memory size */ + u8 resize_pci_bios; + u8 rsvd5; /* is crt already on ddc2 */ +} __attribute__((packed)); + +struct bdb_general_features { + /* bits 1 */ + u8 panel_fitting:2; + u8 flexaim:1; + u8 msg_enable:1; + u8 clear_screen:3; + u8 color_flip:1; + + /* bits 2 */ + u8 download_ext_vbt:1; + u8 enable_ssc:1; + u8 ssc_freq:1; + u8 enable_lfp_on_override:1; + u8 disable_ssc_ddt:1; + u8 rsvd7:1; + u8 display_clock_mode:1; + u8 rsvd8:1; /* finish byte */ + + /* bits 3 */ + u8 disable_smooth_vision:1; + u8 single_dvi:1; + u8 rsvd9:1; + u8 fdi_rx_polarity_inverted:1; + u8 rsvd10:4; /* finish byte */ + + /* bits 4 */ + u8 legacy_monitor_detect; + + /* bits 5 */ + u8 int_crt_support:1; + u8 int_tv_support:1; + u8 int_efp_support:1; + u8 dp_ssc_enb:1; /* PCH attached eDP supports SSC */ + u8 dp_ssc_freq:1; /* SSC freq for PCH attached eDP */ + u8 rsvd11:3; /* finish byte */ +} __attribute__((packed)); + +struct common_child_dev_config { + u16 handle; + u16 device_type; + u8 not_common1[12]; + u8 dvo_port; + u8 i2c_pin; + u8 slave_addr; + u8 ddc_pin; + u16 edid_ptr; + u8 not_common3[6]; + u8 dvo_wiring; + u8 not_common4[4]; +} __attribute__((packed)); + +struct bdb_general_definitions { + /* DDC GPIO */ + u8 crt_ddc_gmbus_pin; + + /* DPMS bits */ + u8 dpms_acpi:1; + u8 skip_boot_crt_detect:1; + u8 dpms_aim:1; + u8 rsvd1:5; /* finish byte */ + + /* boot device bits */ + u8 boot_display[2]; + u8 child_dev_size; + + /* + * Device info: + * If TV is present, it'll be at devices[0]. + * LVDS will be next, either devices[0] or [1], if present. + * On some platforms the number of device is 6. But could be as few as + * 4 if both TV and LVDS are missing. + * And the device num is related with the size of general definition + * block. It is obtained by using the following formula: + * number = (block_size - sizeof(bdb_general_definitions))/ + * sizeof(child_device_config); + */ + struct common_child_dev_config devices[0]; +} __attribute__((packed)); + +struct bdb_driver_features { + u8 boot_dev_algorithm:1; + u8 block_display_switch:1; + u8 allow_display_switch:1; + u8 hotplug_dvo:1; + u8 dual_view_zoom:1; + u8 int15h_hook:1; + u8 sprite_in_clone:1; + u8 primary_lfp_id:1; + + u16 boot_mode_x; + u16 boot_mode_y; + u8 boot_mode_bpp; + u8 boot_mode_refresh; + + u16 enable_lfp_primary:1; + u16 selective_mode_pruning:1; + u16 dual_frequency:1; + u16 render_clock_freq:1; /* 0: high freq; 1: low freq */ + u16 nt_clone_support:1; + u16 power_scheme_ui:1; /* 0: CUI; 1: 3rd party */ + u16 sprite_display_assign:1; /* 0: secondary; 1: primary */ + u16 cui_aspect_scaling:1; + u16 preserve_aspect_ratio:1; + u16 sdvo_device_power_down:1; + u16 crt_hotplug:1; + u16 lvds_config:2; + u16 tv_hotplug:1; + u16 hdmi_config:2; + + u8 static_display:1; + u8 reserved2:7; + u16 legacy_crt_max_x; + u16 legacy_crt_max_y; + u8 legacy_crt_max_refresh; + + u8 hdmi_termination; + u8 custom_vbt_version; +} __attribute__((packed)); + +struct bdb_lvds_options { + u8 panel_type; + u8 rsvd1; + /* LVDS capabilities, stored in a dword */ + u8 pfit_mode:2; + u8 pfit_text_mode_enhanced:1; + u8 pfit_gfx_mode_enhanced:1; + u8 pfit_ratio_auto:1; + u8 pixel_dither:1; + u8 lvds_edid:1; + u8 rsvd2:1; + u8 rsvd4; +} __attribute__((packed)); + +struct bdb_sdvo_lvds_options { + u8 panel_backlight; + u8 h40_set_panel_type; + u8 panel_type; + u8 ssc_clk_freq; + u16 als_low_trip; + u16 als_high_trip; + u8 sclalarcoeff_tab_row_num; + u8 sclalarcoeff_tab_row_size; + u8 coefficient[8]; + u8 panel_misc_bits_1; + u8 panel_misc_bits_2; + u8 panel_misc_bits_3; + u8 panel_misc_bits_4; +} __attribute__((packed)); + + +#define BDB_GENERAL_FEATURES 1 +#define BDB_GENERAL_DEFINITIONS 2 + +#define BDB_DRIVER_FEATURES 12 +#define BDB_SDVO_LVDS_OPTIONS 22 +#define BDB_SDVO_PANEL_DTDS 23 +#define BDB_LVDS_OPTIONS 40 +#define BDB_LVDS_LFP_DATA_PTRS 41 +#define BDB_LVDS_LFP_DATA 42 + +#define BDB_SKIP 254 + +static void parse_vbt(const void *vbt) +{ + const struct vbt_header *head = vbt; + const struct bdb_header *bdb; + int i; + const u8 *ptr; + int is_first_skip = 1; + + if (memcmp(head->signature, "$VBT", 4) != 0) { + fprintf (stderr, "invalid VBT signature\n"); + exit(1); + } + printf ("signature: <%20.20s>\n", head->signature); + printf ("version: %d.%02d\n", head->version / 100, + head->version % 100); + if (head->header_size != sizeof (struct vbt_header)) + printf ("header size: 0x%x\n", head->header_size); + printf ("VBT size: 0x%x\n", head->vbt_size); + printf ("VBT checksum: 0x%x\n", head->vbt_checksum); + if (head->reserved0) + printf ("header reserved0: 0x%x\n", head->reserved0); + if (head->bdb_offset != sizeof (struct vbt_header)) + printf ("BDB offset: 0x%x\n", head->bdb_offset); + + for (i = 0; i < 4; i++) + if (head->aim_offset[i]) + printf ("AIM[%d] offset: 0x%x\n", i, + head->aim_offset[i]); + bdb = (const void *) ((const char *) vbt + head->bdb_offset); + + if (memcmp ("BIOS_DATA_BLOCK ", bdb->signature, 16) != 0) { + fprintf(stderr, "invalid BDB signature:%s\n", + bdb->signature); + exit (1); + } + printf ("BDB version: %d.%02d\n", bdb->version / 100, + bdb->version % 100); + if (bdb->header_size != sizeof (struct bdb_header)) + printf ("BDB header size: 0x%x\n", bdb->header_size); + if (bdb->bdb_size != head->vbt_size - head->bdb_offset) + printf ("BDB size: 0x%x\n", bdb->bdb_size); + for (ptr = (const u8 *) bdb + bdb->header_size; + ptr < (const u8 *) bdb + bdb->bdb_size;) { + u16 secsz = (ptr[1] | (ptr[2] << 8)); + u8 sectype = ptr[0]; + const u8 *section = ptr + 3; + + printf ("section type %d, size 0x%x\n", sectype, secsz); + ptr += secsz + 3; + switch(sectype) + { + case BDB_GENERAL_FEATURES: { + const struct bdb_general_features *sec = (const void *) section; + printf ("General features:\n"); + + if(sec->panel_fitting) printf("\tpanel_fitting = 0x%x\n", sec->panel_fitting); + if(sec->flexaim) printf("\tflexaim = 0x%x\n", sec->flexaim); + if(sec->msg_enable) printf("\tmsg_enable = 0x%x\n", sec->msg_enable); + if(sec->clear_screen) printf("\tclear_screen = 0x%x\n", sec->clear_screen); + if(sec->color_flip) printf("\tcolor_flip = 0x%x\n", sec->color_flip); + if(sec->download_ext_vbt) printf("\tdownload_ext_vbt = 0x%x\n", sec->download_ext_vbt); + printf("\t*enable_ssc = 0x%x\n", sec->enable_ssc); + printf("\t*ssc_freq = 0x%x\n", sec->ssc_freq); + if(sec->enable_lfp_on_override) printf("\tenable_lfp_on_override = 0x%x\n", sec->enable_lfp_on_override); + if(sec->disable_ssc_ddt) printf("\tdisable_ssc_ddt = 0x%x\n", sec->disable_ssc_ddt); + if(sec->rsvd7) printf("\trsvd7 = 0x%x\n", sec->rsvd7); + printf("\t*display_clock_mode = 0x%x\n", sec->display_clock_mode); + if(sec->rsvd8) printf("\trsvd8 = 0x%x\n", sec->rsvd8); + printf("\tdisable_smooth_vision = 0x%x\n", sec->disable_smooth_vision); + if(sec->single_dvi) printf("\tsingle_dvi = 0x%x\n", sec->single_dvi); + if(sec->rsvd9) printf("\trsvd9 = 0x%x\n", sec->rsvd9); + printf("\t*fdi_rx_polarity_inverted = 0x%x\n", sec->fdi_rx_polarity_inverted); + if(sec->rsvd10) printf("\trsvd10 = 0x%x\n", sec->rsvd10); + if(sec->legacy_monitor_detect) printf("\tlegacy_monitor_detect = 0x%x\n", sec->legacy_monitor_detect); + printf("\t*int_crt_support = 0x%x\n", sec->int_crt_support); + printf("\t*int_tv_support = 0x%x\n", sec->int_tv_support); + if(sec->int_efp_support) printf("\tint_efp_support = 0x%x\n", sec->int_efp_support); + if(sec->dp_ssc_enb) printf("\tdp_ssc_enb = 0x%x\n", sec->dp_ssc_enb); + if(sec->dp_ssc_freq) printf("\tdp_ssc_freq = 0x%x\n", sec->dp_ssc_freq); + if(sec->rsvd11) printf("\trsvd11 = 0x%x\n", sec->rsvd11); + break; + } + case BDB_DRIVER_FEATURES: { + const struct bdb_driver_features *sec = (const void *) section; + printf("\t*LVDS config: %d\n", sec->lvds_config); + printf("\t*Dual frequency: %d\n", sec->dual_frequency); + + break; + } + case BDB_SDVO_LVDS_OPTIONS: { + const struct bdb_sdvo_lvds_options *sec = (const void *) section; + printf("\t*Panel type: %d\n", sec->panel_type); + + break; + } + case BDB_GENERAL_DEFINITIONS: { + const struct bdb_general_definitions *sec = (const void *) section; + printf("\t*CRT DDC GMBUS pin: %d\n", sec->crt_ddc_gmbus_pin); + + printf("\tDPMS ACPI: %d\n", sec->dpms_acpi); + printf("\tSkip boot CRT detect: %d\n", + sec->skip_boot_crt_detect); + printf("\tDPMS aim: %d\n", + sec->dpms_aim); + if(sec->rsvd1) + printf("\trsvd1: 0x%x\n", sec->rsvd1); + printf("\tboot_display: { %x, %x }\n", + sec->boot_display[0], sec->boot_display[1]); + if (sec->child_dev_size != sizeof(struct common_child_dev_config)) + printf("\tchild_dev_size: %d\n", + sec->child_dev_size); + printf("\t%d devices\n", (secsz - sizeof (*sec)) / sizeof(struct common_child_dev_config)); + for (i = 0; i < (secsz - sizeof (*sec)) / sizeof(struct common_child_dev_config); i++) { + printf ("\t*device type: %x ", + sec->devices[i].device_type); +#define DEVICE_TYPE_INT_LFP 0x1022 +#define DEVICE_TYPE_INT_TV 0x1009 +#define DEVICE_TYPE_EFP_DVI_HOTPLUG_PWR 0x6052 + switch (sec->devices[i].device_type) { + case DEVICE_TYPE_INT_LFP: + printf("(flat panel)\n"); + break; + case DEVICE_TYPE_INT_TV: + printf("(TV)\n"); + break; + case DEVICE_TYPE_EFP_DVI_HOTPLUG_PWR: + printf("(DVI)\n"); + break; + case 0: + printf("(Empty)\n"); + break; + default: + printf("(Unknown)\n"); + break; + } + if (!sec->devices[i].device_type) + continue; + printf ("\t *dvo_port: %x\n", sec->devices[i].dvo_port); + printf ("\t *i2c_pin: %x\n", sec->devices[i].i2c_pin); + printf ("\t *slave_addr: %x\n", sec->devices[i].slave_addr); + printf ("\t *ddc_pin: %x\n", sec->devices[i].ddc_pin); + printf ("\t *dvo_wiring: %x\n", sec->devices[i].dvo_wiring); + printf ("\t edid_ptr: %x\n", sec->devices[i].edid_ptr); + } + + break; + } + case BDB_SKIP: { + const struct vbios_data *sec = (const void *) section; + if (!is_first_skip) + break; + is_first_skip = 0; + printf("\ttype: %x\n", sec->type); + printf("\trelstage: %x\n", sec->relstage); + printf("\tchipset: %x\n", sec->chipset); + printf(sec->lvds_present ? "\tLVDS\n" + : "\tNo LVDS\n"); + printf(sec->tv_present ? "\tTV\n" + : "\tNo TV\n"); + if (sec->rsvd2) + printf("\trsvd2: 0x%x\n", sec->rsvd2); + for (i = 0; i < 4; i++) + if (sec->rsvd3[i]) + printf("\trsvd3[%d]: 0x%x\n", i, + sec->rsvd3[i]); + printf("\tSignon: %.155s\n", sec->signon); + printf("\tCopyright: %.155s\n", sec->copyright); + printf("\tCode segment: %x\n", sec->code_segment); + printf("\tDOS Boot mode: %x\n", sec->dos_boot_mode); + printf("\tBandwidth percent: %x\n", + sec->bandwidth_percent); + if (sec->rsvd4) + printf("\trsvd4: 0x%x\n", sec->rsvd4); + printf("\tBandwidth percent: %x\n", + sec->resize_pci_bios); + if (sec->rsvd5) + printf("\trsvd5: 0x%x\n", sec->rsvd5); + break; + } + } + } + +} + +static void parse_vbios(const void *ptr) +{ + const optionrom_header_t *oh; + oh = ptr; + if (oh->signature != 0xaa55) { + fprintf(stderr, "bad oprom signature: %x\n", oh->signature); + return; + } + if (!oh->vbt_offset) { + fprintf(stderr, "no VBT found\n"); + return; + } + parse_vbt((const char *) ptr + oh->vbt_offset); +} + +int +main (int argc, char **argv) +{ + const void *ptr; + int fd; + if (argc == 2) { + fd = open(argv[1], O_RDONLY); + ptr = mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0); + } else { + fd = open("/dev/mem", O_RDONLY); + ptr = mmap(0, 65536, PROT_READ, MAP_SHARED, fd, 0xc0000); + } + if (ptr == MAP_FAILED) { + fprintf (stderr, "mmap failed: %s\n", strerror (errno)); + return 1; + } + parse_vbios(ptr); + close (fd); + return 0; +}

1 0

Patch set updated for coreboot: 80b88e9 i82801gx: Reserve LPC decodes.
by Vladimir Serbinenko 19 May '15

19 May '15

Vladimir Serbinenko (phcoder(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7662 -gerrit commit 80b88e97697833bf3ab553f622ebd24d917c52ec Author: Vladimir Serbinenko <phcoder(a)gmail.com> Date: Mon Nov 24 21:05:56 2014 +0100 i82801gx: Reserve LPC decodes. Makes sure that LPC controller declares resources that it actually decodes. bd82x6x already does it but i82801gx doesn't leading to allocator potentially allocating something else to the same range. Change-Id: Ieca9852e54c08e31d4d41aea97f317d9a6919806 Signed-off-by: Vladimir Serbinenko <phcoder(a)gmail.com> --- src/southbridge/intel/i82801gx/lpc.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/southbridge/intel/i82801gx/lpc.c b/src/southbridge/intel/i82801gx/lpc.c index 9dbb3ec..6466038 100644 --- a/src/southbridge/intel/i82801gx/lpc.c +++ b/src/southbridge/intel/i82801gx/lpc.c @@ -579,18 +579,20 @@ void acpi_fill_fadt(acpi_fadt_t * fadt) static void i82801gx_lpc_read_resources(device_t dev) { struct resource *res; + u8 io_index = 0; + int i; /* Get the normal PCI resources of this device. */ pci_dev_read_resources(dev); /* Add an extra subtractive resource for both memory and I/O. */ - res = new_resource(dev, IOINDEX_SUBTRACTIVE(0, 0)); + res = new_resource(dev, IOINDEX_SUBTRACTIVE(io_index++, 0)); res->base = 0; res->size = 0x1000; res->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; - res = new_resource(dev, IOINDEX_SUBTRACTIVE(1, 0)); + res = new_resource(dev, IOINDEX_SUBTRACTIVE(io_index++, 0)); res->base = 0xff800000; res->size = 0x00800000; /* 8 MB for flash */ res->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE | @@ -600,6 +602,20 @@ static void i82801gx_lpc_read_resources(device_t dev) res->base = IO_APIC_ADDR; res->size = 0x00001000; res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; + + /* Set IO decode ranges if required.*/ + for (i = 0; i < 4; i++) { + u32 gen_dec; + gen_dec = pci_read_config32(dev, 0x84 + 4 * i); + + if ((gen_dec & 0xFFFC) > 0x1000) { + res = new_resource(dev, IOINDEX_SUBTRACTIVE(io_index++, 0)); + res->base = gen_dec & 0xFFFC; + res->size = (gen_dec >> 16) & 0xFC; + res->flags = IORESOURCE_IO | IORESOURCE_SUBTRACTIVE | + IORESOURCE_ASSIGNED | IORESOURCE_FIXED; + } + } } static void set_subsystem(device_t dev, unsigned vendor, unsigned device)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit May 2015