Commit f00c96f3 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Linus Torvalds

[PATCH] hpet-RTC: disable interrupt when no longer needed

When the emulated RTC interrupt is no longer needed, we better disable it;
otherwise, we get a spurious interrupt whenever the timer has rolled over and
reaches the same comparator value.

Having a superfluous interrupt every five minutes doesn't hurt much, but it's
bad style anyway.  ;-)
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Acked-by: default avatar"Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0d290861
...@@ -319,8 +319,12 @@ static void hpet_rtc_timer_reinit(void) ...@@ -319,8 +319,12 @@ static void hpet_rtc_timer_reinit(void)
{ {
unsigned int cfg, cnt; unsigned int cfg, cnt;
if (!(PIE_on | AIE_on | UIE_on)) if (unlikely(!(PIE_on | AIE_on | UIE_on))) {
cfg = hpet_readl(HPET_T1_CFG);
cfg &= ~HPET_TN_ENABLE;
hpet_writel(cfg, HPET_T1_CFG);
return; return;
}
if (PIE_on && (PIE_freq > DEFAULT_RTC_INT_FREQ)) if (PIE_on && (PIE_freq > DEFAULT_RTC_INT_FREQ))
hpet_rtc_int_freq = PIE_freq; hpet_rtc_int_freq = PIE_freq;
......
...@@ -1138,8 +1138,12 @@ static void hpet_rtc_timer_reinit(void) ...@@ -1138,8 +1138,12 @@ static void hpet_rtc_timer_reinit(void)
{ {
unsigned int cfg, cnt; unsigned int cfg, cnt;
if (!(PIE_on | AIE_on | UIE_on)) if (unlikely(!(PIE_on | AIE_on | UIE_on))) {
cfg = hpet_readl(HPET_T1_CFG);
cfg &= ~HPET_TN_ENABLE;
hpet_writel(cfg, HPET_T1_CFG);
return; return;
}
if (PIE_on && (PIE_freq > DEFAULT_RTC_INT_FREQ)) if (PIE_on && (PIE_freq > DEFAULT_RTC_INT_FREQ))
hpet_rtc_int_freq = PIE_freq; hpet_rtc_int_freq = PIE_freq;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment