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

ACPI: Add acpi_is_wakeup_s3() for romstage

Browse Source 
This replaces acpi_is_wakeup_early().

Change-Id: I23112c1fc7b6f99584bc065fbf6b10fb073b1eb6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/8187
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
This commit is contained in:
Kyösti Mälkki
2015-01-09 23:48:47 +02:00
parent 2320cbebc6
commit 78c5d584a0
36 changed files with 177 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cpu/amd/agesa/heapmanager.c
View File

@@ -12,13 +12,11 @@ UINT32 GetHeapBase(AMD_CONFIG_PARAMS *StdHeader)
{
UINT32 heap = BIOS_HEAP_START_ADDRESS;
#if CONFIG_HAVE_ACPI_RESUME
/* Both romstage and ramstage has this S3 detect. */
if (acpi_get_sleep_type() == 3)
if (acpi_is_wakeup_s3())
heap = (UINT32) cbmem_find(CBMEM_ID_RESUME_SCRATCH) +
(CONFIG_HIGH_SCRATCH_MEMORY_SIZE - BIOS_HEAP_SIZE);
/* himem_heap_base + high_stack_size */
#endif
return heap;
}

8
src/cpu/amd/car/post_cache_as_ram.c
View File

@@ -101,12 +101,10 @@ void post_cache_as_ram(void)
{
void *resume_backup_memory = NULL;
int s3resume = acpi_s3_resume_allowed() && acpi_is_wakeup_early();
int s3resume = acpi_is_wakeup_s3();
if (s3resume) {
#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
cbmem_recovery(s3resume);
resume_backup_memory = cbmem_find(CBMEM_ID_RESUME);
#endif
}
prepare_romstage_ramstack(resume_backup_memory);
@@ -141,10 +139,8 @@ void cache_as_ram_new_stack (void)
set_var_mtrr(0, 0x00000000, CONFIG_RAMTOP, MTRR_TYPE_WRBACK);
enable_cache();
if (acpi_s3_resume_allowed() && acpi_is_wakeup_early()) {
#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)
if (acpi_is_wakeup_s3()) {
resume_backup_memory = cbmem_find(CBMEM_ID_RESUME);
#endif
}
prepare_ramstage_region(resume_backup_memory);