aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/tsc_32.c
diff options
context:
space:
mode:
authorAlok Kataria <akataria@vmware.com>2008-06-20 18:06:33 -0400
committerIngo Molnar <mingo@elte.hu>2008-06-23 16:51:33 -0400
commit3da757daf86e498872855f0b5e101f763ba79499 (patch)
treebffffafed7322c66a1b886b661cfd8a8a7f5a924 /arch/x86/kernel/tsc_32.c
parente01b70ef3eb3080fecc35e15f68cd274c0a48163 (diff)
x86: use cpu_khz for loops_per_jiffy calculation
On the x86 platform we can use the value of tsc_khz computed during tsc calibration to calculate the loops_per_jiffy value. Its very important to keep the error in lpj values to minimum as any error in that may result in kernel panic in check_timer. In virtualization environment, On a highly overloaded host the guest delay calibration may sometimes result in errors beyond the ~50% that timer_irq_works can handle, resulting in the guest panicking. Does some formating changes to lpj_setup code to now have a single printk to print the bogomips value. We do this only for the boot processor because the AP's can have different base frequencies or the BIOS might boot a AP at a different frequency. Signed-off-by: Alok N Kataria <akataria@vmware.com> Cc: Arjan van de Ven <arjan@infradead.org> Cc: Daniel Hecht <dhecht@vmware.com> Cc: Tim Mann <mann@vmware.com> Cc: Zach Amsden <zach@vmware.com> Cc: Sahil Rihan <srihan@vmware.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/tsc_32.c')
-rw-r--r--arch/x86/kernel/tsc_32.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c
index 068759db63dd..be729035b30b 100644
--- a/arch/x86/kernel/tsc_32.c
+++ b/arch/x86/kernel/tsc_32.c
@@ -401,6 +401,7 @@ static inline void check_geode_tsc_reliable(void) { }
401void __init tsc_init(void) 401void __init tsc_init(void)
402{ 402{
403 int cpu; 403 int cpu;
404 u64 lpj;
404 405
405 if (!cpu_has_tsc || tsc_disabled) { 406 if (!cpu_has_tsc || tsc_disabled) {
406 /* Disable the TSC in case of !cpu_has_tsc */ 407 /* Disable the TSC in case of !cpu_has_tsc */
@@ -421,6 +422,10 @@ void __init tsc_init(void)
421 return; 422 return;
422 } 423 }
423 424
425 lpj = ((u64)tsc_khz * 1000);
426 do_div(lpj, HZ);
427 lpj_tsc = lpj;
428
424 printk("Detected %lu.%03lu MHz processor.\n", 429 printk("Detected %lu.%03lu MHz processor.\n",
425 (unsigned long)cpu_khz / 1000, 430 (unsigned long)cpu_khz / 1000,
426 (unsigned long)cpu_khz % 1000); 431 (unsigned long)cpu_khz % 1000);