forked from rpms/kernel
63 lines
2.0 KiB
Diff
63 lines
2.0 KiB
Diff
|
From fbc8e41bf83779c3c6727075c5d131a3aa9f7a2b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Borislav Petkov <bp@suse.de>
|
||
|
|
Date: Wed, 19 Oct 2022 19:25:27 +0200
|
||
|
|
Subject: [PATCH 20/36] x86/microcode: Drop struct ucode_cpu_info.valid
|
||
|
|
|
||
|
|
It is not needed anymore.
|
||
|
|
|
||
|
|
Signed-off-by: Borislav Petkov <bp@suse.de>
|
||
|
|
Reviewed-by: Ashok Raj <ashok.raj@intel.com>
|
||
|
|
Link: https://lore.kernel.org/r/20221028142638.28498-6-bp@alien8.de
|
||
|
|
(cherry picked from commit 254ed7cf4dd79a18bbc496ab53f6c82d45431c78)
|
||
|
|
Signed-off-by: Mridula Shastry <mridula.c.shastry@oracle.com>
|
||
|
|
Reviewed-by: Todd Vierling <todd.vierling@oracle.com>
|
||
|
|
---
|
||
|
|
arch/x86/include/asm/microcode.h | 1 -
|
||
|
|
arch/x86/kernel/cpu/intel.c | 1 -
|
||
|
|
arch/x86/kernel/cpu/microcode/core.c | 4 ++--
|
||
|
|
3 files changed, 2 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
|
||
|
|
index af1ba544c800..e65c39a1f5fa 100644
|
||
|
|
--- a/arch/x86/include/asm/microcode.h
|
||
|
|
+++ b/arch/x86/include/asm/microcode.h
|
||
|
|
@@ -48,7 +48,6 @@ struct microcode_ops {
|
||
|
|
|
||
|
|
struct ucode_cpu_info {
|
||
|
|
struct cpu_signature cpu_sig;
|
||
|
|
- int valid;
|
||
|
|
void *mc;
|
||
|
|
};
|
||
|
|
extern struct ucode_cpu_info ucode_cpu_info[];
|
||
|
|
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
|
||
|
|
index cf85431fb09a..c7935482c58a 100644
|
||
|
|
--- a/arch/x86/kernel/cpu/intel.c
|
||
|
|
+++ b/arch/x86/kernel/cpu/intel.c
|
||
|
|
@@ -243,7 +243,6 @@ int intel_cpu_collect_info(struct ucode_cpu_info *uci)
|
||
|
|
csig.rev = intel_get_microcode_revision();
|
||
|
|
|
||
|
|
uci->cpu_sig = csig;
|
||
|
|
- uci->valid = 1;
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
|
||
|
|
index 3d4c2c1aae11..6cd0db1e7b96 100644
|
||
|
|
--- a/arch/x86/kernel/cpu/microcode/core.c
|
||
|
|
+++ b/arch/x86/kernel/cpu/microcode/core.c
|
||
|
|
@@ -583,9 +583,9 @@ void microcode_bsp_resume(void)
|
||
|
|
int cpu = smp_processor_id();
|
||
|
|
struct ucode_cpu_info *uci = ucode_cpu_info + cpu;
|
||
|
|
|
||
|
|
- if (uci->valid && uci->mc)
|
||
|
|
+ if (uci->mc)
|
||
|
|
microcode_ops->apply_microcode(cpu);
|
||
|
|
- else if (!uci->mc)
|
||
|
|
+ else
|
||
|
|
reload_early_microcode();
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|