diff options
| author | Dou Liyang <douly.fnst@cn.fujitsu.com> | 2017-07-14 11:34:06 +0800 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-09-25 15:22:44 +0200 |
| commit | eb496063c9904ce682253ee445b9acb9b6257581 (patch) | |
| tree | 7a9326a2c5a6f14afcf613fba6d7ec26c4ff3d30 /arch/x86/kernel/tsc.c | |
| parent | e19b205be43d11bff638cad4487008c48d21c103 (diff) | |
| download | linux-eb496063c9904ce682253ee445b9acb9b6257581.tar.gz linux-eb496063c9904ce682253ee445b9acb9b6257581.tar.bz2 linux-eb496063c9904ce682253ee445b9acb9b6257581.zip | |
x86/timers: Move the simple udelay calibration to tsc.h
Commit dd759d93f4dd ("x86/timers: Add simple udelay calibration") adds
an static function in x86 boot-time initializations.
But, this function is actually related to TSC, so it should be maintained
in tsc.c, not in setup.c.
Move simple_udelay_calibration() from setup.c to tsc.c and rename it to
tsc_early_delay_calibrate for more readability.
Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/1500003247-17368-1-git-send-email-douly.fnst@cn.fujitsu.com
Diffstat (limited to 'arch/x86/kernel/tsc.c')
| -rw-r--r-- | arch/x86/kernel/tsc.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 796d96bb0821..c173dcef1f46 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -1263,6 +1263,25 @@ static int __init init_tsc_clocksource(void) */ device_initcall(init_tsc_clocksource); +void __init tsc_early_delay_calibrate(void) +{ + unsigned long lpj; + + if (!boot_cpu_has(X86_FEATURE_TSC)) + return; + + cpu_khz = x86_platform.calibrate_cpu(); + tsc_khz = x86_platform.calibrate_tsc(); + + tsc_khz = tsc_khz ? : cpu_khz; + if (!tsc_khz) + return; + + lpj = tsc_khz * 1000; + do_div(lpj, HZ); + loops_per_jiffy = lpj; +} + void __init tsc_init(void) { u64 lpj, cyc; |