x86/microcode: always collect_cpu_info() during boot

Currently cpu_sig struct is not updated during boot if no microcode blob
is specified by "ucode=[<interger>| scan]".

It will result in cpu_sig.rev being 0 which affects APIC's
check_deadline_errata() and retpoline_safe() functions.

Fix this by getting ucode revision early during boot and SMP bring up.
While at it, protect early_microcode_update_cpu() for cases when
microcode_ops is NULL.

Signed-off-by: Sergey Dyasli <sergey.dyasli@citrix.com>
Signed-off-by: Chao Gao <chao.gao@intel.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
master commit: 2bb2c55cf8
master date: 2019-08-01 18:45:32 +0100
This commit is contained in:
Sergey Dyasli authored and Jan Beulich committed 2019-09-23 14:17:14 +02:00
1 parent d04466fae1
commit b465705af2
1 file changed
+12
+12
View File
@@ -383,10 +383,15 @@ static struct notifier_block microcode_percpu_nfb = {
int __init early_microcode_update_cpu(bool start_update)
{
unsigned int cpu = smp_processor_id();
struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu);
int rc = 0;
void *data = NULL;
size_t len;
if ( !microcode_ops )
return -ENOSYS;
if ( ucode_blob.size )
{
len = ucode_blob.size;
@@ -397,6 +402,9 @@ int __init early_microcode_update_cpu(bool start_update)
len = ucode_mod.mod_end;
data = bootstrap_map(&ucode_mod);
}
microcode_ops->collect_cpu_info(cpu, &uci->cpu_sig);
if ( data )
{
if ( start_update && microcode_ops->start_update )
@@ -413,6 +421,8 @@ int __init early_microcode_update_cpu(bool start_update)
int __init early_microcode_init(void)
{
unsigned int cpu = smp_processor_id();
struct ucode_cpu_info *uci = &per_cpu(ucode_cpu_info, cpu);
int rc;
rc = microcode_init_intel();
@@ -425,6 +435,8 @@ int __init early_microcode_init(void)
if ( microcode_ops )
{
microcode_ops->collect_cpu_info(cpu, &uci->cpu_sig);
if ( ucode_mod.mod_end || ucode_blob.size )
rc = early_microcode_update_cpu(true);
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.