Aaron Durbin (adurbin@chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14214
-gerrit
commit 198b08ee65c5ca90f4b86bbbafd1bcb1b84d272a Author: Aaron Durbin adurbin@chromium.org Date: Thu Mar 31 13:49:00 2016 -0500
lib/prog_loading: introduce prog_segment_loaded()
In order to not muddle arch vs chipset implementations provide a generic prog_segment_loaded() which calls platform_segment_loaded() and arch_segment_loaded() in that order. This allows the arch variants to live in src/arch while the chipset/platform code can implement their own.
Change-Id: I17b6497219ec904d92bd286f18c9ec96b2b7af25 Signed-off-by: Aaron Durbin adurbin@chromium.org --- src/arch/x86/postcar_loader.c | 2 +- src/drivers/intel/fsp2_0/util.c | 2 +- src/include/program_loading.h | 11 +++++++++-- src/lib/cbfs.c | 2 +- src/lib/prog_ops.c | 12 ++++++++++++ src/lib/rmodule.c | 2 +- src/lib/selfboot.c | 2 +- 7 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/src/arch/x86/postcar_loader.c b/src/arch/x86/postcar_loader.c index eba90d4..cc1d460 100644 --- a/src/arch/x86/postcar_loader.c +++ b/src/arch/x86/postcar_loader.c @@ -115,7 +115,7 @@ void run_postcar_phase(struct postcar_frame *pcf) * Signal to rest of system that another update was made to the * postcar program prior to running it. */ - arch_segment_loaded((uintptr_t)rsl.params, sizeof(uintptr_t), + prog_segment_loaded((uintptr_t)rsl.params, sizeof(uintptr_t), SEG_FINAL);
prog_run(&prog); diff --git a/src/drivers/intel/fsp2_0/util.c b/src/drivers/intel/fsp2_0/util.c index c4fe8dc..743bc9a 100644 --- a/src/drivers/intel/fsp2_0/util.c +++ b/src/drivers/intel/fsp2_0/util.c @@ -132,7 +132,7 @@ enum cb_err fsp_load_binary(struct fsp_header *hdr, return CB_ERR;
/* Signal that FSP component has been loaded. */ - arch_segment_loaded(hdr->image_base, hdr->image_size, SEG_FINAL); + prog_segment_loaded(hdr->image_base, hdr->image_size, SEG_FINAL);
return CB_SUCCESS; } diff --git a/src/include/program_loading.h b/src/include/program_loading.h index 8ac73dd..42addb8 100644 --- a/src/include/program_loading.h +++ b/src/include/program_loading.h @@ -37,8 +37,15 @@ enum prog_type { PROG_BL32, };
-/* Called for each segment of a program loaded. The SEG_FINAL flag will be - * set on the last segment loaded. */ +/* + * prog_segment_loaded() is called for each segment of a program loaded. The + * SEG_FINAL flag will be set on the last segment loaded. The following two + * functions, platform_segment_loaded() and arch_segment_loaded(), are called + * in that order within prog_segment_loaded(). In short, rely on + * prog_segment_loaded() to perform the proper dispatch sequence. + */ +void prog_segment_loaded(uintptr_t start, size_t size, int flags); +void platform_segment_loaded(uintptr_t start, size_t size, int flags); void arch_segment_loaded(uintptr_t start, size_t size, int flags);
/* Return true if arch supports bounce buffer. */ diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index 82bfa2d..e1626d7 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -206,7 +206,7 @@ int cbfs_prog_stage_load(struct prog *pstage) /* Clear area not covered by file. */ memset(&load[fsize], 0, stage.memlen - fsize);
- arch_segment_loaded((uintptr_t)load, stage.memlen, SEG_FINAL); + prog_segment_loaded((uintptr_t)load, stage.memlen, SEG_FINAL);
out: prog_set_area(pstage, load, stage.memlen); diff --git a/src/lib/prog_ops.c b/src/lib/prog_ops.c index 67bdcc0..bc889fc 100644 --- a/src/lib/prog_ops.c +++ b/src/lib/prog_ops.c @@ -17,6 +17,18 @@ #include <program_loading.h>
/* For each segment of a program loaded this function is called*/ +void prog_segment_loaded(uintptr_t start, size_t size, int flags) +{ + platform_segment_loaded(start, size, flags); + arch_segment_loaded(start, size, flags); +} + +void __attribute__ ((weak)) platform_segment_loaded(uintptr_t start, + size_t size, int flags) +{ + /* do nothing */ +} + void __attribute__ ((weak)) arch_segment_loaded(uintptr_t start, size_t size, int flags) { diff --git a/src/lib/rmodule.c b/src/lib/rmodule.c index 9825e6a..7043157 100644 --- a/src/lib/rmodule.c +++ b/src/lib/rmodule.c @@ -197,7 +197,7 @@ int rmodule_load(void *base, struct rmodule *module) return -1; rmodule_clear_bss(module);
- arch_segment_loaded((uintptr_t)module->location, + prog_segment_loaded((uintptr_t)module->location, rmodule_memory_size(module), SEG_FINAL);
return 0; diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index 7d3e2dd..23eda14 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -452,7 +452,7 @@ static int load_self_segments( * Each architecture can perform additonal operations * on the loaded segment */ - arch_segment_loaded((uintptr_t)dest, ptr->s_memsz, + prog_segment_loaded((uintptr_t)dest, ptr->s_memsz, last_non_empty == ptr ? SEG_FINAL : 0); } }