From bb805e156a6c464454ff1622a638e8ab768732bd Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Mon, 16 Jun 2014 09:14:49 +0300
Subject: nehalem boards: Use acpi_s3_resume_allowed()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also update packardbell/ms2290 to match lenovo/x201.

Change-Id: I6bda740cadd81ebe47e57742c507bff322a9fb0e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6062
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Marc Jones <marc.jones@se-eng.com>
---
 src/mainboard/packardbell/ms2290/romstage.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/mainboard/packardbell')

diff --git a/src/mainboard/packardbell/ms2290/romstage.c b/src/mainboard/packardbell/ms2290/romstage.c
index 6a18dd6f79..79afae301e 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");
+			}
 		}
 	}
 
-- 
cgit v1.2.3