From 315a7b83836954917e993f5ce59b29cfe7c99470 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Fri, 29 May 2015 06:18:08 +0300
Subject: binaryPI: Hide use of acpi_slp_type
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I867932db4388eb078b69b6f42c82967777d45d79
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/10358
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
 src/cpu/amd/pi/00630F01/model_15_init.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/cpu')

diff --git a/src/cpu/amd/pi/00630F01/model_15_init.c b/src/cpu/amd/pi/00630F01/model_15_init.c
index da64d76578..e2ba65e8c9 100644
--- a/src/cpu/amd/pi/00630F01/model_15_init.c
+++ b/src/cpu/amd/pi/00630F01/model_15_init.c
@@ -34,9 +34,7 @@
 #include <cpu/x86/mtrr.h>
 #include <cpu/amd/amdfam15.h>
 #include <arch/acpi.h>
-#if CONFIG_HAVE_ACPI_RESUME
 #include <cpu/amd/pi/s3_resume.h>
-#endif
 
 static void model_15_init(device_t dev)
 {
@@ -71,10 +69,8 @@ static void model_15_init(device_t dev)
 	msr.lo |= SYSCFG_MSR_MtrrFixDramEn;
 	wrmsr(SYSCFG_MSR, msr);
 
-#if CONFIG_HAVE_ACPI_RESUME
-	if (acpi_slp_type == 3)
+	if (acpi_is_wakeup())
 		restore_mtrr();
-#endif
 
 	x86_mtrr_check();
 	x86_enable_cache();
-- 
cgit v1.2.3