Commit 47e12f14 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_vmware_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 vmware guest update from Borislav Petkov:
 "Have vmware guests skip the refined TSC calibration when the TSC
  frequency has been retrieved from the hypervisor"

* tag 'x86_vmware_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vmware: Avoid TSC recalibration when frequency is known
parents 26a4ef7e 0b4a285e

arch/x86/kernel/cpu/vmware.c

+2 −0
Original line number Diff line number Diff line
@@ -379,6 +379,8 @@ static void __init vmware_set_capabilities(void) 
{

	setup_force_cpu_cap(X86_FEATURE_CONSTANT_TSC);

	setup_force_cpu_cap(X86_FEATURE_TSC_RELIABLE);

	if (vmware_tsc_khz)

		setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ);

	if (vmware_hypercall_mode == CPUID_VMWARE_FEATURES_ECX_VMCALL)

		setup_force_cpu_cap(X86_FEATURE_VMCALL);

	else if (vmware_hypercall_mode == CPUID_VMWARE_FEATURES_ECX_VMMCALL)