aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/microcode/intel.c
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2018-04-21 04:19:29 -0400
committerThomas Gleixner <tglx@linutronix.de>2018-04-24 03:48:22 -0400
commit84749d83758af6576552046b215b9b7f37f9556b (patch)
treec6f4042145dbb1b9d536a1ad2cdd28c888b0bc99 /arch/x86/kernel/cpu/microcode/intel.c
parent7010adcdd23527f7efef1e7bc0d8c458f6ec0dd2 (diff)
x86/microcode/intel: Save microcode patch unconditionally
save_mc_for_early() was a no-op on !CONFIG_HOTPLUG_CPU but the generic_load_microcode() path saves the microcode patches it has found into the cache of patches which is used for late loading too. Regardless of whether CPU hotplug is used or not. Make the saving unconditional so that late loading can find the proper patch. Reported-by: Vitezslav Samel <vitezslav@samel.cz> Signed-off-by: Borislav Petkov <bp@suse.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Vitezslav Samel <vitezslav@samel.cz> Tested-by: Ashok Raj <ashok.raj@intel.com> Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20180418081140.GA2439@pc11.op.pod.cz Link: https://lkml.kernel.org/r/20180421081930.15741-1-bp@alien8.de
Diffstat (limited to 'arch/x86/kernel/cpu/microcode/intel.c')
-rw-r--r--arch/x86/kernel/cpu/microcode/intel.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index 32b8e5724f96..1c2cfa0644aa 100644
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -485,7 +485,6 @@ static void show_saved_mc(void)
485 */ 485 */
486static void save_mc_for_early(u8 *mc, unsigned int size) 486static void save_mc_for_early(u8 *mc, unsigned int size)
487{ 487{
488#ifdef CONFIG_HOTPLUG_CPU
489 /* Synchronization during CPU hotplug. */ 488 /* Synchronization during CPU hotplug. */
490 static DEFINE_MUTEX(x86_cpu_microcode_mutex); 489 static DEFINE_MUTEX(x86_cpu_microcode_mutex);
491 490
@@ -495,7 +494,6 @@ static void save_mc_for_early(u8 *mc, unsigned int size)
495 show_saved_mc(); 494 show_saved_mc();
496 495
497 mutex_unlock(&x86_cpu_microcode_mutex); 496 mutex_unlock(&x86_cpu_microcode_mutex);
498#endif
499} 497}
500 498
501static bool load_builtin_intel_microcode(struct cpio_data *cp) 499static bool load_builtin_intel_microcode(struct cpio_data *cp)