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>
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index e38f856..d101f45 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -177,51 +177,19 @@
static void *load_stage_from_cbfs(struct cbfs_media *media, const char *name,
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;
+ struct rmod_stage_load rmod_ram = {
+ .cbmem_id = CBMEM_ID_RAMSTAGE,
+ .name = name,
+ };
- stage = (struct cbfs_stage *)
- cbfs_get_file_content(media, name, CBFS_TYPE_STAGE, NULL);
-
- if (stage == NULL)
+ if (rmodule_stage_load_from_cbfs(&rmod_ram)) {
+ printk(BIOS_DEBUG, "Could not load ramstage.\n");
return (void *) -1;
+ }
- rmodule_offset =
- rmodule_calc_region(DYN_CBMEM_ALIGN_SIZE,
- stage->memlen, ®ion_size, &load_offset);
+ cache_loaded_ramstage(handoff, rmod_ram.cbmem_entry, rmod_ram.entry);
- ramstage_entry = cbmem_entry_add(CBMEM_ID_RAMSTAGE, region_size);
-
- if (ramstage_entry == NULL)
- return (void *) -1;
-
- ramstage_region = cbmem_entry_start(ramstage_entry);
-
- LOG("Decompressing stage %s @ 0x%p (%d bytes)\n",
- name, &ramstage_region[rmodule_offset], stage->memlen);
-
- if (!cbfs_decompress(stage->compression, &stage[1],
- &ramstage_region[rmodule_offset], stage->len))
- return (void *) -1;
-
- if (rmodule_parse(&ramstage_region[rmodule_offset], &ramstage))
- return (void *) -1;
-
- /* The ramstage is responsible for clearing its own bss. */
- if (rmodule_load(&ramstage_region[load_offset], &ramstage))
- return (void *) -1;
-
- entry_point = rmodule_entry(&ramstage);
-
- cache_loaded_ramstage(handoff, ramstage_entry, entry_point);
-
- return entry_point;
+ return rmod_ram.entry;
}
void * cbfs_load_stage(struct cbfs_media *media, const char *name)
diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c
index 462c7d7..a3e2184 100644
--- a/src/lib/rmodule.c
+++ b/src/lib/rmodule.c
@@ -300,3 +300,64 @@
return region_alignment - sizeof(struct rmodule_header);
}
+
+#if CONFIG_DYNAMIC_CBMEM
+#include <cbmem.h>
+#include <cbfs_core.h>
+
+int rmodule_stage_load(struct rmod_stage_load *rsl, struct cbfs_stage *stage)
+{
+ struct rmodule rmod_stage;
+ size_t region_size;
+ char *stage_region;
+ int rmodule_offset;
+ int load_offset;
+ const struct cbmem_entry *cbmem_entry;
+
+ if (stage == NULL || rsl->name == NULL)
+ return -1;
+
+ rmodule_offset =
+ rmodule_calc_region(DYN_CBMEM_ALIGN_SIZE,
+ stage->memlen, ®ion_size, &load_offset);
+
+ cbmem_entry = cbmem_entry_add(rsl->cbmem_id, region_size);
+
+ if (cbmem_entry == NULL)
+ return -1;
+
+ stage_region = cbmem_entry_start(cbmem_entry);
+
+ printk(BIOS_INFO, "Decompressing stage %s @ 0x%p (%d bytes)\n",
+ rsl->name, &stage_region[rmodule_offset], stage->memlen);
+
+ if (!cbfs_decompress(stage->compression, &stage[1],
+ &stage_region[rmodule_offset], stage->len))
+ return -1;
+
+ if (rmodule_parse(&stage_region[rmodule_offset], &rmod_stage))
+ return -1;
+
+ if (rmodule_load(&stage_region[load_offset], &rmod_stage))
+ return -1;
+
+ rsl->cbmem_entry = cbmem_entry;
+ rsl->entry = rmodule_entry(&rmod_stage);
+
+ return 0;
+}
+
+int rmodule_stage_load_from_cbfs(struct rmod_stage_load *rsl)
+{
+ struct cbfs_stage *stage;
+
+ stage = cbfs_get_file_content(CBFS_DEFAULT_MEDIA,
+ rsl->name, CBFS_TYPE_STAGE, NULL);
+
+ if (stage == NULL)
+ return -1;
+
+ return rmodule_stage_load(rsl, stage);
+}
+
+#endif /* DYNAMIC_CBMEM */