summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Kconfig7
-rw-r--r--src/drivers/intel/fsp1_1/ramstage.c8
-rw-r--r--src/lib/prog_loaders.c9
3 files changed, 20 insertions, 4 deletions
diff --git a/src/Kconfig b/src/Kconfig
index b56f01070f..e64dd35cab 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -262,6 +262,13 @@ config CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
The relocated ramstage is saved in an area specified by the
by the board and/or chipset.
+config NO_STAGE_CACHE
+ bool
+ default n
+ help
+ Do not save any component in stage cache for resume path. On resume,
+ all components would be read back from CBFS again.
+
config FLASHMAP_OFFSET
hex "Flash Map Offset"
default 0x00670000 if NORTHBRIDGE_INTEL_SANDYBRIDGE
diff --git a/src/drivers/intel/fsp1_1/ramstage.c b/src/drivers/intel/fsp1_1/ramstage.c
index 834f148071..6e2de29cea 100644
--- a/src/drivers/intel/fsp1_1/ramstage.c
+++ b/src/drivers/intel/fsp1_1/ramstage.c
@@ -158,6 +158,11 @@ static void fsp_cache_save(struct prog *fsp)
if (IS_ENABLED(CONFIG_DISPLAY_SMM_MEMORY_MAP))
smm_memory_map();
+ if (IS_ENABLED(CONFIG_NO_STAGE_CACHE))
+ return;
+
+ printk(BIOS_DEBUG, "FSP: Saving binary in cache\n");
+
if (prog_entry(fsp) == NULL) {
printk(BIOS_ERR, "ERROR: No FSP to save in cache.\n");
return;
@@ -186,12 +191,11 @@ void intel_silicon_init(void)
struct prog fsp = PROG_INIT(PROG_REFCODE, "fsp.bin");
int is_s3_wakeup = acpi_is_wakeup_s3();
- if (is_s3_wakeup) {
+ if (is_s3_wakeup && !IS_ENABLED(CONFIG_NO_STAGE_CACHE)) {
printk(BIOS_DEBUG, "FSP: Loading binary from cache\n");
stage_cache_load_stage(STAGE_REFCODE, &fsp);
} else {
fsp_find_and_relocate(&fsp);
- printk(BIOS_DEBUG, "FSP: Saving binary in cache\n");
fsp_cache_save(&fsp);
}
diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c
index 14e12998e0..38dfc2b5df 100644
--- a/src/lib/prog_loaders.c
+++ b/src/lib/prog_loaders.c
@@ -107,8 +107,13 @@ void run_ramstage(void)
timestamp_add_now(TS_END_ROMSTAGE);
- /* Only x86 systems currently take the same firmware path on resume. */
- if (IS_ENABLED(CONFIG_ARCH_X86) && IS_ENABLED(CONFIG_EARLY_CBMEM_INIT))
+ /*
+ * Only x86 systems using ramstage stage cache currently take the same
+ * firmware path on resume.
+ */
+ if (IS_ENABLED(CONFIG_ARCH_X86) &&
+ !IS_ENABLED(CONFIG_NO_STAGE_CACHE) &&
+ IS_ENABLED(CONFIG_EARLY_CBMEM_INIT))
run_ramstage_from_resume(romstage_handoff_find_or_add(),
&ramstage);