ACPI: Convert wake_sleep_flags to a value instead of function
With commit a2ef5c4fd4
"ACPI: Move module parameter gts and bfs to sleep.c" the wake_sleep_flags
is required when calling acpi_enter_sleep_state, which means
that if there are functions outside the sleep.c code they
can't get the wake_sleep_flags values.
This converts the function in to a exported value and converts
the module config operands to a function.
Acked-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Lin Ming <ming.m.lin@intel.com>
[v2: Parameters can be turned on/off dynamically]
[v3: unsigned char -> u8]
[v4: val -> kp->arg]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Link: http://lkml.kernel.org/r/1335150198-21899-2-git-send-email-konrad.wilk@oracle.com
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
parent
cbf2829b61
commit
2a14e541ed
|
@ -9,6 +9,8 @@ extern long saved_magic;
|
||||||
|
|
||||||
extern int wakeup_pmode_return;
|
extern int wakeup_pmode_return;
|
||||||
|
|
||||||
|
extern u8 wake_sleep_flags;
|
||||||
|
|
||||||
extern unsigned long acpi_copy_wakeup_routine(unsigned long);
|
extern unsigned long acpi_copy_wakeup_routine(unsigned long);
|
||||||
extern void wakeup_long64(void);
|
extern void wakeup_long64(void);
|
||||||
|
|
||||||
|
|
|
@ -28,24 +28,34 @@
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "sleep.h"
|
#include "sleep.h"
|
||||||
|
|
||||||
|
u8 wake_sleep_flags = ACPI_NO_OPTIONAL_METHODS;
|
||||||
static unsigned int gts, bfs;
|
static unsigned int gts, bfs;
|
||||||
module_param(gts, uint, 0644);
|
static int set_param_wake_flag(const char *val, struct kernel_param *kp)
|
||||||
module_param(bfs, uint, 0644);
|
{
|
||||||
|
int ret = param_set_int(val, kp);
|
||||||
|
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
if (kp->arg == (const char *)>s) {
|
||||||
|
if (gts)
|
||||||
|
wake_sleep_flags |= ACPI_EXECUTE_GTS;
|
||||||
|
else
|
||||||
|
wake_sleep_flags &= ~ACPI_EXECUTE_GTS;
|
||||||
|
}
|
||||||
|
if (kp->arg == (const char *)&bfs) {
|
||||||
|
if (bfs)
|
||||||
|
wake_sleep_flags |= ACPI_EXECUTE_BFS;
|
||||||
|
else
|
||||||
|
wake_sleep_flags &= ~ACPI_EXECUTE_BFS;
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
module_param_call(gts, set_param_wake_flag, param_get_int, >s, 0644);
|
||||||
|
module_param_call(bfs, set_param_wake_flag, param_get_int, &bfs, 0644);
|
||||||
MODULE_PARM_DESC(gts, "Enable evaluation of _GTS on suspend.");
|
MODULE_PARM_DESC(gts, "Enable evaluation of _GTS on suspend.");
|
||||||
MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".);
|
MODULE_PARM_DESC(bfs, "Enable evaluation of _BFS on resume".);
|
||||||
|
|
||||||
static u8 wake_sleep_flags(void)
|
|
||||||
{
|
|
||||||
u8 flags = ACPI_NO_OPTIONAL_METHODS;
|
|
||||||
|
|
||||||
if (gts)
|
|
||||||
flags |= ACPI_EXECUTE_GTS;
|
|
||||||
if (bfs)
|
|
||||||
flags |= ACPI_EXECUTE_BFS;
|
|
||||||
|
|
||||||
return flags;
|
|
||||||
}
|
|
||||||
|
|
||||||
static u8 sleep_states[ACPI_S_STATE_COUNT];
|
static u8 sleep_states[ACPI_S_STATE_COUNT];
|
||||||
|
|
||||||
static void acpi_sleep_tts_switch(u32 acpi_state)
|
static void acpi_sleep_tts_switch(u32 acpi_state)
|
||||||
|
@ -263,7 +273,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
|
||||||
{
|
{
|
||||||
acpi_status status = AE_OK;
|
acpi_status status = AE_OK;
|
||||||
u32 acpi_state = acpi_target_sleep_state;
|
u32 acpi_state = acpi_target_sleep_state;
|
||||||
u8 flags = wake_sleep_flags();
|
|
||||||
int error;
|
int error;
|
||||||
|
|
||||||
ACPI_FLUSH_CPU_CACHE();
|
ACPI_FLUSH_CPU_CACHE();
|
||||||
|
@ -271,7 +280,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
|
||||||
switch (acpi_state) {
|
switch (acpi_state) {
|
||||||
case ACPI_STATE_S1:
|
case ACPI_STATE_S1:
|
||||||
barrier();
|
barrier();
|
||||||
status = acpi_enter_sleep_state(acpi_state, flags);
|
status = acpi_enter_sleep_state(acpi_state, wake_sleep_flags);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case ACPI_STATE_S3:
|
case ACPI_STATE_S3:
|
||||||
|
@ -286,7 +295,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
|
||||||
acpi_write_bit_register(ACPI_BITREG_SCI_ENABLE, 1);
|
acpi_write_bit_register(ACPI_BITREG_SCI_ENABLE, 1);
|
||||||
|
|
||||||
/* Reprogram control registers and execute _BFS */
|
/* Reprogram control registers and execute _BFS */
|
||||||
acpi_leave_sleep_state_prep(acpi_state, flags);
|
acpi_leave_sleep_state_prep(acpi_state, wake_sleep_flags);
|
||||||
|
|
||||||
/* ACPI 3.0 specs (P62) says that it's the responsibility
|
/* ACPI 3.0 specs (P62) says that it's the responsibility
|
||||||
* of the OSPM to clear the status bit [ implying that the
|
* of the OSPM to clear the status bit [ implying that the
|
||||||
|
@ -550,30 +559,27 @@ static int acpi_hibernation_begin(void)
|
||||||
|
|
||||||
static int acpi_hibernation_enter(void)
|
static int acpi_hibernation_enter(void)
|
||||||
{
|
{
|
||||||
u8 flags = wake_sleep_flags();
|
|
||||||
acpi_status status = AE_OK;
|
acpi_status status = AE_OK;
|
||||||
|
|
||||||
ACPI_FLUSH_CPU_CACHE();
|
ACPI_FLUSH_CPU_CACHE();
|
||||||
|
|
||||||
/* This shouldn't return. If it returns, we have a problem */
|
/* This shouldn't return. If it returns, we have a problem */
|
||||||
status = acpi_enter_sleep_state(ACPI_STATE_S4, flags);
|
status = acpi_enter_sleep_state(ACPI_STATE_S4, wake_sleep_flags);
|
||||||
/* Reprogram control registers and execute _BFS */
|
/* Reprogram control registers and execute _BFS */
|
||||||
acpi_leave_sleep_state_prep(ACPI_STATE_S4, flags);
|
acpi_leave_sleep_state_prep(ACPI_STATE_S4, wake_sleep_flags);
|
||||||
|
|
||||||
return ACPI_SUCCESS(status) ? 0 : -EFAULT;
|
return ACPI_SUCCESS(status) ? 0 : -EFAULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void acpi_hibernation_leave(void)
|
static void acpi_hibernation_leave(void)
|
||||||
{
|
{
|
||||||
u8 flags = wake_sleep_flags();
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If ACPI is not enabled by the BIOS and the boot kernel, we need to
|
* If ACPI is not enabled by the BIOS and the boot kernel, we need to
|
||||||
* enable it here.
|
* enable it here.
|
||||||
*/
|
*/
|
||||||
acpi_enable();
|
acpi_enable();
|
||||||
/* Reprogram control registers and execute _BFS */
|
/* Reprogram control registers and execute _BFS */
|
||||||
acpi_leave_sleep_state_prep(ACPI_STATE_S4, flags);
|
acpi_leave_sleep_state_prep(ACPI_STATE_S4, wake_sleep_flags);
|
||||||
/* Check the hardware signature */
|
/* Check the hardware signature */
|
||||||
if (facs && s4_hardware_signature != facs->hardware_signature) {
|
if (facs && s4_hardware_signature != facs->hardware_signature) {
|
||||||
printk(KERN_EMERG "ACPI: Hardware changed while hibernated, "
|
printk(KERN_EMERG "ACPI: Hardware changed while hibernated, "
|
||||||
|
@ -828,12 +834,10 @@ static void acpi_power_off_prepare(void)
|
||||||
|
|
||||||
static void acpi_power_off(void)
|
static void acpi_power_off(void)
|
||||||
{
|
{
|
||||||
u8 flags = wake_sleep_flags();
|
|
||||||
|
|
||||||
/* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
|
/* acpi_sleep_prepare(ACPI_STATE_S5) should have already been called */
|
||||||
printk(KERN_DEBUG "%s called\n", __func__);
|
printk(KERN_DEBUG "%s called\n", __func__);
|
||||||
local_irq_disable();
|
local_irq_disable();
|
||||||
acpi_enter_sleep_state(ACPI_STATE_S5, flags);
|
acpi_enter_sleep_state(ACPI_STATE_S5, wake_sleep_flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue