Commit 41acc109 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_microcode_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 microcode update from Borislav Petkov:
 "A single fix to the late microcode loading machinery which corrects
  the ordering of when new microcode is loaded from the fs, vs checking
  whether all CPUs are online"

* tag 'x86_microcode_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/microcode: Check for offline CPUs before requesting new microcode
parents a4a78bc8 7189b3c1

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

+4 −4
Original line number Diff line number Diff line
@@ -629,16 +629,16 @@ static ssize_t reload_store(struct device *dev, 
	if (val != 1)

		return size;



	tmp_ret = microcode_ops->request_microcode_fw(bsp, &microcode_pdev->dev, true);

	if (tmp_ret != UCODE_NEW)

		return size;



	get_online_cpus();



	ret = check_online_cpus();

	if (ret)

		goto put;



	tmp_ret = microcode_ops->request_microcode_fw(bsp, &microcode_pdev->dev, true);

	if (tmp_ret != UCODE_NEW)

		goto put;



	mutex_lock(&microcode_mutex);

	ret = microcode_reload_late();

	mutex_unlock(&microcode_mutex);