From d87e4b346943110a6d919aa52444bb420e2755be Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Tue, 5 Sep 2017 22:43:05 +0300 Subject: stage_cache: Add rmodule params in metadata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The change allows to update rmodule parameters after it has been loaded from stage cache. Change-Id: Ib825ffe245d447ad3a8246f7dbd52c6e34103a0c Signed-off-by: Kyösti Mälkki Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/21385 Tested-by: build bot (Jenkins) --- src/lib/cbmem_stage_cache.c | 4 +++- src/lib/rmodule.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/lib') diff --git a/src/lib/cbmem_stage_cache.c b/src/lib/cbmem_stage_cache.c index 3fc99db726..2947972ac5 100644 --- a/src/lib/cbmem_stage_cache.c +++ b/src/lib/cbmem_stage_cache.c @@ -29,6 +29,7 @@ void stage_cache_add(int stage_id, const struct prog *stage) return; meta->load_addr = (uintptr_t)prog_start(stage); meta->entry_addr = (uintptr_t)prog_entry(stage); + meta->arg = (uintptr_t)prog_entry_arg(stage); c = cbmem_add(CBMEM_ID_STAGEx_CACHE + stage_id, prog_size(stage)); if (c == NULL) @@ -63,5 +64,6 @@ void stage_cache_load_stage(int stage_id, struct prog *stage) memcpy(load_addr, c, size); prog_set_area(stage, load_addr, size); - prog_set_entry(stage, (void *)(uintptr_t)meta->entry_addr, NULL); + prog_set_entry(stage, (void *)(uintptr_t)meta->entry_addr, + (void *)(uintptr_t)meta->arg); } diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c index a3a74ac613..66d5120fee 100644 --- a/src/lib/rmodule.c +++ b/src/lib/rmodule.c @@ -294,10 +294,11 @@ int rmodule_stage_load(struct rmod_stage_load *rsl) prog_set_area(rsl->prog, rmod_stage.location, rmodule_memory_size(&rmod_stage)); - prog_set_entry(rsl->prog, rmodule_entry(&rmod_stage), NULL); /* Allow caller to pick up parameters, if available. */ rsl->params = rmodule_parameters(&rmod_stage); + prog_set_entry(rsl->prog, rmodule_entry(&rmod_stage), rsl->params); + return 0; } -- cgit v1.2.3