[coreboot-gerrit] New patch to review for coreboot: 609941b intel/broadwell: Hide use of acpi_slp_type

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10359

-gerrit

commit 609941b141b785f6a85ebd620cd8af1a53318218
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Fri May 29 06:18:18 2015 +0300

    intel/broadwell: Hide use of acpi_slp_type
    
    Change-Id: I106779571df5168ec358ad1cc4dc4195639a7a7d
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/soc/intel/broadwell/igd.c     | 4 ++--
 src/soc/intel/broadwell/me.c      | 4 +---
 src/soc/intel/broadwell/refcode.c | 3 ++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/soc/intel/broadwell/igd.c b/src/soc/intel/broadwell/igd.c
index 93c9e3c..987d56c 100644
--- a/src/soc/intel/broadwell/igd.c
+++ b/src/soc/intel/broadwell/igd.c
@@ -489,7 +489,7 @@ static void igd_init(struct device *dev)
 		return;
 
 	/* Wait for any configured pre-graphics delay */
-	if (acpi_slp_type != SLEEP_STATE_S3) {
+	if (!acpi_is_wakeup_s3()) {
 #if IS_ENABLED(CONFIG_CHROMEOS)
 		if (developer_mode_enabled() || recovery_mode_enabled() ||
 		    vboot_wants_oprom())
@@ -542,7 +542,7 @@ static void igd_init(struct device *dev)
 		memset((void *)((u32)fb->base), 0, 64);
 	}
 
-	if (!gfx_get_init_done() && acpi_slp_type != 3) {
+	if (!gfx_get_init_done() && !acpi_is_wakeup_s3()) {
 		/*
 		 * Enable DDI-A if the Option ROM did not execute:
 		 *
diff --git a/src/soc/intel/broadwell/me.c b/src/soc/intel/broadwell/me.c
index ecfa1dd..8cd605f 100644
--- a/src/soc/intel/broadwell/me.c
+++ b/src/soc/intel/broadwell/me.c
@@ -1053,13 +1053,11 @@ static void intel_me_init(device_t dev)
 
 static void intel_me_enable(device_t dev)
 {
-#if CONFIG_HAVE_ACPI_RESUME
 	/* Avoid talking to the device in S3 path */
-	if (acpi_slp_type == 3) {
+	if (acpi_is_wakeup_s3()) {
 		dev->enabled = 0;
 		pch_disable_devfn(dev);
 	}
-#endif
 }
 
 static struct device_operations device_ops = {
diff --git a/src/soc/intel/broadwell/refcode.c b/src/soc/intel/broadwell/refcode.c
index 2fb365d..722669b 100644
--- a/src/soc/intel/broadwell/refcode.c
+++ b/src/soc/intel/broadwell/refcode.c
@@ -32,6 +32,7 @@
 #endif
 #include <soc/pei_data.h>
 #include <soc/pei_wrapper.h>
+#include <soc/pm.h>
 #include <soc/ramstage.h>
 
 static pei_wrapper_entry_t load_refcode_from_cache(void)
@@ -128,7 +129,7 @@ void broadwell_run_reference_code(void)
 	mainboard_fill_pei_data(&pei_data);
 	broadwell_fill_pei_data(&pei_data);
 
-	pei_data.boot_mode = acpi_slp_type;
+	pei_data.boot_mode = acpi_is_wakeup_s3() ? SLEEP_STATE_S3 : 0;
 	pei_data.saved_data = (void *) &dummy;
 
 	entry = load_reference_code();