Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACPI: Separate disabling of GPEs from _PTS

Browse Source 
The preparation to enter an ACPI system sleep state is now tied to
the disabling of GPEs, but the GPEs should not be disabled before
suspending devices.  Since on ACPI 1.0x systems the _PTS global
control method should be executed before suspending devices, we
need to disable GPEs separately.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Rafael J. Wysocki 2008-01-08 00:06:16 +01:00 committed by Len Brown
parent c95d47a868
commit 3c1d2b6085
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/acpi/hardware/hwsleep.c
View File

@ -229,10 +229,6 @@ acpi_status acpi_enter_sleep_state_prep(u8 sleep_state)
"While executing method _SST")); "While executing method _SST"));
} }
/* Disable/Clear all GPEs */
status = acpi_hw_disable_all_gpes();
return_ACPI_STATUS(status); return_ACPI_STATUS(status);
} }

17
drivers/acpi/sleep/main.c
View File

@ -91,10 +91,13 @@ static int acpi_pm_begin(suspend_state_t pm_state)
static int acpi_pm_prepare(void) static int acpi_pm_prepare(void)
{ {
int error = acpi_sleep_prepare(acpi_target_sleep_state); int error;
error = acpi_sleep_prepare(acpi_target_sleep_state);
if (error) if (error)
acpi_target_sleep_state = ACPI_STATE_S0; acpi_target_sleep_state = ACPI_STATE_S0;
else if (!ACPI_SUCCESS(acpi_hw_disable_all_gpes()))
error = -EFAULT;
return error; return error;
} }
@ -261,7 +264,16 @@ static int acpi_hibernation_start(void)
static int acpi_hibernation_prepare(void) static int acpi_hibernation_prepare(void)
{ {
return acpi_sleep_prepare(ACPI_STATE_S4); int error;
error = acpi_sleep_prepare(ACPI_STATE_S4);
if (error)
return error;
if (!ACPI_SUCCESS(acpi_hw_disable_all_gpes()))
error = -EFAULT;
return error;
} }
static int acpi_hibernation_enter(void) static int acpi_hibernation_enter(void)
@ -426,6 +438,7 @@ static void acpi_power_off_prepare(void)
{ {
/* Prepare to power off the system */ /* Prepare to power off the system */
acpi_sleep_prepare(ACPI_STATE_S5); acpi_sleep_prepare(ACPI_STATE_S5);
acpi_hw_disable_all_gpes();
} }
static void acpi_power_off(void) static void acpi_power_off(void)