sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CBMEM ACPI: Move resume handler

Browse Source 
Handler is ACPI/x86 specific so move details out of cbmem code.

With static CBMEM initialisation, ramstage will need to test for
S3 wakeup condition so publish also acpi_is_wakeup().

Change-Id: If591535448cdd24a54262b534c1a828fc13da759
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/4619
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@google.com>
This commit is contained in:
Kyösti Mälkki
2014-01-03 15:15:22 +02:00
parent 8526c3a403
commit cb28f3f8ed
7 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/lib/dynamic_cbmem.c
View File

@ -32,19 +32,6 @@
#define UINT_MAX 4294967295U
#endif
/* ACPI resume needs to be cleared in the fail-to-recover case, but that
* condition is only handled during ramstage. */
#if CONFIG_HAVE_ACPI_RESUME && !defined(__PRE_RAM__)
static inline void cbmem_handle_acpi_resume(void)
{
/* Something went wrong, our high memory area got wiped */
if (acpi_slp_type == 3 || acpi_slp_type == 2)
acpi_slp_type = 0;
}
#else
static inline void cbmem_handle_acpi_resume(void) {}
#endif
/*
* The dynamic cbmem code uses a root region. The root region boundary
* addresses are determined by cbmem_top() and ROOT_MIN_SIZE. Just below
@ -191,7 +178,7 @@ void cbmem_initialize_empty(void)
static inline int cbmem_fail_recovery(void)
{
cbmem_initialize_empty();
cbmem_handle_acpi_resume();
cbmem_fail_resume();
/* Migrate cache-as-ram variables. */
car_migrate_variables();
return 1;