| Date | Mon, 09 Oct 2023 12:29:51 -0000 | From | "tip-bot2 for Thomas Gleixner" <> | Subject | [tip: x86/microcode] x86/microcode/intel: Reuse intel_cpu_collect_info() |
| |
The following commit has been merged into the x86/microcode branch of tip:
Commit-ID: ac39a61afe4f452fa9dab568b810f6c410554242 Gitweb: https://git.kernel.org/tip/ac39a61afe4f452fa9dab568b810f6c410554242 Author: Thomas Gleixner <tglx@linutronix.de> AuthorDate: Mon, 02 Oct 2023 13:59:49 +02:00 Committer: Borislav Petkov (AMD) <bp@alien8.de> CommitterDate: Tue, 03 Oct 2023 16:08:19 +02:00
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 --- arch/x86/kernel/cpu/microcode/intel.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index fd97cc1..3817bb2 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -426,21 +426,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; }
|