diff mbox series

[5/5] x86/microcode: Drop struct ucode_cpu_info.valid

Message ID 20221028142638.28498-6-bp@alien8.de
State New
Headers
Series x86/microcode: Clean up the init path |

Commit Message

Borislav Petkov Oct. 28, 2022, 2:26 p.m. UTC 
  From: Borislav Petkov <bp@suse.de>

It is not needed anymore.

Signed-off-by: Borislav Petkov <bp@suse.de>
---
 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(-)

Comments

Ashok Raj Oct. 28, 2022, 7:03 p.m. UTC | #1 
Hi Boris

On Fri, Oct 28, 2022 at 04:26:38PM +0200, Borislav Petkov wrote:
> From: Borislav Petkov <bp@suse.de>
> 
> It is not needed anymore.

Reviewed and Tested this series. Everything looks good.

> 
> Signed-off-by: Borislav Petkov <bp@suse.de>

Reviewed-by: Ashok Raj <ashok.raj@intel.com>
Borislav Petkov Oct. 28, 2022, 8:42 p.m. UTC | #2 
On Fri, Oct 28, 2022 at 12:03:00PM -0700, Ashok Raj wrote:
> Reviewed and Tested this series. Everything looks good.

Thanks!
diff mbox series

Patch

diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index d4c36fbd1d39..d5a58bde091c 100644
--- a/arch/x86/include/asm/microcode.h
+++ b/arch/x86/include/asm/microcode.h
@@ -49,7 +49,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 2d7ea5480ec3..beb8ca596784 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -210,7 +210,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 ffb249c29f30..712aafff96e0 100644
--- a/arch/x86/kernel/cpu/microcode/core.c
+++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -554,9 +554,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();
 }