summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorMark Langsdorf <mark.langsdorf@amd.com>2011-11-18 16:33:06 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-21 12:57:39 -0800
commitf4347eb6d2aae437d9552a26704bcb07f4626d6c (patch)
treee78b2d81528b5e143d8e17fd0fbf9cf83c56bb7e /fs
parent53824693961bf513fe152d35c887e83eb016eaea (diff)
x86, hpet: Immediately disable HPET timer 1 if rtc irq is masked
commit 2ded6e6a94c98ea453a156748cb7fabaf39a76b9 upstream. When HPET is operating in RTC mode, the TN_ENABLE bit on timer1 controls whether the HPET or the RTC delivers interrupts to irq8. When the system goes into suspend, the RTC driver sends a signal to the HPET driver so that the HPET releases control of irq8, allowing the RTC to wake the system from suspend. The switchover is accomplished by a write to the HPET configuration registers which currently only occurs while servicing the HPET interrupt. On some systems, I have seen the system suspend before an HPET interrupt occurs, preventing the write to the HPET configuration register and leaving the HPET in control of the irq8. As the HPET is not active during suspend, it does not generate a wake signal and RTC alarms do not work. This patch forces the HPET driver to immediately transfer control of the irq8 channel to the RTC instead of waiting until the next interrupt event. Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com> Link: http://lkml.kernel.org/r/20111118153306.GB16319@alberich.amd.com Tested-by: Andreas Herrmann <andreas.herrmann3@amd.com> Signed-off-by: Andreas Herrmann <andreas.herrmann3@amd.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions