summaryrefslogtreecommitdiff
path: root/src/vendorcode/google
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2013-10-24 10:14:06 -0500
committerAaron Durbin <adurbin@google.com>2014-01-28 22:29:42 +0100
commitf545abfd22a594ecb9c0678efa5278bb38a37a70 (patch)
tree60c77bc89c52293a316acc2fba2da3897ebeaea2 /src/vendorcode/google
parent16000c883ee121b82b943c613ab1ae6a5ed7e01c (diff)
downloadcoreboot-f545abfd22a594ecb9c0678efa5278bb38a37a70.tar.xz
rmodule: consolidate rmodule stage loading
There are 3 places rmodule stages are loaded in the existing code: cbfs and 2 in vboot_wrapper. Much of the code is the same except for a few different cbmem entry ids. Instead provide a common implementation in the rmodule library itself. A structure named rmod_stage_load is introduced to manage the inputs and outputs from the new API. BUG=chrome-os-partner:22866 BRANCH=None TEST=Built and booted successfully. Change-Id: I146055005557e04164e95de4aae8a2bde8713131 Signed-off-by: Aaron Durbin <adurbin@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/174425 Reviewed-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: http://review.coreboot.org/4897 Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@google.com>
Diffstat (limited to 'src/vendorcode/google')
-rw-r--r--src/vendorcode/google/chromeos/vboot_loader.c95
1 files changed, 18 insertions, 77 deletions
diff --git a/src/vendorcode/google/chromeos/vboot_loader.c b/src/vendorcode/google/chromeos/vboot_loader.c
index 91f6237810..6eff99cec9 100644
--- a/src/vendorcode/google/chromeos/vboot_loader.c
+++ b/src/vendorcode/google/chromeos/vboot_loader.c
@@ -37,59 +37,26 @@
static void vboot_run_stub(struct vboot_context *context)
{
- const struct cbmem_entry *vboot_entry;
- struct rmodule vbootstub;
- struct cbfs_stage *stage;
- size_t region_size;
- int rmodule_offset;
- int load_offset;
- char *vboot_region;
+ struct rmod_stage_load rmod_stage = {
+ .cbmem_id = 0xffffffff,
+ .name = CONFIG_CBFS_PREFIX "/vboot",
+ };
void (*entry)(struct vboot_context *context);
- stage = cbfs_get_file_content(CBFS_DEFAULT_MEDIA,
- CONFIG_CBFS_PREFIX "/vboot",
- CBFS_TYPE_STAGE, NULL);
-
- if (stage == NULL)
- return;
-
- rmodule_offset =
- rmodule_calc_region(DYN_CBMEM_ALIGN_SIZE,
- stage->memlen, &region_size, &load_offset);
-
- vboot_entry = cbmem_entry_add(0xffffffff, region_size);
-
- if (vboot_entry == NULL) {
- printk(BIOS_DEBUG, "Couldn't get region for vboot stub.\n");
- return;
- }
-
- vboot_region = cbmem_entry_start(vboot_entry);
-
- if (!cbfs_decompress(stage->compression, &stage[1],
- &vboot_region[rmodule_offset], stage->len)) {
- printk(BIOS_DEBUG, "Couldn't decompress vboot stub.\n");
+ if (rmodule_stage_load_from_cbfs(&rmod_stage)) {
+ printk(BIOS_DEBUG, "Could not load vboot stub.\n");
goto out;
}
- if (rmodule_parse(&vboot_region[rmodule_offset], &vbootstub)) {
- printk(BIOS_DEBUG, "Couldn't parse vboot stub rmodule.\n");
- goto out;
- }
-
- if (rmodule_load(&vboot_region[load_offset], &vbootstub)) {
- printk(BIOS_DEBUG, "Couldn't load vboot stub.\n");
- goto out;
- }
-
- entry = rmodule_entry(&vbootstub);
+ entry = rmod_stage.entry;
/* Call stub. */
entry(context);
out:
/* Tear down the region no longer needed. */
- cbmem_entry_remove(vboot_entry);
+ if (rmod_stage.cbmem_entry != NULL)
+ cbmem_entry_remove(rmod_stage.cbmem_entry);
}
/* Helper routines for the vboot stub. */
@@ -175,14 +142,11 @@ static void vboot_load_ramstage(struct vboot_handoff *vboot_handoff,
struct romstage_handoff *handoff)
{
struct cbfs_stage *stage;
- struct rmodule ramstage;
- void *entry_point;
- size_t region_size;
- char *ramstage_region;
- int rmodule_offset;
- int load_offset;
- const struct cbmem_entry *ramstage_entry;
const struct firmware_component *fwc;
+ struct rmod_stage_load rmod_load = {
+ .cbmem_id = CBMEM_ID_RAMSTAGE,
+ .name = CONFIG_CBFS_PREFIX "/coreboot_ram",
+ };
if (CONFIG_VBOOT_RAMSTAGE_INDEX >= MAX_PARSED_FW_COMPONENTS) {
printk(BIOS_ERR, "Invalid ramstage index: %d\n",
@@ -202,45 +166,22 @@ static void vboot_load_ramstage(struct vboot_handoff *vboot_handoff,
stage = (void *)fwc->address;
- rmodule_offset =
- rmodule_calc_region(DYN_CBMEM_ALIGN_SIZE,
- stage->memlen, &region_size, &load_offset);
-
- ramstage_entry = cbmem_entry_add(CBMEM_ID_RAMSTAGE, region_size);
+ timestamp_add_now(TS_START_COPYRAM);
- if (ramstage_entry == NULL) {
+ if (rmodule_stage_load(&rmod_load, stage)) {
vboot_handoff->selected_firmware = VB_SELECT_FIRMWARE_READONLY;
- printk(BIOS_DEBUG, "Could not add ramstage region.\n");
+ printk(BIOS_DEBUG, "Could not load ramstage region.\n");
return;
}
- timestamp_add_now(TS_START_COPYRAM);
-
- ramstage_region = cbmem_entry_start(ramstage_entry);
-
- printk(BIOS_DEBUG, "Decompressing ramstage @ 0x%p (%d bytes)\n",
- &ramstage_region[rmodule_offset], stage->memlen);
-
- if (!cbfs_decompress(stage->compression, &stage[1],
- &ramstage_region[rmodule_offset], stage->len))
- return;
-
- if (rmodule_parse(&ramstage_region[rmodule_offset], &ramstage))
- return;
-
- if (rmodule_load(&ramstage_region[load_offset], &ramstage))
- return;
-
- entry_point = rmodule_entry(&ramstage);
-
- cache_loaded_ramstage(handoff, ramstage_entry, entry_point);
+ cache_loaded_ramstage(handoff, rmod_load.cbmem_entry, rmod_load.entry);
timestamp_add_now(TS_END_COPYRAM);
__asm__ volatile (
"movl $0, %%ebp\n"
"jmp *%%edi\n"
- :: "D"(entry_point)
+ :: "D"(rmod_load.entry)
);
}