ACPI: Handle BIOS that resumes from S3 to suspend routine rather than resume vector

4e6e6504 · William Morrrow <[email protected]> · 2006-08-14 22:37:31 -07:00

A BIOS has been found that resumes from S3 to the routine that invoked suspend,
ignoring the resume vector.  This appears to the OS as a failed S3 attempt.

This same system suspend/resume's properly with Windows.

It is possible to invoke the protected mode register restore routine (which
would normally restore the sysenter registers) when the BIOS returns from
S3.  This has no effect on a correctly running system and repairs the
damage from the deviant BIOS.

Signed-off-by: William Morrow <[email protected]>
Signed-off-by: Jordan Crouse <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Len Brown <[email protected]>

Commit: 4e6e6504a4572dee3afcb0925ce92ad559e1e0db
Parents: 9f737633

Changes

1 files changed · +4 −1

File	Status	Add	Del	Content
arch/i386/kernel/acpi/wakeup.S	modified	+4	−1	View file

arch/i386/kernel/acpi/wakeup.S

View file

diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S
index 9f408ee..b781b38 100644
--- a/arch/i386/kernel/acpi/wakeup.S
+++ b/arch/i386/kernel/acpi/wakeup.S
@@ -292,7 +292,10 @@ ENTRY(do_suspend_lowlevel)
 	pushl	$3
 	call	acpi_enter_sleep_state
 	addl	$4, %esp
-	ret
+
+#	In case of S3 failure, we'll emerge here.  Jump
+# 	to ret_point to recover
+	jmp	ret_point
 	.p2align 4,,7
 ret_point:
 	call	restore_registers