Remove Intel check in i386 HPET code

PATCH In review Andi Kleen 2 participants 3 messages Jan 4, 2004 – Mar 29, 2004

Share & tools

Andi Kleen

author

2004-01-04 13:13 UTC #0 lore raw

PATCH 1/1 Remove Intel check in i386 HPET code

The i386 HPET time setup code would explicitely check for the Intel vendor ID. That is bogus because other chipset vendors (like AMD) are implementing HPET too.

Remove this check.

-Andi

arch/i386/kernel/time_hpet.c renamed from arch/i386/kernel/time_hpet.c~ +0 -4

diff -u linux-2.6.1rc1-bk3-ia32/arch/i386/kernel/time_hpet.c~ linux-2.6.1rc1-bk3-ia32/arch/i386/kernel/time_hpet.c
@@ -91,10 +91,6 @@
 	    !(id & HPET_ID_LEGSUP))
 		return -1;
 
-	if (((id & HPET_ID_VENDOR) >> HPET_ID_VENDOR_SHIFT) !=
-				HPET_ID_VENDOR_8086)
-		return -1;
-
 	hpet_period = hpet_readl(HPET_PERIOD);
 	if ((hpet_period < HPET_MIN_PERIOD) || (hpet_period > HPET_MAX_PERIOD))
 		return -1;

Vojtech Pavlik

2004-01-04 21:56 UTC #1 lore raw

Quoted 6 lines · Andi Kleen

The i386 HPET time setup code would explicitely check for the Intel vendor ID. That is bogus because other chipset vendors (like AMD) are implementing HPET too.
Remove this check.

You can also remove the HPET_ID_VENDOR_8086 definition.

Quoted 22 lines

-Andi
diff -u linux-2.6.1rc1-bk3-ia32/arch/i386/kernel/time_hpet.c~ linux-2.6.1rc1-bk3-ia32/arch/i386/kernel/time_hpet.c
arch/i386/kernel/time_hpet.c renamed from arch/i386/kernel/time_hpet.c~ +0 -5
@@ -91,10 +91,6 @@
 	    !(id & HPET_ID_LEGSUP))
 		return -1;
 
-	if (((id & HPET_ID_VENDOR) >> HPET_ID_VENDOR_SHIFT) !=
-				HPET_ID_VENDOR_8086)
-		return -1;
-
 	hpet_period = hpet_readl(HPET_PERIOD);
 	if ((hpet_period < HPET_MIN_PERIOD) || (hpet_period > HPET_MAX_PERIOD))
 		return -1;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Signature · 2 lines

Vojtech Pavlik
SuSE Labs, SuSE CR