hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86/microcode: Make the late update update_lock a raw lock for RT 

__reload_late() is called from stop_machine context and thus cannot
acquire a non-raw spinlock on PREEMPT_RT.

Signed-off-by: Scott Wood <swood@redhat.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Clark Williams <williams@redhat.com>
Cc: Pei Zhang <pezhang@redhat.com>
Cc: x86-ml <x86@kernel.org>
Link: http://lkml.kernel.org/r/20180524154420.24455-1-swood@redhat.com
This commit is contained in:
Scott Wood 2018-05-24 10:44:20 -05:00 committed by Thomas Gleixner
parent ec30dcf7f4
commit ff987fcf01
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/cpu/microcode/core.c
View File

@ -70,7 +70,7 @@ static DEFINE_MUTEX(microcode_mutex);
/* /*
* Serialize late loading so that CPUs get updated one-by-one. * Serialize late loading so that CPUs get updated one-by-one.
*/ */
static DEFINE_SPINLOCK(update_lock); static DEFINE_RAW_SPINLOCK(update_lock);
struct ucode_cpu_info ucode_cpu_info[NR_CPUS]; struct ucode_cpu_info ucode_cpu_info[NR_CPUS];
@ -560,9 +560,9 @@ static int __reload_late(void *info)
if (__wait_for_cpus(&late_cpus_in, NSEC_PER_SEC)) if (__wait_for_cpus(&late_cpus_in, NSEC_PER_SEC))
return -1; return -1;
spin_lock(&update_lock); raw_spin_lock(&update_lock);
apply_microcode_local(&err); apply_microcode_local(&err);
spin_unlock(&update_lock); raw_spin_unlock(&update_lock);
/* siblings return UCODE_OK because their engine got updated already */ /* siblings return UCODE_OK because their engine got updated already */
if (err > UCODE_NFOUND) { if (err > UCODE_NFOUND) {