From c3c55210ee598e2dfcfc0bbe664cd703e6fdf3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Wed, 17 Jun 2020 10:34:26 +0300 Subject: ACPI: Replace smm_setup_structures() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Except for whitespace and varying casts the codes were the same when implemented. Platforms that did not implement this are tagged with ACPI_NO_SMI_GNVS. Change-Id: I31ec85ebce03d0d472403806969f863e4ca03b6b Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/42362 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/arch/x86/acpi_s3.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/arch') 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 #include #include -#include #include #include #include @@ -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(); -- cgit v1.2.3