openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

A single fix for late microcode loading to handle the correct return 

value from stop_machine(), from Mihai Carabas.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEzv7L6UO9uDPlPSfHEsHwGGHeVUoFAl7UxoEACgkQEsHwGGHe
 VUrQdxAArdz2s/EtyhFeacKGp6nFG8wHyMVFbwJ/6ZzKcaX6zVc4PI/5O1837ls7
 rFMZt5r21kxfLB3/wMAOZGI+ZP7i6IXzcwBI5/BmS+YK+t3PqWeT+iTNo8hr9tI/
 d8Xly4sE/CIrPZduZPnNVsrRdzqKDs/KMnnPTxZWVNDWMVOKHJZtJ2Ty8eHZsgwl
 b4yBL1JiZHELSb9SrMhZfortogB2eSUaFABWYJMhGJ8XHQ6AZ+A3EB+he/9Zu3Wu
 Giz4LvnhCGJyhTLaDHRUhMfLHo1knl6LNS6QNqVSP82TKRlX3AVeDnHST968BeTr
 ronLTvOVkkZcpvk5ukeSqcBFhxiio9R1rUbkfZlYPt63m/6uWCiMzzOGXB+JTtYc
 5of95CXehYj41XlQVkQtJJmoysYdt7JJw0w5+Cr3Uuov/RKOEiCdrgemOxOmIcM+
 YJ8m+lTn95+8PXFjg/kvweZA7rXr1HcPhfmd9tCMha2k6b1MbdaMT3xb+m1vGXD/
 BRojkuqf7OK19T/Owcum6A/oBmjuNjPZPL5HapQ9ZbMz6AZ3InRmaU+8EvQLIer7
 iimQYWzTTdlZsresJh2+itPMf1EVyHVRnzFlx/N1BMhAxpR2aYXwGA5WKxk10p7U
 80iejJntiNwXJmCHXXiQ55Dyii0vZykJv2FbGjLF4xUUGB/zxW8=
 =g4rq
 -----END PGP SIGNATURE-----

Merge tag 'x86_microcode_for_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 microcode update from Borislav Petkov:
 "A single fix for late microcode loading to handle the correct return
  value from stop_machine(), from Mihai Carabas"

* tag 'x86_microcode_for_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/microcode: Fix return value for microcode late loading
This commit is contained in:
Linus Torvalds 2020-06-01 12:22:53 -07:00
parent 8b11dd54ad 9adbf3c609
commit ef34ba6d36
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -545,8 +545,7 @@ static int __wait_for_cpus(atomic_t *t, long long timeout)
/* /*
* Returns: * Returns:
* < 0 - on error * < 0 - on error
* 0 - no update done * 0 - success (no update done or microcode was updated)
* 1 - microcode was updated
*/ */
static int __reload_late(void *info) static int __reload_late(void *info)
{ {
@ -573,11 +572,11 @@ static int __reload_late(void *info)
else else
goto wait_for_siblings; goto wait_for_siblings;
if (err > UCODE_NFOUND) { if (err >= UCODE_NFOUND) {
pr_warn("Error reloading microcode on CPU %d\n", cpu); if (err == UCODE_ERROR)
pr_warn("Error reloading microcode on CPU %d\n", cpu);
ret = -1; ret = -1;
} else if (err == UCODE_UPDATED || err == UCODE_OK) {
ret = 1;
} }
wait_for_siblings: wait_for_siblings:
@ -608,7 +607,7 @@ static int microcode_reload_late(void)
atomic_set(&late_cpus_out, 0); atomic_set(&late_cpus_out, 0);
ret = stop_machine_cpuslocked(__reload_late, NULL, cpu_online_mask); ret = stop_machine_cpuslocked(__reload_late, NULL, cpu_online_mask);
if (ret > 0) if (ret == 0)
microcode_check(); microcode_check();
pr_info("Reload completed, microcode revision: 0x%x\n", boot_cpu_data.microcode); pr_info("Reload completed, microcode revision: 0x%x\n", boot_cpu_data.microcode);
@ -649,7 +648,7 @@ static ssize_t reload_store(struct device *dev,
put: put:
put_online_cpus(); put_online_cpus();
if (ret >= 0) if (ret == 0)
ret = size; ret = size;
return ret; return ret;