[coreboot-gerrit] Patch set updated for coreboot: d06fa8e nehalem boards: Use acpi_s3_resume_allowed()

[Kyösti Mälkki]

Kyösti Mälkki ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6062

-gerrit

commit d06fa8e5a042bc8de65a77c08e448b4359288109
Author: Kyösti Mälkki 
Date:   Mon Jun 16 09:14:49 2014 +0300

nehalem boards: Use acpi_s3_resume_allowed()

Also update packardbell/ms2290 to match lenovo/x201.

Change-Id: I6bda740cadd81ebe47e57742c507bff322a9fb0e
    Signed-off-by: Kyösti Mälkki 
---
 src/mainboard/lenovo/x201/romstage.c        | 15 ++++++++-------
 src/mainboard/packardbell/ms2290/romstage.c | 10 ++++++++--
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/mainboard/lenovo/x201/romstage.c b/src/mainboard/lenovo/x201/romstage.c
index 1237a5c..a18536a 100644
--- a/src/mainboard/lenovo/x201/romstage.c
+++ b/src/mainboard/lenovo/x201/romstage.c
@@ -36,6 +36,7 @@
 #include <ec/acpi/ec.h>
 #include <delay.h>
 #include <timestamp.h>
+#include <arch/acpi.h>
 #include <cbmem.h>

#include "gpio.h"
@@ -262,13 +263,13 @@ void main(unsigned long bist)
    		outl(reg32 & ~(7 << 10), DEFAULT_PMBASE + 0x04);
    		printk(BIOS_DEBUG, "Bad resume from S3 detected.\n");
    	} else {
-#if CONFIG_HAVE_ACPI_RESUME
-			printk(BIOS_DEBUG, "Resume from S3 detected.\n");
-			s3resume = 1;
-#else
-			printk(BIOS_DEBUG,
-			       "Resume from S3 detected, but disabled.\n");
-#endif
+			if (acpi_s3_resume_allowed()) {
+				printk(BIOS_DEBUG, "Resume from S3 detected.\n");
+				s3resume = 1;
+			} else {
+				printk(BIOS_DEBUG,
+				       "Resume from S3 detected, but disabled.\n");
+			}
    	}
    }

diff --git a/src/mainboard/packardbell/ms2290/romstage.c b/src/mainboard/packardbell/ms2290/romstage.c
index 6a18dd6..79afae3 100644
--- a/src/mainboard/packardbell/ms2290/romstage.c
+++ b/src/mainboard/packardbell/ms2290/romstage.c
@@ -36,6 +36,7 @@
 #include <ec/acpi/ec.h>
 #include <delay.h>
 #include <timestamp.h>
+#include <arch/acpi.h>
 #include <cbmem.h>

#include "arch/early_variables.h"
@@ -252,8 +253,13 @@ void main(unsigned long bist)
    		outl(reg32 & ~(7 << 10), DEFAULT_PMBASE + 0x04);
    		printk(BIOS_DEBUG, "Bad resume from S3 detected.\n");
    	} else {
-			printk(BIOS_DEBUG, "Resume from S3 detected.\n");
-			s3resume = 1;
+			if (acpi_s3_resume_allowed()) {
+				printk(BIOS_DEBUG, "Resume from S3 detected.\n");
+				s3resume = 1;
+			} else {
+				printk(BIOS_DEBUG,
+				       "Resume from S3 detected, but disabled.\n");
+			}
    	}
    }