|
@@ -1585,6 +1585,43 @@ static int __init notimercheck(char *s)
|
|
|
}
|
|
|
__setup("no_timer_check", notimercheck);
|
|
|
|
|
|
+static void __init delay_with_tsc(void)
|
|
|
+{
|
|
|
+ unsigned long long start, now;
|
|
|
+ unsigned long end = jiffies + 4;
|
|
|
+
|
|
|
+ start = rdtsc();
|
|
|
+
|
|
|
+ /*
|
|
|
+ * We don't know the TSC frequency yet, but waiting for
|
|
|
+ * 40000000000/HZ TSC cycles is safe:
|
|
|
+ * 4 GHz == 10 jiffies
|
|
|
+ * 1 GHz == 40 jiffies
|
|
|
+ */
|
|
|
+ do {
|
|
|
+ rep_nop();
|
|
|
+ now = rdtsc();
|
|
|
+ } while ((now - start) < 40000000000UL / HZ &&
|
|
|
+ time_before_eq(jiffies, end));
|
|
|
+}
|
|
|
+
|
|
|
+static void __init delay_without_tsc(void)
|
|
|
+{
|
|
|
+ unsigned long end = jiffies + 4;
|
|
|
+ int band = 1;
|
|
|
+
|
|
|
+ /*
|
|
|
+ * We don't know any frequency yet, but waiting for
|
|
|
+ * 40940000000/HZ cycles is safe:
|
|
|
+ * 4 GHz == 10 jiffies
|
|
|
+ * 1 GHz == 40 jiffies
|
|
|
+ * 1 << 1 + 1 << 2 +...+ 1 << 11 = 4094
|
|
|
+ */
|
|
|
+ do {
|
|
|
+ __delay(((1U << band++) * 10000000UL) / HZ);
|
|
|
+ } while (band < 12 && time_before_eq(jiffies, end));
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* There is a nasty bug in some older SMP boards, their mptable lies
|
|
|
* about the timer IRQ. We do the following to work around the situation:
|
|
@@ -1603,8 +1640,12 @@ static int __init timer_irq_works(void)
|
|
|
|
|
|
local_save_flags(flags);
|
|
|
local_irq_enable();
|
|
|
- /* Let ten ticks pass... */
|
|
|
- mdelay((10 * 1000) / HZ);
|
|
|
+
|
|
|
+ if (boot_cpu_has(X86_FEATURE_TSC))
|
|
|
+ delay_with_tsc();
|
|
|
+ else
|
|
|
+ delay_without_tsc();
|
|
|
+
|
|
|
local_irq_restore(flags);
|
|
|
|
|
|
/*
|