x86/speculation: Remove Skylake C2 from Speculation Control microcode blacklist

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=e3b3121fa8da94cb20f9e0c64ab7981ae47fd085
Commit:     e3b3121fa8da94cb20f9e0c64ab7981ae47fd085
Parent:     af1d830bf32b27b387b97c8b29dc09e306a9ff7f
Author:     Alexander Sergeyev <sergeev917 at gmail.com>
AuthorDate: Tue Mar 13 22:38:56 2018 +0300
Committer:  Thomas Gleixner <tglx at linutronix.de>
CommitDate: Fri Mar 16 12:33:11 2018 +0100

    x86/speculation: Remove Skylake C2 from Speculation Control microcode blacklist
    
    In accordance with Intel's microcode revision guidance from March 6 MCU
    rev 0xc2 is cleared on both Skylake H/S and Skylake Xeon E3 processors
    that share CPUID 506E3.
    
    Signed-off-by: Alexander Sergeyev <sergeev917 at gmail.com>
    Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
    Cc: Jia Zhang <qianyue.zj at alibaba-inc.com>
    Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
    Cc: Kyle Huey <me at kylehuey.com>
    Cc: David Woodhouse <dwmw at amazon.co.uk>
    Link: https://lkml.kernel.org/r/20180313193856.GA8580@localhost.localdomain
---
 arch/x86/kernel/cpu/intel.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 4aa9fd379390..c3af167d0a70 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -105,7 +105,7 @@ static void probe_xeon_phi_r3mwait(struct cpuinfo_x86 *c)
 /*
  * Early microcode releases for the Spectre v2 mitigation were broken.
  * Information taken from;
- * - https://newsroom.intel.com/wp-content/uploads/sites/11/2018/01/microcode-update-guidance.pdf
+ * - https://newsroom.intel.com/wp-content/uploads/sites/11/2018/03/microcode-update-guidance.pdf
  * - https://kb.vmware.com/s/article/52345
  * - Microcode revisions observed in the wild
  * - Release note from 20180108 microcode release
@@ -123,7 +123,6 @@ static const struct sku_microcode spectre_bad_microcodes[] = {
 	{ INTEL_FAM6_KABYLAKE_MOBILE,	0x09,	0x80 },
 	{ INTEL_FAM6_SKYLAKE_X,		0x03,	0x0100013e },
 	{ INTEL_FAM6_SKYLAKE_X,		0x04,	0x0200003c },
-	{ INTEL_FAM6_SKYLAKE_DESKTOP,	0x03,	0xc2 },
 	{ INTEL_FAM6_BROADWELL_CORE,	0x04,	0x28 },
 	{ INTEL_FAM6_BROADWELL_GT3E,	0x01,	0x1b },
 	{ INTEL_FAM6_BROADWELL_XEON_D,	0x02,	0x14 },