summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch/x86')
-rw-r--r--src/arch/x86/acpi_s3.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/arch/x86/acpi_s3.c b/src/arch/x86/acpi_s3.c
index d4c697ebbf..4872c07228 100644
--- a/src/arch/x86/acpi_s3.c
+++ b/src/arch/x86/acpi_s3.c
@@ -4,7 +4,6 @@
#include <string.h>
#include <acpi/acpi.h>
#include <arch/cpu.h>
-#include <cbmem.h>
#include <commonlib/helpers.h>
#include <cpu/x86/smm.h>
#include <fallback.h>
@@ -79,16 +78,8 @@ void __weak mainboard_suspend_resume(void)
void acpi_resume(void *wake_vec)
{
- if (CONFIG(HAVE_SMI_HANDLER)) {
- void *gnvs_address = cbmem_find(CBMEM_ID_ACPI_GNVS);
-
- /* Restore GNVS pointer in SMM if found */
- if (gnvs_address) {
- printk(BIOS_DEBUG, "Restore GNVS pointer to %p\n",
- gnvs_address);
- smm_setup_structures(gnvs_address, NULL, NULL);
- }
- }
+ /* Restore GNVS pointer in SMM if found. */
+ apm_control(APM_CNT_GNVS_UPDATE);
/* Call mainboard resume handler first, if defined. */
mainboard_suspend_resume();