[PATCH] Add another PCI ID for ICH6 force hpet.

[PATCH] Add another PCI ID for ICH6 force hpet.

[Krzysztof Oledzki]

>From 4c01199fa9cd9e5871ca96cd243a03aeae0d0f48 Mon Sep 17 00:00:00 2001
From: Krzysztof Piotr Oledzki <ole@ans.pl>
Date: Wed, 4 Jun 2008 03:30:26 +0200
Subject: [HPET] Add another PCI ID for ICH6 force hpet.

Tested on Asus P5GDC-V

$ lspci -n -n |grep ISA
00:1f.0 ISA bridge [0601]: Intel Corporation 82801FB/FR (ICH6/ICH6R) LPC Interface Bridge [8086:2640] (rev 03)

Force enabled HPET at base address 0xfed00000
hpet clockevent registered
hpet0: at MMIO 0xfed00000, IRQs 2, 8, 0
hpet0: 3 64-bit timers, 14318180 Hz

Signed-off-by: Krzysztof Piotr Oledzki <ole@ans.pl>
---
 arch/x86/kernel/quirks.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index d89a648..06e1fd6 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -158,6 +158,8 @@ static void ich_force_enable_hpet(struct pci_dev *dev)
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0,
 			 ich_force_enable_hpet);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0,
+			 ich_force_enable_hpet);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1,
 			 ich_force_enable_hpet);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0,
-- 
1.5.5.3

[PATCH] Add PCI ID for 6300ESB force hpet

[Joe Buehler]

Tested on Supermicro X6DVA-EG2.

# lspci
00:1f.0 ISA bridge: Intel Corporation 6300ESB LPC Interface Controller (rev 02)
# lspci -n
00:1f.0 Class 0601: 8086:25a1 (rev 02)

kernel: pci 0000:00:1f.0: Force enabled HPET at 0xfed00000
kernel: hpet clockevent registered
kernel: hpet0: at MMIO 0xfed00000, IRQs 2, 8, 0
kernel: hpet0: 3 64-bit timers, 14318180 Hz

--- linux-2.6.25.3/arch/x86/kernel/quirks.c.~1~	2008-05-10 00:48:50.000000000 -0400
+++ linux-2.6.25.3/arch/x86/kernel/quirks.c	2008-06-04 14:54:55.000000000 -0400
@@ -255,6 +255,8 @@
  		old_ich_force_enable_hpet(dev);
  }

+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_1,
+			 old_ich_force_enable_hpet_user);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0,
  			 old_ich_force_enable_hpet_user);
  DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_12,

-- 
Joe Buehler

Re: [PATCH] Add PCI ID for 6300ESB force hpet

[Ingo Molnar]

* Joe Buehler <aspam@cox.net> wrote:

> Tested on Supermicro X6DVA-EG2.
>
> # lspci
> 00:1f.0 ISA bridge: Intel Corporation 6300ESB LPC Interface Controller (rev 02)
> # lspci -n
> 00:1f.0 Class 0601: 8086:25a1 (rev 02)
>
> kernel: pci 0000:00:1f.0: Force enabled HPET at 0xfed00000
> kernel: hpet clockevent registered
> kernel: hpet0: at MMIO 0xfed00000, IRQs 2, 8, 0
> kernel: hpet0: 3 64-bit timers, 14318180 Hz

applied to tip/timers/hpet. Thanks Joe,

	Ingo