Skip to content

Commit 594a30f

Browse files
jwrdegoedeIngo Molnar
authored andcommitted
x86/apic: Silence "FW_BUG TSC_DEADLINE disabled due to Errata" on CPUs without the feature
When booting 4.13 on a VirtualBox VM on a Skylake host the following error shows up in the logs: [ 0.000000] [Firmware Bug]: TSC_DEADLINE disabled due to Errata; please update microcode to version: 0xb2 (or later) This is caused by apic_check_deadline_errata() only checking CPU model and not the X86_FEATURE_TSC_DEADLINE_TIMER flag (which VirtualBox does NOT export to the guest), combined with VirtualBox not exporting the micro-code version to the guest. This commit adds a check for X86_FEATURE_TSC_DEADLINE_TIMER to apic_check_deadline_errata(), silencing this error on VirtualBox VMs. Signed-off-by: Hans de Goede <[email protected]> Acked-by: Thomas Gleixner <[email protected]> Cc: Frank Mehnert <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Michael Thayer <[email protected]> Cc: Michal Necasek <[email protected]> Cc: Peter Zijlstra <[email protected]> Fixes: bd9240a ("x86/apic: Add TSC_DEADLINE quirk due to errata") Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 1d792a6 commit 594a30f

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

arch/x86/kernel/apic/apic.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -597,9 +597,13 @@ static const struct x86_cpu_id deadline_match[] = {
597597

598598
static void apic_check_deadline_errata(void)
599599
{
600-
const struct x86_cpu_id *m = x86_match_cpu(deadline_match);
600+
const struct x86_cpu_id *m;
601601
u32 rev;
602602

603+
if (!boot_cpu_has(X86_FEATURE_TSC_DEADLINE_TIMER))
604+
return;
605+
606+
m = x86_match_cpu(deadline_match);
603607
if (!m)
604608
return;
605609

0 commit comments

Comments
 (0)