mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 22:51:42 +00:00
x86: idle wakeup event in the HLT loop
do a proper idle-wakeup event on HLT as well - some CPUs stop the TSC in HLT too, not just when going through the ACPI methods. (the ACPI idle code already does this.) [ update the 64-bit side too, as noticed by Jiri Slaby. ] Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
53d517cdba
commit
5ee613b675
@ -113,10 +113,19 @@ void default_idle(void)
|
|||||||
smp_mb();
|
smp_mb();
|
||||||
|
|
||||||
local_irq_disable();
|
local_irq_disable();
|
||||||
if (!need_resched())
|
if (!need_resched()) {
|
||||||
|
ktime_t t0, t1;
|
||||||
|
u64 t0n, t1n;
|
||||||
|
|
||||||
|
t0 = ktime_get();
|
||||||
|
t0n = ktime_to_ns(t0);
|
||||||
safe_halt(); /* enables interrupts racelessly */
|
safe_halt(); /* enables interrupts racelessly */
|
||||||
else
|
local_irq_disable();
|
||||||
local_irq_enable();
|
t1 = ktime_get();
|
||||||
|
t1n = ktime_to_ns(t1);
|
||||||
|
sched_clock_idle_wakeup_event(t1n - t0n);
|
||||||
|
}
|
||||||
|
local_irq_enable();
|
||||||
current_thread_info()->status |= TS_POLLING;
|
current_thread_info()->status |= TS_POLLING;
|
||||||
} else {
|
} else {
|
||||||
/* loop is done by the caller */
|
/* loop is done by the caller */
|
||||||
|
@ -116,9 +116,16 @@ static void default_idle(void)
|
|||||||
smp_mb();
|
smp_mb();
|
||||||
local_irq_disable();
|
local_irq_disable();
|
||||||
if (!need_resched()) {
|
if (!need_resched()) {
|
||||||
/* Enables interrupts one instruction before HLT.
|
ktime_t t0, t1;
|
||||||
x86 special cases this so there is no race. */
|
u64 t0n, t1n;
|
||||||
safe_halt();
|
|
||||||
|
t0 = ktime_get();
|
||||||
|
t0n = ktime_to_ns(t0);
|
||||||
|
safe_halt(); /* enables interrupts racelessly */
|
||||||
|
local_irq_disable();
|
||||||
|
t1 = ktime_get();
|
||||||
|
t1n = ktime_to_ns(t1);
|
||||||
|
sched_clock_idle_wakeup_event(t1n - t0n);
|
||||||
} else
|
} else
|
||||||
local_irq_enable();
|
local_irq_enable();
|
||||||
current_thread_info()->status |= TS_POLLING;
|
current_thread_info()->status |= TS_POLLING;
|
||||||
|
Loading…
Reference in New Issue
Block a user