Skip to content

Commit

Permalink
x86: HPET: read from HPET_Tn_CMP() not HPET_T0_CMP
Browse files Browse the repository at this point in the history
In hpet_next_event() we check that the value we just wrote to
HPET_Tn_CMP(timer) has reached the chip. Currently, we're checking that
the value we wrote to HPET_Tn_CMP(timer) is in HPET_T0_CMP, which, if
timer is anything other than timer 0, is likely to fail.

Signed-off-by: Matt Fleming <mjf@gentoo.org>
Cc: mingo@elte.hu
Cc: venkatesh.pallipadi@intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Matt Fleming authored and Thomas Gleixner committed Nov 10, 2008
1 parent 1de5b08 commit 89d77a1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86/kernel/hpet.c
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ static int hpet_next_event(unsigned long delta,
* what we wrote hit the chip before we compare it to the
* counter.
*/
WARN_ON_ONCE((u32)hpet_readl(HPET_T0_CMP) != cnt);
WARN_ON_ONCE((u32)hpet_readl(HPET_Tn_CMP(timer)) != cnt);

return (s32)((u32)hpet_readl(HPET_COUNTER) - cnt) >= 0 ? -ETIME : 0;
}
Expand Down

0 comments on commit 89d77a1

Please sign in to comment.