Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff987fcf authored by Scott Wood's avatar Scott Wood Committed by Thomas Gleixner
Browse files

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: default avatarScott Wood <swood@redhat.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarThomas 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
parent ec30dcf7

arch/x86/kernel/cpu/microcode/core.c

+3 −3
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static DEFINE_MUTEX(microcode_mutex); 
/*

 * 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];
@@ -560,9 +560,9 @@ static int __reload_late(void *info) 
	if (__wait_for_cpus(&late_cpus_in, NSEC_PER_SEC))

		return -1;



	spin_lock(&update_lock);

	raw_spin_lock(&update_lock);

	apply_microcode_local(&err);

	spin_unlock(&update_lock);

	raw_spin_unlock(&update_lock);



	/* siblings return UCODE_OK because their engine got updated already */

	if (err > UCODE_NFOUND) {