x86/microcode/intel: Reuse intel_cpu_collect_info()

No point for an almost duplicate function.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/r/20231002115902.741173606@linutronix.de

diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
index 5aa7f5efc4403e4a3b6dd53cd9ac43a384f0db90..47a96c0ef65f552e5a7f44331d306b9435987050 100644 (file)
--- a/arch/x86/kernel/cpu/microcode/intel.c
+++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -435,21 +435,7 @@ void reload_ucode_intel(void)
 
 static int collect_cpu_info(int cpu_num, struct cpu_signature *csig)
 {
-       struct cpuinfo_x86 *c = &cpu_data(cpu_num);
-       unsigned int val[2];
-
-       memset(csig, 0, sizeof(*csig));
-
-       csig->sig = cpuid_eax(0x00000001);
-
-       if ((c->x86_model >= 5) || (c->x86 > 6)) {
-               /* get processor flags from MSR 0x17 */
-               rdmsr(MSR_IA32_PLATFORM_ID, val[0], val[1]);
-               csig->pf = 1 << ((val[1] >> 18) & 7);
-       }
-
-       csig->rev = c->microcode;
-
+       intel_collect_cpu_info(csig);
        return 0;
 }