debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

acpi: Fall back to manually changing SCI_EN. 

fixes second suspend cycles on newer Thinkpads,
we need a backport of this in 2.6.32 too.

svn path=/dists/trunk/linux-2.6/; revision=15742
This commit is contained in:
Maximilian Attems 2010-05-18 14:08:28 +00:00
parent 6242e2ea82
commit 4aa3afdc00
3 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -19,6 +19,7 @@ linux-2.6 (2.6.34-1~experimental.1) UNRELEASED; urgency=low
* [x86] Enable EEEPC_WMI.
* Fix backlight support on some recent Thinkpads.
* Enable autosuspend on UVC by default.
* acpi: Fall back to manually changing SCI_EN.
[ Ben Hutchings ]
* Prepare debconf templates for translation (Closes: #576758)

51
debian/patches/bugfix/all/linux-2.6-acpi-sleep-live-sci-live.patch vendored Normal file
View File

@ -0,0 +1,51 @@
commit 7ba0dea4158155a68b833982199691dbc2d4e6dc
Author: Matthew Garrett <mjg@redhat.com>
Date: Mon Apr 19 16:51:39 2010 -0400
acpi: Fall back to manually changing SCI_EN
The ACPI spec tells us that the ACPI SCI_EN bit is under hardware control
and shouldn't be touched by the OS. It seems that the Leading Other OS
ignores this and some machines expect this behaviour. We have a blacklist
for these, but given that we're able to detect the failure case and the
alternative to breaking the spec is letting the machine crash and burn,
let's try falling back when we know the alternative is a mostly-dead
machine.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index f74834a..79df8d4 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -227,6 +227,7 @@ static int acpi_suspend_begin(suspend_state_t pm_state)
static int acpi_suspend_enter(suspend_state_t pm_state)
{
acpi_status status = AE_OK;
+ acpi_status enable_status = AE_OK;
unsigned long flags = 0;
u32 acpi_state = acpi_target_sleep_state;
@@ -254,10 +255,19 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
}
/* If ACPI is not enabled by the BIOS, we need to enable it here. */
- if (set_sci_en_on_resume)
+ if (!set_sci_en_on_resume)
+ enable_status = acpi_enable();
+
+ if (set_sci_en_on_resume || enable_status == AE_NO_HARDWARE_RESPONSE)
+ /* If we're still in legacy mode then we have a problem. The
+ * spec tells us that this bit is under hardware control, but
+ * there's no plausible way that the OS can transition back to
+ * legacy mode so our choices here are to either ignore the
+ * spec or crash and burn horribly. The latter doesn't seem
+ * like it's ever going to be the preferable choice, so let's
+ * live dangerously.
+ */
acpi_write_bit_register(ACPI_BITREG_SCI_ENABLE, 1);
- else
- acpi_enable();
/* Reprogram control registers and execute _BFS */
acpi_leave_sleep_state_prep(acpi_state);

1
debian/patches/series/base vendored
View File

@ -72,3 +72,4 @@
+ bugfix/x86/amd64-agp-Probe-unknown-AGP-devices-the-right-way.patch
+ bugfix/all/thinkpad-acpi-fix-backlight.patch
+ bugfix/all/linux-2.6-usb-uvc-autosuspend.diff
+ bugfix/all/linux-2.6-acpi-sleep-live-sci-live.patch