lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] add suspend/resume for timer

Browse Source 
The timers lack .suspend/.resume methods.  Because of this, jiffies got a
big compensation after a S3 resume.  And then softlockup watchdog reports
an oops.  This occured with HPET enabled, but it's also possible for other
timers.

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Shaohua Li
2005-09-03 15:57:07 -07:00
committed by Linus Torvalds
parent 57c4ce3cbf
commit c3c433e4f3
6 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
arch/i386/kernel/timers/timer_tsc.c
View File

@@ -543,6 +543,19 @@ static int __init init_tsc(char* override)
return -ENODEV;
}
static int tsc_resume(void)
{
write_seqlock(&monotonic_lock);
/* Assume this is the last mark offset time */
rdtsc(last_tsc_low, last_tsc_high);
#ifdef CONFIG_HPET_TIMER
if (is_hpet_enabled() && hpet_use_timer)
hpet_last = hpet_readl(HPET_COUNTER);
#endif
write_sequnlock(&monotonic_lock);
return 0;
}
#ifndef CONFIG_X86_TSC
/* disable flag for tsc. Takes effect by clearing the TSC cpu flag
* in cpu/common.c */
@@ -573,6 +586,7 @@ static struct timer_opts timer_tsc = {
.monotonic_clock = monotonic_clock_tsc,
.delay = delay_tsc,
.read_timer = read_timer_tsc,
.resume = tsc_resume,
};
struct init_timer_opts __initdata timer_tsc_init = {