|
Packit Service |
c9fe53 |
From d8c3b52c00a05036e0a6b315b4b17921a7b67997 Mon Sep 17 00:00:00 2001
|
|
Packit Service |
c9fe53 |
From: Borislav Petkov <bp@suse.de>
|
|
Packit Service |
c9fe53 |
Date: Wed, 28 Feb 2018 11:28:44 +0100
|
|
Packit Service |
c9fe53 |
Subject: x86/microcode/intel: Look into the patch cache first
|
|
Packit Service |
c9fe53 |
|
|
Packit Service |
c9fe53 |
The cache might contain a newer patch - look in there first.
|
|
Packit Service |
c9fe53 |
|
|
Packit Service |
c9fe53 |
A follow-on change will make sure newest patches are loaded into the
|
|
Packit Service |
c9fe53 |
cache of microcode patches.
|
|
Packit Service |
c9fe53 |
|
|
Packit Service |
c9fe53 |
Signed-off-by: Borislav Petkov <bp@suse.de>
|
|
Packit Service |
c9fe53 |
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
Packit Service |
c9fe53 |
Tested-by: Tom Lendacky <thomas.lendacky@amd.com>
|
|
Packit Service |
c9fe53 |
Tested-by: Ashok Raj <ashok.raj@intel.com>
|
|
Packit Service |
c9fe53 |
Cc: Arjan Van De Ven <arjan.van.de.ven@intel.com>
|
|
Packit Service |
c9fe53 |
Link: https://lkml.kernel.org/r/20180228102846.13447-6-bp@alien8.de
|
|
Packit Service |
c9fe53 |
---
|
|
Packit Service |
c9fe53 |
arch/x86/kernel/cpu/microcode/intel.c | 11 +++++------
|
|
Packit Service |
c9fe53 |
1 file changed, 5 insertions(+), 6 deletions(-)
|
|
Packit Service |
c9fe53 |
|
|
Packit Service |
c9fe53 |
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
|
|
Packit Service |
c9fe53 |
index e2864bc..2aded9d 100644
|
|
Packit Service |
c9fe53 |
--- a/arch/x86/kernel/cpu/microcode/intel.c
|
|
Packit Service |
c9fe53 |
+++ b/arch/x86/kernel/cpu/microcode/intel.c
|
|
Packit Service |
c9fe53 |
@@ -791,9 +791,9 @@ static int collect_cpu_info(int cpu_num, struct cpu_signature *csig)
|
|
Packit Service |
c9fe53 |
|
|
Packit Service |
c9fe53 |
static enum ucode_state apply_microcode_intel(int cpu)
|
|
Packit Service |
c9fe53 |
{
|
|
Packit Service |
c9fe53 |
- struct microcode_intel *mc;
|
|
Packit Service |
c9fe53 |
- struct ucode_cpu_info *uci;
|
|
Packit Service |
c9fe53 |
+ struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
|
|
Packit Service |
c9fe53 |
struct cpuinfo_x86 *c = &cpu_data(cpu);
|
|
Packit Service |
c9fe53 |
+ struct microcode_intel *mc;
|
|
Packit Service |
c9fe53 |
static int prev_rev;
|
|
Packit Service |
c9fe53 |
u32 rev;
|
|
Packit Service |
c9fe53 |
|
|
Packit Service |
c9fe53 |
@@ -801,11 +801,10 @@ static enum ucode_state apply_microcode_intel(int cpu)
|
|
Packit Service |
c9fe53 |
if (WARN_ON(raw_smp_processor_id() != cpu))
|
|
Packit Service |
c9fe53 |
return UCODE_ERROR;
|
|
Packit Service |
c9fe53 |
|
|
Packit Service |
c9fe53 |
- uci = ucode_cpu_info + cpu;
|
|
Packit Service |
c9fe53 |
- mc = uci->mc;
|
|
Packit Service |
c9fe53 |
+ /* Look for a newer patch in our cache: */
|
|
Packit Service |
c9fe53 |
+ mc = find_patch(uci);
|
|
Packit Service |
c9fe53 |
if (!mc) {
|
|
Packit Service |
c9fe53 |
- /* Look for a newer patch in our cache: */
|
|
Packit Service |
c9fe53 |
- mc = find_patch(uci);
|
|
Packit Service |
c9fe53 |
+ mc = uci->mc;
|
|
Packit Service |
c9fe53 |
if (!mc)
|
|
Packit Service |
c9fe53 |
return UCODE_NFOUND;
|
|
Packit Service |
c9fe53 |
}
|
|
Packit Service |
c9fe53 |
--
|
|
Packit Service |
c9fe53 |
cgit v1.1
|
|
Packit Service |
c9fe53 |
|