This is a note to let you know that I've just added the patch titled
x86/microcode/intel: Fish out the stashed microcode for the BSP
to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
x86-microcode-intel-fish-out-the-stashed-microcode-for-the-bsp.patch
and it can be found in the queue-3.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 25cdb9c86826f8d035d8aaa07fc36832e76bd8a0 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@xxxxxxx>
Date: Mon, 8 Dec 2014 12:08:20 +0100
Subject: x86/microcode/intel: Fish out the stashed microcode for the BSP
From: Borislav Petkov <bp@xxxxxxx>
commit 25cdb9c86826f8d035d8aaa07fc36832e76bd8a0 upstream.
I'm such a moron! The simple solution of saving the BSP patch
for use on resume was too simple (and wrong!), hint:
sizeof(struct microcode_intel).
What needs to be done instead is to fish out the microcode patch
we have stashed previously and apply that on the BSP in case the
late loader hasn't been utilized.
So do that instead.
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/20141208110820.GB20057@xxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/cpu/microcode/intel_early.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
--- a/arch/x86/kernel/cpu/microcode/intel_early.c
+++ b/arch/x86/kernel/cpu/microcode/intel_early.c
@@ -34,8 +34,6 @@ static struct mc_saved_data {
struct microcode_intel **mc_saved;
} mc_saved_data;
-static struct microcode_intel bsp_patch;
-
static enum ucode_state
generic_load_microcode_early(struct microcode_intel **mc_saved_p,
unsigned int mc_saved_count,
@@ -717,8 +715,7 @@ _load_ucode_intel_bsp(struct mc_saved_da
unsigned long *mc_saved_in_initrd,
unsigned long initrd_start_early,
unsigned long initrd_end_early,
- struct ucode_cpu_info *uci,
- struct microcode_intel *bsp)
+ struct ucode_cpu_info *uci)
{
enum ucode_state ret;
@@ -729,10 +726,8 @@ _load_ucode_intel_bsp(struct mc_saved_da
ret = load_microcode(mc_saved_data, mc_saved_in_initrd,
initrd_start_early, uci);
- if (ret == UCODE_OK) {
+ if (ret == UCODE_OK)
apply_microcode_early(uci, true);
- memcpy(bsp, uci->mc, sizeof(*bsp));
- }
}
void __init
@@ -741,12 +736,10 @@ load_ucode_intel_bsp(void)
u64 ramdisk_image, ramdisk_size;
unsigned long initrd_start_early, initrd_end_early;
struct ucode_cpu_info uci;
- struct microcode_intel *bsp_p;
#ifdef CONFIG_X86_32
struct boot_params *boot_params_p;
boot_params_p = (struct boot_params *)__pa_nodebug(&boot_params);
- bsp_p = (struct microcode_intel *)__pa_nodebug(&bsp_patch);
ramdisk_image = boot_params_p->hdr.ramdisk_image;
ramdisk_size = boot_params_p->hdr.ramdisk_size;
initrd_start_early = ramdisk_image;
@@ -755,9 +748,8 @@ load_ucode_intel_bsp(void)
_load_ucode_intel_bsp(
(struct mc_saved_data *)__pa_nodebug(&mc_saved_data),
(unsigned long *)__pa_nodebug(&mc_saved_in_initrd),
- initrd_start_early, initrd_end_early, &uci, bsp_p);
+ initrd_start_early, initrd_end_early, &uci);
#else
- bsp_p = &bsp_patch;
ramdisk_image = boot_params.hdr.ramdisk_image;
ramdisk_size = boot_params.hdr.ramdisk_size;
initrd_start_early = ramdisk_image + PAGE_OFFSET;
@@ -765,7 +757,7 @@ load_ucode_intel_bsp(void)
_load_ucode_intel_bsp(&mc_saved_data, mc_saved_in_initrd,
initrd_start_early, initrd_end_early,
- &uci, bsp_p);
+ &uci);
#endif
}
@@ -805,11 +797,17 @@ void load_ucode_intel_ap(void)
void reload_ucode_intel(void)
{
struct ucode_cpu_info uci;
+ enum ucode_state ret;
- if (!bsp_patch.hdr.rev)
+ if (!mc_saved_data.mc_saved_count)
return;
- uci.mc = &bsp_patch;
+ collect_cpu_info_early(&uci);
+
+ ret = generic_load_microcode_early(mc_saved_data.mc_saved,
+ mc_saved_data.mc_saved_count, &uci);
+ if (ret != UCODE_OK)
+ return;
apply_microcode_early(&uci, false);
}
Patches currently in stable-queue which might be from bp@xxxxxxx are
queue-3.18/x86-microcode-intel-drop-unused-parameter.patch
queue-3.18/x86-microcode-intel-fish-out-the-stashed-microcode-for-the-bsp.patch
queue-3.18/x86-microcode-reload-microcode-on-resume.patch
queue-3.18/x86-microcode-amd-do-not-use-smp_processor_id-in-preemtible-context.patch
queue-3.18/x86-microcode-don-t-initialize-microcode-code-on-paravirt.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html