aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi/sleep.c
diff options
context:
space:
mode:
authorMatthew Garrett <mjg@redhat.com>2010-05-11 13:49:25 -0400
committerLen Brown <len.brown@intel.com>2010-05-12 01:12:18 -0400
commitb6dacf63e9fb2e7a1369843d6cef332f76fca6a3 (patch)
tree4b7fbde0071172718270a5646f1168edb6d07023 /arch/x86/kernel/acpi/sleep.c
parentb430acbd7c4b919886fa7fd92eeb7a695f1940d3 (diff)
downloadmrst-s0i3-test-b6dacf63e9fb2e7a1369843d6cef332f76fca6a3.tar.gz
mrst-s0i3-test-b6dacf63e9fb2e7a1369843d6cef332f76fca6a3.tar.xz
mrst-s0i3-test-b6dacf63e9fb2e7a1369843d6cef332f76fca6a3.zip
ACPI: Unconditionally set SCI_EN on resume
The ACPI spec tells us that the firmware will reenable SCI_EN on resume. Reality disagrees in some cases. The ACPI spec tells us that the only way to set SCI_EN is via an SMM call. https://bugzilla.kernel.org/show_bug.cgi?id=13745 shows us that doing so may break machines. Tracing the ACPI calls made by Windows shows that it unconditionally sets SCI_EN on resume with a direct register write, and therefore the overwhelming probability is that everything is fine with this behaviour. Signed-off-by: Matthew Garrett <mjg@redhat.com> Tested-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/x86/kernel/acpi/sleep.c')
-rw-r--r--arch/x86/kernel/acpi/sleep.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index f9961034e55..82e508677b9 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -162,8 +162,6 @@ static int __init acpi_sleep_setup(char *str)
#endif
if (strncmp(str, "old_ordering", 12) == 0)
acpi_old_suspend_ordering();
- if (strncmp(str, "sci_force_enable", 16) == 0)
- acpi_set_sci_en_on_resume();
str = strchr(str, ',');
if (str != NULL)
str += strspn(str, ", \t");