aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacob Pan <jacob.jun.pan@linux.intel.com>2010-12-08 10:57:11 +0000
committerAlan Cox <alan@linux.intel.com>2010-12-08 10:57:11 +0000
commit2a186961a4379d7c2d60f29387971482c44f4408 (patch)
treef5cecbe0a4114f91e03f4de6cf06b790e1f357d6
parent90bb8d4688f3d51a4aa1ffea1b6a129c796ff211 (diff)
downloadmrst-s0i3-test-2a186961a4379d7c2d60f29387971482c44f4408.tar.gz
mrst-s0i3-test-2a186961a4379d7c2d60f29387971482c44f4408.tar.xz
mrst-s0i3-test-2a186961a4379d7c2d60f29387971482c44f4408.zip
x86/mrst: assign a guessed cpu_khz value before calibration
The new setup_local_APIC() code introduced by commit 8c3ba8d0 requires a valid cpu_khz value used as max loop count for clearing pending interrupts. However, Moorestown does a early APIC setup for the system timer interrupts which is before a valid cpu_khz is assigned in tsc calibration code. This patch assigns a guessed value for cpu_khz to avoid a warning in local APIC setup code. The acuracy of cpu_khz is not important at the point of local APIC setup. Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
-rw-r--r--arch/x86/platform/mrst/mrst.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index 79ae68154e8..c31e37f3891 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -285,6 +285,12 @@ void __init x86_mrst_early_setup(void)
x86_init.mpparse.find_smp_config = x86_init_noop;
x86_init.mpparse.get_smp_config = x86_init_uint_noop;
+ /*
+ * Give an estimated CPU frequency which will be used by early local
+ * APIC setup code prior to calibration. The true value will be set
+ * in tsc calibration later.
+ */
+ cpu_khz = 1500000;
}
/*