summaryrefslogtreecommitdiff
path: root/src/arch/x86
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2020-06-17 10:34:26 +0300
committerPatrick Georgi <pgeorgi@google.com>2020-06-24 11:49:15 +0000
commitc3c55210ee598e2dfcfc0bbe664cd703e6fdf3fe (patch)
tree8efb929b92a7c8cfd7cb92042ac628d396e3d6ae /src/arch/x86
parent5daa1d38985a19dc84f2299dba2e340dda2870ae (diff)
ACPI: Replace smm_setup_structures()
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 <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/42362 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
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();