[PATCH] i386: fix hpet for systems that don't support legacy replacement

Currently the i386 HPET code assumes the entire HPET implementation from
the spec is present.  This breaks on boxes that do not implement the
optional legacy timer replacement functionality portion of the spec.

This patch, which is very similar to my x86-64 patch for the same issue,
fixes the problem allowing i386 systems that cannot use the HPET for the
timer interrupt and RTC to still use the HPET as a time source.  I've
tested this patch on a system systems without HPET, with HPET but without
legacy timer replacement, as well as HPET with legacy timer replacement.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 27 insertions, 21 deletions

diff --git a/arch/i386/kernel/time_hpet.c b/arch/i386/kernel/time_hpet.c
index 244a31b04be..10a0cbb88e7 100644
--- a/arch/i386/kernel/time_hpet.c
+++ b/arch/i386/kernel/time_hpet.c
@@ -26,6 +26,7 @@
 static unsigned long hpet_period;       /* fsecs / HPET clock */
 unsigned long hpet_tick;                /* hpet clks count per tick */
 unsigned long hpet_address;             /* hpet memory map physical address */
+int hpet_use_timer;
 
 static int use_hpet;            /* can be used for runtime check of hpet */
 static int boot_hpet_disable;   /* boottime override for HPET timer */
@@ -73,27 +74,30 @@ static int hpet_timer_stop_set_go(unsigned long tick)
         hpet_writel(0, HPET_COUNTER);
         hpet_writel(0, HPET_COUNTER + 4);
 
-        /*
-         * Set up timer 0, as periodic with first interrupt to happen at
-         * hpet_tick, and period also hpet_tick.
-         */
-        cfg = hpet_readl(HPET_T0_CFG);
-        cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC |
-               HPET_TN_SETVAL | HPET_TN_32BIT;
-        hpet_writel(cfg, HPET_T0_CFG);
-
-        /*
-         * The first write after writing TN_SETVAL to the config register sets
-         * the counter value, the second write sets the threshold.
-         */
-        hpet_writel(tick, HPET_T0_CMP);
-        hpet_writel(tick, HPET_T0_CMP);
+        if (hpet_use_timer) {
+                /*
+                 * Set up timer 0, as periodic with first interrupt to happen at
+                 * hpet_tick, and period also hpet_tick.
+                 */
+                cfg = hpet_readl(HPET_T0_CFG);
+                cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC |
+                       HPET_TN_SETVAL | HPET_TN_32BIT;
+                hpet_writel(cfg, HPET_T0_CFG);
 
+                /*
+                 * The first write after writing TN_SETVAL to the config register sets
+                 * the counter value, the second write sets the threshold.
+                 */
+                hpet_writel(tick, HPET_T0_CMP);
+                hpet_writel(tick, HPET_T0_CMP);
+        }
         /*
          * Go!
          */
         cfg = hpet_readl(HPET_CFG);
-        cfg |= HPET_CFG_ENABLE | HPET_CFG_LEGACY;
+        if (hpet_use_timer)
+                cfg |= HPET_CFG_LEGACY;
+        cfg |= HPET_CFG_ENABLE;
         hpet_writel(cfg, HPET_CFG);
 
         return 0;
@@ -128,12 +132,11 @@ int __init hpet_enable(void)
          * However, we can do with one timer otherwise using the
          * the single HPET timer for system time.
          */
-        if (
 #ifdef CONFIG_HPET_EMULATE_RTC
-                !(id & HPET_ID_NUMBER) ||
-#endif
-            !(id & HPET_ID_LEGSUP))
+        if (!(id & HPET_ID_NUMBER))
                 return -1;
+#endif
+
 
         hpet_period = hpet_readl(HPET_PERIOD);
         if ((hpet_period < HPET_MIN_PERIOD) || (hpet_period > HPET_MAX_PERIOD))
@@ -152,6 +155,8 @@ int __init hpet_enable(void)
         if (hpet_tick_rem > (hpet_period >> 1))
                 hpet_tick++; /* rounding the result */
 
+        hpet_use_timer = id & HPET_ID_LEGSUP;
+
         if (hpet_timer_stop_set_go(hpet_tick))
                 return -1;
 
@@ -202,7 +207,8 @@ int __init hpet_enable(void)
 #endif
 
 #ifdef CONFIG_X86_LOCAL_APIC
-        wait_timer_tick = wait_hpet_tick;
+        if (hpet_use_timer)
+                wait_timer_tick = wait_hpet_tick;
 #endif
         return 0;
 }