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

diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h
index d4c36fbd1d3961cd830d4b5f46935ed94b83ea43..d5a58bde091c8bad152d495833cfe58a273be0ba 100644 (file)
--- 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 2d7ea5480ec3394d7422b7c06df98d759ed8ad84..beb8ca596784f7993dec186523569c576b97cca4 100644 (file)
--- 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 ffb249c29f3068db6dd221f9992337653f846de6..712aafff96e036cc82c495c7bfbb837091b8285a 100644 (file)
--- 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();
 }