Skip to contentSkip to conversation

hpet: Fix emulation of HPET_TN_SETVAL

PATCH Applied Jan Kiszka 2 participants 2 messages Apr 16, 2009 – Apr 17, 2009

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 hpet: Fix emulation of HPET_TN_SETVAL

While Intel's spec is not that clear here, latest changes to Linux' HPET code (commit c23e253e67c9d8a91a0ffa33c1f571a17f0a2403, "x86: hpet: stop HPET_COUNTER when programming periodic mode") strongly suggest that HPET_TN_SETVAL rather means: Set _both_ the comparator value and register.

With this patch applied, I'm again able to boot 2.6.30-rc kernels as they no longer panic like this (which was due to the comparator register remaining 0):

ENABLING IO-APIC IRQs
..TIMER: vector=0x30 apic1=0 pin1=2 apic2=-1 pin2=-1 ..MP-BIOS bug: 8254 timer not connected to IO-APIC ...trying to set up timer (IRQ0) through the 8259A ... ..... (found apic 0 pin 2) ...
....... failed.
...trying to set up timer as Virtual Wire IRQ... ..... failed.
...trying to set up timer as ExtINT IRQ... ..... failed :(.

Kernel panic - not syncing: IO-APIC + timer doesn't work! [...]

---

 hw/hpet.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
hw/hpet.c +1 -1
index 7df2d05..c7945ec 100644
@@ -411,7 +411,7 @@ static void hpet_ram_writel(void *opaque, target_phys_addr_t addr,
                            (timer->config & HPET_TN_SETVAL))
                     timer->cmp = (timer->cmp & 0xffffffff00000000ULL)
                                   | new_val;
-                else {
+                if (timer_is_periodic(timer)) {
                     /*
                      * FIXME: Clamp period to reasonable min value?
                      * Clamp period to reasonable max value
#1 lore raw
Quoted 20 lines · Jan Kiszka

While Intel's spec is not that clear here, latest changes to Linux' HPET code (commit c23e253e67c9d8a91a0ffa33c1f571a17f0a2403, "x86: hpet: stop HPET_COUNTER when programming periodic mode") strongly suggest that HPET_TN_SETVAL rather means: Set _both_ the comparator value and register.

With this patch applied, I'm again able to boot 2.6.30-rc kernels as they no longer panic like this (which was due to the comparator register remaining 0):

ENABLING IO-APIC IRQs
..TIMER: vector=0x30 apic1=0 pin1=2 apic2=-1 pin2=-1 ..MP-BIOS bug: 8254 timer not connected to IO-APIC ...trying to set up timer (IRQ0) through the 8259A ... ..... (found apic 0 pin 2) ...
....... failed.
...trying to set up timer as Virtual Wire IRQ... ..... failed.
...trying to set up timer as ExtINT IRQ... ..... failed :(.

Quoted 4 lines
Kernel panic - not syncing: IO-APIC + timer doesn't work! [...]

Applied to trunk and stable. Thanks.

Signature · 3 lines
Regards,

Anthony Liguori