intel/i945: Use common ACPI S3 recovery

Change-Id: I6f0cdc80870fddeaada3191e493bd85fdefee07f
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/15245
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Kyösti Mälkki 2016-06-17 22:52:04 +03:00
parent 310580ea13
commit e6b5a4f5f0
1 changed files with 1 additions and 10 deletions

View File

@ -900,16 +900,7 @@ static void i945_prepare_resume(int s3resume)
* this is not a resume. In that case we just create the cbmem toc. * this is not a resume. In that case we just create the cbmem toc.
*/ */
if (s3resume && cbmem_was_initted) { if (s3resume && cbmem_was_initted) {
void *resume_backup_memory = cbmem_find(CBMEM_ID_RESUME); acpi_prepare_for_resume();
/* copy 1MB - 64K to high tables ram_base to prevent memory corruption
* through stage 2. We could keep stuff like stack and heap in high tables
* memory completely, but that's a wonderful clean up task for another
* day.
*/
if (resume_backup_memory)
memcpy(resume_backup_memory, (void *)CONFIG_RAMBASE,
HIGH_MEMORY_SAVE);
/* Magic for S3 resume */ /* Magic for S3 resume */
pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD, pci_write_config32(PCI_DEV(0, 0x00, 0), SKPAD,