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 <hdegoede@redhat.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Frank Mehnert <frank.mehnert@oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Michael Thayer <michael.thayer@oracle.com>
Cc: Michal Necasek <michal.necasek@oracle.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: bd9240a18e ("x86/apic: Add TSC_DEADLINE quirk due to errata")
Link: http://lkml.kernel.org/r/20170830105811.27539-1-hdegoede@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Hans de Goede and committed by
Ingo Molnar
594a30fb 1d792a67

+5 -1
+5 -1
arch/x86/kernel/apic/apic.c
··· 597 597 598 598 static void apic_check_deadline_errata(void) 599 599 { 600 - const struct x86_cpu_id *m = x86_match_cpu(deadline_match); 600 + const struct x86_cpu_id *m; 601 601 u32 rev; 602 602 603 + if (!boot_cpu_has(X86_FEATURE_TSC_DEADLINE_TIMER)) 604 + return; 605 + 606 + m = x86_match_cpu(deadline_match); 603 607 if (!m) 604 608 return; 605 609