Merge tag 'x86-timers-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit a92ad11fb209 · 2020-08-03T17:41:06.000-07:00
Pull x86 timer update from Ingo Molnar:
 "Set the X86_FEATURE_TSC_KNOWN_FREQ flag for Xen guests, to avoid
  recalibration"

* tag 'x86-timers-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/xen/time: Set the X86_FEATURE_TSC_KNOWN_FREQ flag in xen_tsc_khz()
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
@@ -39,6 +39,7 @@ static unsigned long xen_tsc_khz(void)
 	struct pvclock_vcpu_time_info *info =
 		&HYPERVISOR_shared_info->vcpu_info[0].time;
 
+	setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ);
 	return pvclock_tsc_khz(info);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ static unsigned long xen_tsc_khz(void)`
`39`	`39`	`struct pvclock_vcpu_time_info *info =`
`40`	`40`	`&HYPERVISOR_shared_info->vcpu_info[0].time;`
`41`	`41`
	`42`	`+ setup_force_cpu_cap(X86_FEATURE_TSC_KNOWN_FREQ);`
`42`	`43`	`return pvclock_tsc_khz(info);`
`43`	`44`	`}`
`44`	`45`