ACPI: Add acpi_is_wakeup_s3() for romstage

This replaces acpi_is_wakeup_early().

Change-Id: I23112c1fc7b6f99584bc065fbf6b10fb073b1eb6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/8187
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>

15 files changed, 15 insertions, 15 deletions

diff --git a/src/mainboard/amd/olivehill/romstage.c b/src/mainboard/amd/olivehill/romstage.c
index 226278236f..8286f0bf7d 100644
--- a/src/mainboard/amd/olivehill/romstage.c
+++ b/src/mainboard/amd/olivehill/romstage.c
@@ -87,7 +87,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	post_code(0x39);
 
 	agesawrapper_amdinitearly();
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		agesawrapper_amdinitpost();
diff --git a/src/mainboard/amd/olivehillplus/romstage.c b/src/mainboard/amd/olivehillplus/romstage.c
index 6fa3af6bb9..63044ed4d0 100644
--- a/src/mainboard/amd/olivehillplus/romstage.c
+++ b/src/mainboard/amd/olivehillplus/romstage.c
@@ -90,7 +90,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
 	post_code(0x39);
 	AGESAWRAPPER(amdinitearly);
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		AGESAWRAPPER(amdinitpost);
diff --git a/src/mainboard/amd/parmer/romstage.c b/src/mainboard/amd/parmer/romstage.c
index 1fb709a372..1d2573660d 100644
--- a/src/mainboard/amd/parmer/romstage.c
+++ b/src/mainboard/amd/parmer/romstage.c
@@ -71,7 +71,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	post_code(0x39);
 
 	agesawrapper_amdinitearly();
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		agesawrapper_amdinitpost();
diff --git a/src/mainboard/amd/persimmon/romstage.c b/src/mainboard/amd/persimmon/romstage.c
index 2fdab4153c..bff9e14684 100644
--- a/src/mainboard/amd/persimmon/romstage.c
+++ b/src/mainboard/amd/persimmon/romstage.c
@@ -86,7 +86,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	post_code(0x39);
 	agesawrapper_amdinitearly();
 
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		agesawrapper_amdinitpost();
diff --git a/src/mainboard/amd/thatcher/romstage.c b/src/mainboard/amd/thatcher/romstage.c
index 30808a4dfd..27d9680401 100644
--- a/src/mainboard/amd/thatcher/romstage.c
+++ b/src/mainboard/amd/thatcher/romstage.c
@@ -85,7 +85,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	post_code(0x39);
 
 	agesawrapper_amdinitearly();
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		agesawrapper_amdinitpost();
diff --git a/src/mainboard/asrock/imb-a180/romstage.c b/src/mainboard/asrock/imb-a180/romstage.c
index efeed35005..cb6d07a0c1 100644
--- a/src/mainboard/asrock/imb-a180/romstage.c
+++ b/src/mainboard/asrock/imb-a180/romstage.c
@@ -111,7 +111,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	post_code(0x39);
 
 	agesawrapper_amdinitearly();
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		agesawrapper_amdinitpost();
diff --git a/src/mainboard/asus/f2a85-m/romstage.c b/src/mainboard/asus/f2a85-m/romstage.c
index 95298d1a14..2332b4a49d 100644
--- a/src/mainboard/asus/f2a85-m/romstage.c
+++ b/src/mainboard/asus/f2a85-m/romstage.c
@@ -131,7 +131,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	post_code(0x39);
 
 	agesawrapper_amdinitearly();
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		agesawrapper_amdinitpost();
diff --git a/src/mainboard/gizmosphere/gizmo/romstage.c b/src/mainboard/gizmosphere/gizmo/romstage.c
index f420bf2efe..527ad26e64 100644
--- a/src/mainboard/gizmosphere/gizmo/romstage.c
+++ b/src/mainboard/gizmosphere/gizmo/romstage.c
@@ -94,7 +94,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	post_code(0x39);
 	agesawrapper_amdinitearly();
 
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		agesawrapper_amdinitpost();
diff --git a/src/mainboard/gizmosphere/gizmo2/romstage.c b/src/mainboard/gizmosphere/gizmo2/romstage.c
index 226278236f..8286f0bf7d 100644
--- a/src/mainboard/gizmosphere/gizmo2/romstage.c
+++ b/src/mainboard/gizmosphere/gizmo2/romstage.c
@@ -87,7 +87,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	post_code(0x39);
 
 	agesawrapper_amdinitearly();
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		agesawrapper_amdinitpost();
diff --git a/src/mainboard/hp/abm/romstage.c b/src/mainboard/hp/abm/romstage.c
index 5e3044a0e5..a55ec02e41 100644
--- a/src/mainboard/hp/abm/romstage.c
+++ b/src/mainboard/hp/abm/romstage.c
@@ -100,7 +100,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	post_code(0x39);
 
 	agesawrapper_amdinitearly();
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		agesawrapper_amdinitpost();
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/romstage.c b/src/mainboard/hp/pavilion_m6_1035dx/romstage.c
index bc92e6d7d3..87fcd4cf35 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/romstage.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/romstage.c
@@ -63,7 +63,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	post_code(0x39);
 
 	agesawrapper_amdinitearly();
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		agesawrapper_amdinitpost();
diff --git a/src/mainboard/jetway/nf81-t56n-lf/romstage.c b/src/mainboard/jetway/nf81-t56n-lf/romstage.c
index 197c81d56e..c3ca947bf5 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/romstage.c
+++ b/src/mainboard/jetway/nf81-t56n-lf/romstage.c
@@ -102,7 +102,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	post_code(0x39);
 	agesawrapper_amdinitearly();
 
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		agesawrapper_amdinitpost();
diff --git a/src/mainboard/lenovo/g505s/romstage.c b/src/mainboard/lenovo/g505s/romstage.c
index bc92e6d7d3..87fcd4cf35 100644
--- a/src/mainboard/lenovo/g505s/romstage.c
+++ b/src/mainboard/lenovo/g505s/romstage.c
@@ -63,7 +63,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	post_code(0x39);
 
 	agesawrapper_amdinitearly();
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		agesawrapper_amdinitpost();
diff --git a/src/mainboard/lippert/frontrunner-af/romstage.c b/src/mainboard/lippert/frontrunner-af/romstage.c
index 0f718f2da6..cc03053ee7 100644
--- a/src/mainboard/lippert/frontrunner-af/romstage.c
+++ b/src/mainboard/lippert/frontrunner-af/romstage.c
@@ -85,7 +85,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	post_code(0x39);
 	agesawrapper_amdinitearly();
 
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		/* Reboots with outb(3,0x92), outb(4,0xcf9) or triple-fault all
diff --git a/src/mainboard/lippert/toucan-af/romstage.c b/src/mainboard/lippert/toucan-af/romstage.c
index 415cdbee13..7a8e9164ae 100644
--- a/src/mainboard/lippert/toucan-af/romstage.c
+++ b/src/mainboard/lippert/toucan-af/romstage.c
@@ -86,7 +86,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 	post_code(0x39);
 	agesawrapper_amdinitearly();
 
-	int s3resume = acpi_is_wakeup_early() && acpi_s3_resume_allowed();
+	int s3resume = acpi_is_wakeup_s3();
 	if (!s3resume) {
 		post_code(0x40);
 		/* Reboots with outb(3,0x92), outb(4,0xcf9) or triple-fault all