summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2018-06-03 23:04:28 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-22 06:38:13 +0000
commit7cd2c073178b6d615199b439ad9a811cfb4dd820 (patch)
treebbf8b89539703341092447ba5d515dbce4d13b5d /src/lib
parent546a2e84685eb642e59ef40846dcb6f167b5725c (diff)
downloadcoreboot-7cd2c073178b6d615199b439ad9a811cfb4dd820.tar.xz
ACPI S3: Depend on RELOCATABLE_RAMSTAGE
With RELOCATABLE_RAMSTAGE, S3 resume path only uses memory that is reserved from OS. So there is no need for low memory backup and recovery. Change-Id: If7f83711685ac445abf4cd1aa6b66c3391e0e554 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/26834 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/hardwaremain.c2
-rw-r--r--src/lib/prog_loaders.c14
2 files changed, 1 insertions, 15 deletions
diff --git a/src/lib/hardwaremain.c b/src/lib/hardwaremain.c
index 2881162a34..3c6fb931d8 100644
--- a/src/lib/hardwaremain.c
+++ b/src/lib/hardwaremain.c
@@ -187,8 +187,6 @@ static boot_state_t bs_os_resume_check(void *arg)
boot_states[BS_OS_RESUME].arg = wake_vector;
return BS_OS_RESUME;
}
-
- acpi_prepare_resume_backup();
#endif
timestamp_add_now(TS_CBMEM_POST);
diff --git a/src/lib/prog_loaders.c b/src/lib/prog_loaders.c
index dfabd31910..2ef6bdfc32 100644
--- a/src/lib/prog_loaders.c
+++ b/src/lib/prog_loaders.c
@@ -107,18 +107,6 @@ static int load_relocatable_ramstage(struct prog *ramstage)
return rmodule_stage_load(&rmod_ram);
}
-static int load_nonrelocatable_ramstage(struct prog *ramstage)
-{
- if (CONFIG(HAVE_ACPI_RESUME)) {
- uintptr_t base = 0;
- size_t size = cbfs_prog_stage_section(ramstage, &base);
- if (size)
- backup_ramstage_section(base, size);
- }
-
- return cbfs_prog_stage_load(ramstage);
-}
-
void run_ramstage(void)
{
struct prog ramstage =
@@ -147,7 +135,7 @@ void run_ramstage(void)
if (CONFIG(RELOCATABLE_RAMSTAGE)) {
if (load_relocatable_ramstage(&ramstage))
goto fail;
- } else if (load_nonrelocatable_ramstage(&ramstage))
+ } else if (cbfs_prog_stage_load(&ramstage))
goto fail;
stage_cache_add(STAGE_RAMSTAGE, &ramstage);