GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mb/lenovo/x200: Use acpi_s3_resume_allowed() 

Apply commit 12d681b2 (intel/i945 gm45: Use acpi_s3_resume_allowed())
also to the Lenovo X200.

Change-Id: I4e1e0ccf2abbe175c0e5ddcbb6ee7bf6afb1ae88
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-on: https://review.coreboot.org/25793
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
This commit is contained in:
Paul Menzel 2018-04-23 20:02:35 +02:00 committed by Nico Huber
parent a96e31b469
commit 42ae0baead
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mainboard/lenovo/x200/romstage.c
View File

@ -89,16 +89,16 @@ void mainboard_romstage_entry(unsigned long bist)
/* Check for S3 resume. */ /* Check for S3 resume. */
const u32 pm1_cnt = inl(DEFAULT_PMBASE + 0x04); const u32 pm1_cnt = inl(DEFAULT_PMBASE + 0x04);
if (((pm1_cnt >> 10) & 7) == 5) { if (((pm1_cnt >> 10) & 7) == 5) {
#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) if (acpi_s3_resume_allowed()) {
printk(BIOS_DEBUG, "Resume from S3 detected.\n"); printk(BIOS_DEBUG, "Resume from S3 detected.\n");
s3resume = 1; s3resume = 1;
/* Clear SLP_TYPE. This will break stage2 but /* Clear SLP_TYPE. This will break stage2 but
* we care for that when we get there. * we care for that when we get there.
*/ */
outl(pm1_cnt & ~(7 << 10), DEFAULT_PMBASE + 0x04); outl(pm1_cnt & ~(7 << 10), DEFAULT_PMBASE + 0x04);
#else } else {
printk(BIOS_DEBUG, "Resume from S3 detected, but disabled.\n"); printk(BIOS_DEBUG, "Resume from S3 detected, but disabled.\n");
#endif }
} }
/* RAM initialization */ /* RAM initialization */