Skip to content

Commit cc6afe2

Browse files
bonziniKAGA-KOKO
authored andcommitted
x86/apic: Silence "FW_BUG TSC_DEADLINE disabled due to Errata" on hypervisors
Commit 594a30f ("x86/apic: Silence "FW_BUG TSC_DEADLINE disabled due to Errata" on CPUs without the feature", 2017-08-30) was also about silencing the warning on VirtualBox; however, KVM does expose the TSC deadline timer, and it's virtualized so that it is immune from CPU errata. Therefore, booting 4.13 with "-cpu Haswell" shows this in the logs: [ 0.000000] [Firmware Bug]: TSC_DEADLINE disabled due to Errata; please update microcode to version: 0xb2 (or later) Even if you had a hypervisor that does _not_ virtualize the TSC deadline and rather exposes the hardware one, it should be the hypervisors task to update microcode and possibly hide the flag from CPUID. So just hide the message when running on _any_ hypervisor, not just those that do not support the TSC deadline timer. The older check still makes sense, so keep it. Fixes: bd9240a ("x86/apic: Add TSC_DEADLINE quirk due to errata") Signed-off-by: Paolo Bonzini <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Hans de Goede <[email protected]> Cc: [email protected] Cc: [email protected] Link: https://lkml.kernel.org/r/[email protected]
1 parent 67bb8e9 commit cc6afe2

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

arch/x86/kernel/apic/apic.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,8 @@ static void apic_check_deadline_errata(void)
600600
const struct x86_cpu_id *m;
601601
u32 rev;
602602

603-
if (!boot_cpu_has(X86_FEATURE_TSC_DEADLINE_TIMER))
603+
if (!boot_cpu_has(X86_FEATURE_TSC_DEADLINE_TIMER) ||
604+
boot_cpu_has(X86_FEATURE_HYPERVISOR))
604605
return;
605606

606607
m = x86_match_cpu(deadline_match);

0 commit comments

Comments
 (0)