projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 67d0dc37 GKH |
1 | From 1751342095f0d2b36fa8114d8e12c5688c455ac4 Mon Sep 17 00:00:00 2001 |
| 2 | From: David Woodhouse <dwmw@amazon.co.uk> | |
| 3 | Date: Sat, 10 Feb 2018 23:39:22 +0000 | |
| 4 | Subject: x86/speculation: Update Speculation Control microcode blacklist | |
| 5 | ||
| 6 | From: David Woodhouse <dwmw@amazon.co.uk> | |
| 7 | ||
| 8 | commit 1751342095f0d2b36fa8114d8e12c5688c455ac4 upstream. | |
| 9 | ||
| 10 | Intel have retroactively blessed the 0xc2 microcode on Skylake mobile | |
| 11 | and desktop parts, and the Gemini Lake 0x22 microcode is apparently fine | |
| 12 | too. We blacklisted the latter purely because it was present with all | |
| 13 | the other problematic ones in the 2018-01-08 release, but now it's | |
| 14 | explicitly listed as OK. | |
| 15 | ||
| 16 | We still list 0x84 for the various Kaby Lake / Coffee Lake parts, as | |
| 17 | that appeared in one version of the blacklist and then reverted to | |
| 18 | 0x80 again. We can change it if 0x84 is actually announced to be safe. | |
| 19 | ||
| 20 | Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> | |
| 21 | Cc: Andy Lutomirski <luto@kernel.org> | |
| 22 | Cc: Arjan van de Ven <arjan@linux.intel.com> | |
| 23 | Cc: Borislav Petkov <bp@alien8.de> | |
| 24 | Cc: Dan Williams <dan.j.williams@intel.com> | |
| 25 | Cc: Dave Hansen <dave.hansen@linux.intel.com> | |
| 26 | Cc: David Woodhouse <dwmw2@infradead.org> | |
| 27 | Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 28 | Cc: Josh Poimboeuf <jpoimboe@redhat.com> | |
| 29 | Cc: Linus Torvalds <torvalds@linux-foundation.org> | |
| 30 | Cc: Peter Zijlstra <peterz@infradead.org> | |
| 31 | Cc: Thomas Gleixner <tglx@linutronix.de> | |
| 32 | Cc: arjan.van.de.ven@intel.com | |
| 33 | Cc: jmattson@google.com | |
| 34 | Cc: karahmed@amazon.de | |
| 35 | Cc: kvm@vger.kernel.org | |
| 36 | Cc: pbonzini@redhat.com | |
| 37 | Cc: rkrcmar@redhat.com | |
| 38 | Cc: sironi@amazon.de | |
| 39 | Link: http://lkml.kernel.org/r/1518305967-31356-2-git-send-email-dwmw@amazon.co.uk | |
| 40 | Signed-off-by: Ingo Molnar <mingo@kernel.org> | |
| 41 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 42 | ||
| 43 | --- | |
| 44 | arch/x86/kernel/cpu/intel.c | 4 ---- | |
| 45 | 1 file changed, 4 deletions(-) | |
| 46 | ||
| 47 | --- a/arch/x86/kernel/cpu/intel.c | |
| 48 | +++ b/arch/x86/kernel/cpu/intel.c | |
| 49 | @@ -123,8 +123,6 @@ static const struct sku_microcode spectr | |
| 50 | { INTEL_FAM6_KABYLAKE_MOBILE, 0x09, 0x84 }, | |
| 51 | { INTEL_FAM6_SKYLAKE_X, 0x03, 0x0100013e }, | |
| 52 | { INTEL_FAM6_SKYLAKE_X, 0x04, 0x0200003c }, | |
| 53 | - { INTEL_FAM6_SKYLAKE_MOBILE, 0x03, 0xc2 }, | |
| 54 | - { INTEL_FAM6_SKYLAKE_DESKTOP, 0x03, 0xc2 }, | |
| 55 | { INTEL_FAM6_BROADWELL_CORE, 0x04, 0x28 }, | |
| 56 | { INTEL_FAM6_BROADWELL_GT3E, 0x01, 0x1b }, | |
| 57 | { INTEL_FAM6_BROADWELL_XEON_D, 0x02, 0x14 }, | |
| 58 | @@ -136,8 +134,6 @@ static const struct sku_microcode spectr | |
| 59 | { INTEL_FAM6_HASWELL_X, 0x02, 0x3b }, | |
| 60 | { INTEL_FAM6_HASWELL_X, 0x04, 0x10 }, | |
| 61 | { INTEL_FAM6_IVYBRIDGE_X, 0x04, 0x42a }, | |
| 62 | - /* Updated in the 20180108 release; blacklist until we know otherwise */ | |
| 63 | - { INTEL_FAM6_ATOM_GEMINI_LAKE, 0x01, 0x22 }, | |
| 64 | /* Observed in the wild */ | |
| 65 | { INTEL_FAM6_SANDYBRIDGE_X, 0x06, 0x61b }, | |
| 66 | { INTEL_FAM6_SANDYBRIDGE_X, 0x07, 0x712 }, |