mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 08:58:07 +00:00
2a5d24286e
Commit 9630bdd (ACPI: Use GPE reference counting to support shared
GPEs) introduced a suspend regression where boxes resume immediately
after being suspended due to the lid or sleep button wakeup status
not being cleared properly. This happens if the GPEs corresponding
to those devices are not enabled all the time, which apparently is
expected by some BIOSes.
To fix this problem, enable button and lid GPEs unconditionally
during initialization and keep them enabled all the time, regardless
of whether or not the ACPI button driver is used.
References: https://bugzilla.kernel.org/show_bug.cgi?id=27372
Reported-and-tested-by: Ferenc Wágner <wferi@niif.hu>
Cc: stable@kernel.org
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
98 lines
2.7 KiB
C
98 lines
2.7 KiB
C
/*
|
|
* wakeup.c - support wakeup devices
|
|
* Copyright (C) 2004 Li Shaohua <shaohua.li@intel.com>
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/acpi.h>
|
|
#include <acpi/acpi_drivers.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/types.h>
|
|
|
|
#include "internal.h"
|
|
#include "sleep.h"
|
|
|
|
/*
|
|
* We didn't lock acpi_device_lock in the file, because it invokes oops in
|
|
* suspend/resume and isn't really required as this is called in S-state. At
|
|
* that time, there is no device hotplug
|
|
**/
|
|
#define _COMPONENT ACPI_SYSTEM_COMPONENT
|
|
ACPI_MODULE_NAME("wakeup_devices")
|
|
|
|
/**
|
|
* acpi_enable_wakeup_devices - Enable wake-up device GPEs.
|
|
* @sleep_state: ACPI system sleep state.
|
|
*
|
|
* Enable wakeup device power of devices with the state.enable flag set and set
|
|
* the wakeup enable mask bits in the GPE registers that correspond to wakeup
|
|
* devices.
|
|
*/
|
|
void acpi_enable_wakeup_devices(u8 sleep_state)
|
|
{
|
|
struct list_head *node, *next;
|
|
|
|
list_for_each_safe(node, next, &acpi_wakeup_device_list) {
|
|
struct acpi_device *dev =
|
|
container_of(node, struct acpi_device, wakeup_list);
|
|
|
|
if (!dev->wakeup.flags.valid
|
|
|| sleep_state > (u32) dev->wakeup.sleep_state
|
|
|| !(device_may_wakeup(&dev->dev)
|
|
|| dev->wakeup.prepare_count))
|
|
continue;
|
|
|
|
if (device_may_wakeup(&dev->dev))
|
|
acpi_enable_wakeup_device_power(dev, sleep_state);
|
|
|
|
/* The wake-up power should have been enabled already. */
|
|
acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
|
|
ACPI_GPE_ENABLE);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* acpi_disable_wakeup_devices - Disable devices' wakeup capability.
|
|
* @sleep_state: ACPI system sleep state.
|
|
*/
|
|
void acpi_disable_wakeup_devices(u8 sleep_state)
|
|
{
|
|
struct list_head *node, *next;
|
|
|
|
list_for_each_safe(node, next, &acpi_wakeup_device_list) {
|
|
struct acpi_device *dev =
|
|
container_of(node, struct acpi_device, wakeup_list);
|
|
|
|
if (!dev->wakeup.flags.valid
|
|
|| sleep_state > (u32) dev->wakeup.sleep_state
|
|
|| !(device_may_wakeup(&dev->dev)
|
|
|| dev->wakeup.prepare_count))
|
|
continue;
|
|
|
|
acpi_set_gpe_wake_mask(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
|
|
ACPI_GPE_DISABLE);
|
|
|
|
if (device_may_wakeup(&dev->dev))
|
|
acpi_disable_wakeup_device_power(dev);
|
|
}
|
|
}
|
|
|
|
int __init acpi_wakeup_device_init(void)
|
|
{
|
|
struct list_head *node, *next;
|
|
|
|
mutex_lock(&acpi_device_lock);
|
|
list_for_each_safe(node, next, &acpi_wakeup_device_list) {
|
|
struct acpi_device *dev = container_of(node,
|
|
struct acpi_device,
|
|
wakeup_list);
|
|
if (device_can_wakeup(&dev->dev)) {
|
|
/* Button GPEs are supposed to be always enabled. */
|
|
acpi_enable_gpe(dev->wakeup.gpe_device,
|
|
dev->wakeup.gpe_number);
|
|
device_set_wakeup_enable(&dev->dev, true);
|
|
}
|
|
}
|
|
mutex_unlock(&acpi_device_lock);
|
|
return 0;
|
|
}
|