GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stage_cache: Make empty inline function if CONFIG_NO_STAGE_CACHE enable 

This patch removes CONFIG_NO_STAGE_CACHE check from caller function
and add empty inline function incase CONFIG_NO_STAGE_CACHE is enable.

Change-Id: I8e10ef2d261f9b204cecbeae6f65fda037753534
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/33394
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
This commit is contained in:
Subrata Banik 2019-06-11 17:52:06 +05:30
parent 5e5167ed04
commit 90f750bbf0
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/arch/x86/postcar_loader.c
View File

@ -154,8 +154,7 @@ static void load_postcar_cbfs(struct prog *prog, struct postcar_frame *pcf)
finalize_load(rsl.params, pcf->stack); finalize_load(rsl.params, pcf->stack);
if (!CONFIG(NO_STAGE_CACHE)) stage_cache_add(STAGE_POSTCAR, prog);
stage_cache_add(STAGE_POSTCAR, prog);
} }
void run_postcar_phase(struct postcar_frame *pcf) void run_postcar_phase(struct postcar_frame *pcf)

11
src/include/stage_cache.h
View File

@ -32,14 +32,21 @@ enum {
STAGE_S3_DATA, STAGE_S3_DATA,
}; };
#if CONFIG(CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM) \
|| CONFIG(RELOCATABLE_RAMSTAGE)
/* Cache the loaded stage provided according to the parameters. */ /* Cache the loaded stage provided according to the parameters. */
void stage_cache_add(int stage_id, const struct prog *stage); void stage_cache_add(int stage_id, const struct prog *stage);
/* Load the cached stage at given location returning the stage entry point. */
void stage_cache_load_stage(int stage_id, struct prog *stage);
#else /* CONFIG_NO_STAGE_CACHE */
static inline void stage_cache_add(int stage_id, const struct prog *stage) {}
static inline void stage_cache_load_stage(int stage_id, struct prog *stage) {}
#endif
/* Cache non-specific data or code. */ /* Cache non-specific data or code. */
void stage_cache_add_raw(int stage_id, const void *base, const size_t size); void stage_cache_add_raw(int stage_id, const void *base, const size_t size);
/* Get a pointer to cached raw data and its size. */ /* Get a pointer to cached raw data and its size. */
void stage_cache_get_raw(int stage_id, void **base, size_t *size); void stage_cache_get_raw(int stage_id, void **base, size_t *size);
/* Load the cached stage at given location returning the stage entry point. */
void stage_cache_load_stage(int stage_id, struct prog *stage);
/* Fill in parameters for the external stage cache, if utilized. */ /* Fill in parameters for the external stage cache, if utilized. */
void stage_cache_external_region(void **base, size_t *size); void stage_cache_external_region(void **base, size_t *size);

8
src/lib/prog_loaders.c
View File

@ -74,11 +74,6 @@ fail:
halt(); halt();
} }
void __weak stage_cache_add(int stage_id,
const struct prog *stage) {}
void __weak stage_cache_load_stage(int stage_id,
struct prog *stage) {}
static void ramstage_cache_invalid(void) static void ramstage_cache_invalid(void)
{ {
printk(BIOS_ERR, "ramstage cache invalid.\n"); printk(BIOS_ERR, "ramstage cache invalid.\n");
@ -155,8 +150,7 @@ void run_ramstage(void)
} else if (load_nonrelocatable_ramstage(&ramstage)) } else if (load_nonrelocatable_ramstage(&ramstage))
goto fail; goto fail;
if (!CONFIG(NO_STAGE_CACHE)) stage_cache_add(STAGE_RAMSTAGE, &ramstage);
stage_cache_add(STAGE_RAMSTAGE, &ramstage);
timestamp_add_now(TS_END_COPYRAM); timestamp_add_now(TS_END_COPYRAM);