Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 16 Mar 2018 04:55:12 -0700
From:   tip-bot for Alexander Sergeyev <tipbot@zytor.com>
Message-ID: <tip-e3b3121fa8da94cb20f9e0c64ab7981ae47fd085@git.kernel.org>
Cc:     qianyue.zj@alibaba-inc.com, tglx@linutronix.de, mingo@kernel.org,
        linux-kernel@vger.kernel.org, sergeev917@gmail.com, hpa@zytor.com,
        dwmw@amazon.co.uk, gregkh@linuxfoundation.org, me@kylehuey.com
Reply-To: mingo@kernel.org, sergeev917@gmail.com,
          linux-kernel@vger.kernel.org, tglx@linutronix.de,
          qianyue.zj@alibaba-inc.com, me@kylehuey.com,
          gregkh@linuxfoundation.org, hpa@zytor.com, dwmw@amazon.co.uk
In-Reply-To: <20180313193856.GA8580@localhost.localdomain>
References: <20180313193856.GA8580@localhost.localdomain>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:x86/pti] x86/speculation: Remove Skylake C2 from Speculation
 Control microcode blacklist
Git-Commit-ID: e3b3121fa8da94cb20f9e0c64ab7981ae47fd085
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  e3b3121fa8da94cb20f9e0c64ab7981ae47fd085
Gitweb:     https://git.kernel.org/tip/e3b3121fa8da94cb20f9e0c64ab7981ae47fd085
Author:     Alexander Sergeyev <sergeev917@gmail.com>
AuthorDate: Tue, 13 Mar 2018 22:38:56 +0300
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Fri, 16 Mar 2018 12:33:11 +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@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jia Zhang <qianyue.zj@alibaba-inc.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Kyle Huey <me@kylehuey.com>
Cc: David Woodhouse <dwmw@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 },