x86: merge tsc calibration

Merge the tsc calibration code for the 32bit and 64bit kernel.
The paravirtualized calculate_cpu_khz for 64bit now points to the correct
tsc_calibrate code as in 32bit.
Original native_calculate_cpu_khz for 64 bit is now called as calibrate_cpu.

Also moved the recalibrate_cpu_khz function in the common file.
Note that this function is called only from powernow K7 cpu freq driver.

Signed-off-by: Alok N Kataria <akataria@vmware.com>
Signed-off-by: Dan Hecht <dhecht@vmware.com>
Cc: Dan Hecht <dhecht@vmware.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 73 deletions

diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c
index dc8990056d75..40c0aafb358d 100644
--- a/arch/x86/kernel/tsc_32.c
+++ b/arch/x86/kernel/tsc_32.c
@@ -42,7 +42,7 @@ extern int tsc_disabled;
 
 DEFINE_PER_CPU(unsigned long, cyc2ns);
 
-static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
+void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
 {
         unsigned long long tsc_now, ns_now;
         unsigned long flags, *scale;
@@ -65,78 +65,6 @@ static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
         local_irq_restore(flags);
 }
 
-unsigned long native_calculate_cpu_khz(void)
-{
-        unsigned long long start, end;
-        unsigned long count;
-        u64 delta64 = (u64)ULLONG_MAX;
-        int i;
-        unsigned long flags;
-
-        local_irq_save(flags);
-
-        /* run 3 times to ensure the cache is warm and to get an accurate reading */
-        for (i = 0; i < 3; i++) {
-                mach_prepare_counter();
-                rdtscll(start);
-                mach_countup(&count);
-                rdtscll(end);
-
-                /*
-                 * Error: ECTCNEVERSET
-                 * The CTC wasn't reliable: we got a hit on the very first read,
-                 * or the CPU was so fast/slow that the quotient wouldn't fit in
-                 * 32 bits..
-                 */
-                if (count <= 1)
-                        continue;
-
-                /* cpu freq too slow: */
-                if ((end - start) <= CALIBRATE_TIME_MSEC)
-                        continue;
-
-                /*
-                 * We want the minimum time of all runs in case one of them
-                 * is inaccurate due to SMI or other delay
-                 */
-                delta64 = min(delta64, (end - start));
-        }
-
-        /* cpu freq too fast (or every run was bad): */
-        if (delta64 > (1ULL<<32))
-                goto err;
-
-        delta64 += CALIBRATE_TIME_MSEC/2; /* round for do_div */
-        do_div(delta64,CALIBRATE_TIME_MSEC);
-
-        local_irq_restore(flags);
-        return (unsigned long)delta64;
-err:
-        local_irq_restore(flags);
-        return 0;
-}
-
-int recalibrate_cpu_khz(void)
-{
-#ifndef CONFIG_SMP
-        unsigned long cpu_khz_old = cpu_khz;
-
-        if (cpu_has_tsc) {
-                cpu_khz = calculate_cpu_khz();
-                tsc_khz = cpu_khz;
-                cpu_data(0).loops_per_jiffy =
-                        cpufreq_scale(cpu_data(0).loops_per_jiffy,
-                                        cpu_khz_old, cpu_khz);
-                return 0;
-        } else
-                return -ENODEV;
-#else
-        return -ENODEV;
-#endif
-}
-
-EXPORT_SYMBOL(recalibrate_cpu_khz);
-
 #ifdef CONFIG_CPU_FREQ
 
 /*