Re: [PATCH] Blacklist Dell Optiplex 320 from using the HPET

Thomas Gleixner
2007-05-05T15:24:48Z

Guilherme,

please discard the previous patch. I missed to refresh it before sending
it out. Correct version below.

tglx

On Sat, 2007-05-05 at 16:26 +0200, Thomas Gleixner wrote:
> can you please undo John's patch and check whether the patch below works
> for you.

Index: linux-2.6.21/arch/i386/kernel/hpet.c
===================================================================
--- linux-2.6.21.orig/arch/i386/kernel/hpet.c
+++ linux-2.6.21/arch/i386/kernel/hpet.c
@@ -231,6 +231,7 @@ int __init hpet_enable(void)
{
unsigned long id;
uint64_t hpet_freq;
+ cycle_t t1;
u64 tmp;

if (!is_hpet_capable())
@@ -278,6 +279,14 @@ int __init hpet_enable(void)
/* Start the counter */
hpet_start_counter();

+ /* Verify whether hpet counter works */
+ t1 = read_hpet();
+ udelay(50);
+ if (t1 == read_hpet()) {
+ printk(KERN_WARNING "HPET counter is defect\n");
+ goto out_nohpet;
+ }
+
/* Initialize and register HPET clocksource
*
* hpet period is in femto seconds per cycle