Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: Eliminate us to pm ticks conversion in common path ACPI: Fix the incorrect calculation about C-state idle time ACPI: update feature-removal.txt to reflect deleted acpi=ht option ACPI / EC / PM: Fix names of functions that block/unblock EC transactions ACPI / EC / PM: Fix race between EC transactions and system suspend
This commit is contained in:
Linus Torvalds
Коммит
b8a3c6091a
|
|
@ -578,15 +578,6 @@ Who: Avi Kivity <avi@redhat.com>
|
|||
|
||||
----------------------------
|
||||
|
||||
What: "acpi=ht" boot option
|
||||
When: 2.6.35
|
||||
Why: Useful in 2003, implementation is a hack.
|
||||
Generally invoked by accident today.
|
||||
Seen as doing more harm than good.
|
||||
Who: Len Brown <len.brown@intel.com>
|
||||
|
||||
----------------------------
|
||||
|
||||
What: iwlwifi 50XX module parameters
|
||||
When: 2.6.40
|
||||
Why: The "..50" modules parameters were used to configure 5000 series and
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ enum {
|
|||
EC_FLAGS_GPE_STORM, /* GPE storm detected */
|
||||
EC_FLAGS_HANDLERS_INSTALLED, /* Handlers for GPE and
|
||||
* OpReg are installed */
|
||||
EC_FLAGS_FROZEN, /* Transactions are suspended */
|
||||
EC_FLAGS_BLOCKED, /* Transactions are blocked */
|
||||
};
|
||||
|
||||
/* If we find an EC via the ECDT, we need to keep a ptr to its context */
|
||||
|
|
@ -293,7 +293,7 @@ static int acpi_ec_transaction(struct acpi_ec *ec, struct transaction *t)
|
|||
if (t->rdata)
|
||||
memset(t->rdata, 0, t->rlen);
|
||||
mutex_lock(&ec->lock);
|
||||
if (test_bit(EC_FLAGS_FROZEN, &ec->flags)) {
|
||||
if (test_bit(EC_FLAGS_BLOCKED, &ec->flags)) {
|
||||
status = -EINVAL;
|
||||
goto unlock;
|
||||
}
|
||||
|
|
@ -459,7 +459,7 @@ int ec_transaction(u8 command,
|
|||
|
||||
EXPORT_SYMBOL(ec_transaction);
|
||||
|
||||
void acpi_ec_suspend_transactions(void)
|
||||
void acpi_ec_block_transactions(void)
|
||||
{
|
||||
struct acpi_ec *ec = first_ec;
|
||||
|
||||
|
|
@ -468,11 +468,11 @@ void acpi_ec_suspend_transactions(void)
|
|||
|
||||
mutex_lock(&ec->lock);
|
||||
/* Prevent transactions from being carried out */
|
||||
set_bit(EC_FLAGS_FROZEN, &ec->flags);
|
||||
set_bit(EC_FLAGS_BLOCKED, &ec->flags);
|
||||
mutex_unlock(&ec->lock);
|
||||
}
|
||||
|
||||
void acpi_ec_resume_transactions(void)
|
||||
void acpi_ec_unblock_transactions(void)
|
||||
{
|
||||
struct acpi_ec *ec = first_ec;
|
||||
|
||||
|
|
@ -481,10 +481,20 @@ void acpi_ec_resume_transactions(void)
|
|||
|
||||
mutex_lock(&ec->lock);
|
||||
/* Allow transactions to be carried out again */
|
||||
clear_bit(EC_FLAGS_FROZEN, &ec->flags);
|
||||
clear_bit(EC_FLAGS_BLOCKED, &ec->flags);
|
||||
mutex_unlock(&ec->lock);
|
||||
}
|
||||
|
||||
void acpi_ec_unblock_transactions_early(void)
|
||||
{
|
||||
/*
|
||||
* Allow transactions to happen again (this function is called from
|
||||
* atomic context during wakeup, so we don't need to acquire the mutex).
|
||||
*/
|
||||
if (first_ec)
|
||||
clear_bit(EC_FLAGS_BLOCKED, &first_ec->flags);
|
||||
}
|
||||
|
||||
static int acpi_ec_query_unlocked(struct acpi_ec *ec, u8 * data)
|
||||
{
|
||||
int result;
|
||||
|
|
|
|||
|
|
@ -49,8 +49,9 @@ void acpi_early_processor_set_pdc(void);
|
|||
int acpi_ec_init(void);
|
||||
int acpi_ec_ecdt_probe(void);
|
||||
int acpi_boot_ec_enable(void);
|
||||
void acpi_ec_suspend_transactions(void);
|
||||
void acpi_ec_resume_transactions(void);
|
||||
void acpi_ec_block_transactions(void);
|
||||
void acpi_ec_unblock_transactions(void);
|
||||
void acpi_ec_unblock_transactions_early(void);
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
Suspend/Resume
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ module_param(nocst, uint, 0000);
|
|||
static unsigned int latency_factor __read_mostly = 2;
|
||||
module_param(latency_factor, uint, 0644);
|
||||
|
||||
static s64 us_to_pm_timer_ticks(s64 t)
|
||||
static u64 us_to_pm_timer_ticks(s64 t)
|
||||
{
|
||||
return div64_u64(t * PM_TIMER_FREQUENCY, 1000000);
|
||||
}
|
||||
|
|
@ -731,10 +731,10 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
|
|||
|
||||
seq_puts(seq, "demotion[--] ");
|
||||
|
||||
seq_printf(seq, "latency[%03d] usage[%08d] duration[%020llu]\n",
|
||||
seq_printf(seq, "latency[%03d] usage[%08d] duration[%020Lu]\n",
|
||||
pr->power.states[i].latency,
|
||||
pr->power.states[i].usage,
|
||||
(unsigned long long)pr->power.states[i].time);
|
||||
us_to_pm_timer_ticks(pr->power.states[i].time));
|
||||
}
|
||||
|
||||
end:
|
||||
|
|
@ -861,7 +861,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
|
|||
ktime_t kt1, kt2;
|
||||
s64 idle_time_ns;
|
||||
s64 idle_time;
|
||||
s64 sleep_ticks = 0;
|
||||
|
||||
pr = __get_cpu_var(processors);
|
||||
|
||||
|
|
@ -906,8 +905,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
|
|||
idle_time = idle_time_ns;
|
||||
do_div(idle_time, NSEC_PER_USEC);
|
||||
|
||||
sleep_ticks = us_to_pm_timer_ticks(idle_time);
|
||||
|
||||
/* Tell the scheduler how much we idled: */
|
||||
sched_clock_idle_wakeup_event(idle_time_ns);
|
||||
|
||||
|
|
@ -918,7 +915,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
|
|||
cx->usage++;
|
||||
|
||||
lapic_timer_state_broadcast(pr, cx, 0);
|
||||
cx->time += sleep_ticks;
|
||||
cx->time += idle_time;
|
||||
return idle_time;
|
||||
}
|
||||
|
||||
|
|
@ -940,7 +937,6 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
|
|||
ktime_t kt1, kt2;
|
||||
s64 idle_time_ns;
|
||||
s64 idle_time;
|
||||
s64 sleep_ticks = 0;
|
||||
|
||||
|
||||
pr = __get_cpu_var(processors);
|
||||
|
|
@ -1022,11 +1018,10 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
|
|||
spin_unlock(&c3_lock);
|
||||
}
|
||||
kt2 = ktime_get_real();
|
||||
idle_time_ns = ktime_to_us(ktime_sub(kt2, kt1));
|
||||
idle_time_ns = ktime_to_ns(ktime_sub(kt2, kt1));
|
||||
idle_time = idle_time_ns;
|
||||
do_div(idle_time, NSEC_PER_USEC);
|
||||
|
||||
sleep_ticks = us_to_pm_timer_ticks(idle_time);
|
||||
/* Tell the scheduler how much we idled: */
|
||||
sched_clock_idle_wakeup_event(idle_time_ns);
|
||||
|
||||
|
|
@ -1037,7 +1032,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
|
|||
cx->usage++;
|
||||
|
||||
lapic_timer_state_broadcast(pr, cx, 0);
|
||||
cx->time += sleep_ticks;
|
||||
cx->time += idle_time;
|
||||
return idle_time;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -94,11 +94,13 @@ void __init acpi_old_suspend_ordering(void)
|
|||
}
|
||||
|
||||
/**
|
||||
* acpi_pm_disable_gpes - Disable the GPEs.
|
||||
* acpi_pm_freeze - Disable the GPEs and suspend EC transactions.
|
||||
*/
|
||||
static int acpi_pm_disable_gpes(void)
|
||||
static int acpi_pm_freeze(void)
|
||||
{
|
||||
acpi_disable_all_gpes();
|
||||
acpi_os_wait_events_complete(NULL);
|
||||
acpi_ec_block_transactions();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -126,7 +128,8 @@ static int acpi_pm_prepare(void)
|
|||
int error = __acpi_pm_prepare();
|
||||
|
||||
if (!error)
|
||||
acpi_disable_all_gpes();
|
||||
acpi_pm_freeze();
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
|
|
@ -256,6 +259,8 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
|
|||
* acpi_leave_sleep_state will reenable specific GPEs later
|
||||
*/
|
||||
acpi_disable_all_gpes();
|
||||
/* Allow EC transactions to happen. */
|
||||
acpi_ec_unblock_transactions_early();
|
||||
|
||||
local_irq_restore(flags);
|
||||
printk(KERN_DEBUG "Back to C!\n");
|
||||
|
|
@ -267,6 +272,12 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
|
|||
return ACPI_SUCCESS(status) ? 0 : -EFAULT;
|
||||
}
|
||||
|
||||
static void acpi_suspend_finish(void)
|
||||
{
|
||||
acpi_ec_unblock_transactions();
|
||||
acpi_pm_finish();
|
||||
}
|
||||
|
||||
static int acpi_suspend_state_valid(suspend_state_t pm_state)
|
||||
{
|
||||
u32 acpi_state;
|
||||
|
|
@ -288,7 +299,7 @@ static struct platform_suspend_ops acpi_suspend_ops = {
|
|||
.begin = acpi_suspend_begin,
|
||||
.prepare_late = acpi_pm_prepare,
|
||||
.enter = acpi_suspend_enter,
|
||||
.wake = acpi_pm_finish,
|
||||
.wake = acpi_suspend_finish,
|
||||
.end = acpi_pm_end,
|
||||
};
|
||||
|
||||
|
|
@ -314,9 +325,9 @@ static int acpi_suspend_begin_old(suspend_state_t pm_state)
|
|||
static struct platform_suspend_ops acpi_suspend_ops_old = {
|
||||
.valid = acpi_suspend_state_valid,
|
||||
.begin = acpi_suspend_begin_old,
|
||||
.prepare_late = acpi_pm_disable_gpes,
|
||||
.prepare_late = acpi_pm_freeze,
|
||||
.enter = acpi_suspend_enter,
|
||||
.wake = acpi_pm_finish,
|
||||
.wake = acpi_suspend_finish,
|
||||
.end = acpi_pm_end,
|
||||
.recover = acpi_pm_finish,
|
||||
};
|
||||
|
|
@ -433,6 +444,7 @@ static int acpi_hibernation_enter(void)
|
|||
static void acpi_hibernation_finish(void)
|
||||
{
|
||||
hibernate_nvs_free();
|
||||
acpi_ec_unblock_transactions();
|
||||
acpi_pm_finish();
|
||||
}
|
||||
|
||||
|
|
@ -453,19 +465,13 @@ static void acpi_hibernation_leave(void)
|
|||
}
|
||||
/* Restore the NVS memory area */
|
||||
hibernate_nvs_restore();
|
||||
/* Allow EC transactions to happen. */
|
||||
acpi_ec_unblock_transactions_early();
|
||||
}
|
||||
|
||||
static int acpi_pm_pre_restore(void)
|
||||
static void acpi_pm_thaw(void)
|
||||
{
|
||||
acpi_disable_all_gpes();
|
||||
acpi_os_wait_events_complete(NULL);
|
||||
acpi_ec_suspend_transactions();
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void acpi_pm_restore_cleanup(void)
|
||||
{
|
||||
acpi_ec_resume_transactions();
|
||||
acpi_ec_unblock_transactions();
|
||||
acpi_enable_all_runtime_gpes();
|
||||
}
|
||||
|
||||
|
|
@ -477,8 +483,8 @@ static struct platform_hibernation_ops acpi_hibernation_ops = {
|
|||
.prepare = acpi_pm_prepare,
|
||||
.enter = acpi_hibernation_enter,
|
||||
.leave = acpi_hibernation_leave,
|
||||
.pre_restore = acpi_pm_pre_restore,
|
||||
.restore_cleanup = acpi_pm_restore_cleanup,
|
||||
.pre_restore = acpi_pm_freeze,
|
||||
.restore_cleanup = acpi_pm_thaw,
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -510,12 +516,9 @@ static int acpi_hibernation_begin_old(void)
|
|||
|
||||
static int acpi_hibernation_pre_snapshot_old(void)
|
||||
{
|
||||
int error = acpi_pm_disable_gpes();
|
||||
|
||||
if (!error)
|
||||
hibernate_nvs_save();
|
||||
|
||||
return error;
|
||||
acpi_pm_freeze();
|
||||
hibernate_nvs_save();
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -527,11 +530,11 @@ static struct platform_hibernation_ops acpi_hibernation_ops_old = {
|
|||
.end = acpi_pm_end,
|
||||
.pre_snapshot = acpi_hibernation_pre_snapshot_old,
|
||||
.finish = acpi_hibernation_finish,
|
||||
.prepare = acpi_pm_disable_gpes,
|
||||
.prepare = acpi_pm_freeze,
|
||||
.enter = acpi_hibernation_enter,
|
||||
.leave = acpi_hibernation_leave,
|
||||
.pre_restore = acpi_pm_pre_restore,
|
||||
.restore_cleanup = acpi_pm_restore_cleanup,
|
||||
.pre_restore = acpi_pm_freeze,
|
||||
.restore_cleanup = acpi_pm_thaw,
|
||||
.recover = acpi_pm_finish,
|
||||
};
|
||||
#endif /* CONFIG_HIBERNATION */
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче