diff options
| author | Alexey Makhalov <amakhalov@vmware.com> | 2016-10-28 00:54:30 -0700 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-10-30 08:57:07 +0100 |
| commit | 687bca8d664ac9b098005b57846773eb62040ae0 (patch) | |
| tree | 869798a4db92abbc247fe3cdff7ef19967f43761 /arch/x86/kernel/cpu/vmware.c | |
| parent | 5ccd5f7057d28cdd5a8eadd8d5d158984a0a13a8 (diff) | |
| download | linux-stable-687bca8d664ac9b098005b57846773eb62040ae0.tar.gz linux-stable-687bca8d664ac9b098005b57846773eb62040ae0.tar.bz2 linux-stable-687bca8d664ac9b098005b57846773eb62040ae0.zip | |
x86/vmware: Use tsc_khz value for calibrate_cpu()
Commit aa297292d708 ("x86/tsc: Enumerate SKL cpu_khz and tsc_khz via
CPUID") separated the calibration mechanisms for cpu_khz and tsc_khz.
Since the vmware hypervisor provides a constant frequency TSC to the guest,
this change can lead to divergence between the tsc and the cpu frequency
after vmotion, which might confuse the user.
Solve this by overriding the x86 platform cpu calibration callback with the
vmware specific tsc calibration function.
Signed-off-by: Alexey Makhalov <amakhalov@vmware.com>
Acked-by: Alok N Kataria <akataria@vmware.com>
Cc: linux-doc@vger.kernel.org
Cc: pv-drivers@vmware.com
Cc: corbet@lwn.net
Cc: virtualization@lists.linux-foundation.org
Link: http://lkml.kernel.org/r/20161028075432.90579-2-amakhalov@vmware.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/cpu/vmware.c')
| -rw-r--r-- | arch/x86/kernel/cpu/vmware.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c index 4e34da4be297..480790fe2463 100644 --- a/arch/x86/kernel/cpu/vmware.c +++ b/arch/x86/kernel/cpu/vmware.c @@ -83,6 +83,7 @@ static void __init vmware_platform_setup(void) vmware_tsc_khz = tsc_khz; x86_platform.calibrate_tsc = vmware_get_tsc_khz; + x86_platform.calibrate_cpu = vmware_get_tsc_khz; #ifdef CONFIG_X86_LOCAL_APIC /* Skip lapic calibration since we know the bus frequency. */ |