From 732ec0d06fe2738fdaadae7bcf4192b284ab0afd Mon Sep 17 00:00:00 2001 From: Borislav Petkov Date: Wed, 25 May 2022 18:12:32 +0200 Subject: [PATCH] x86/microcode: Remove unnecessary perf callback mainline inclusion from mainline-v5.19-rc1 commit 0c0fe08c76485fe0178ebb0fa1a2052c727abe94 category: feature feature: Backport Intel In Field Scan(IFS) multi-blob images support bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I6L337 CVE: N/A Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/ commit/?id=0c0fe08c76485fe0178ebb0fa1a2052c727abe94 Intel-SIG: commit 0c0fe08c7648 ("x86/microcode: Remove unnecessary perf callback") ------------------------------------- x86/microcode: Remove unnecessary perf callback c93dc84cbe32 ("perf/x86: Add a microcode revision check for SNB-PEBS") checks whether the microcode revision has fixed PEBS issues. This can happen either: 1. At PEBS init time, where the early microcode has been loaded already 2. During late loading, in the microcode_check() callback. So remove the unnecessary call in the microcode loader init routine. Signed-off-by: Borislav Petkov Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20220525161232.14924-5-bp@alien8.de Signed-off-by: Aichun Shi --- arch/x86/kernel/cpu/microcode/core.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 51099f4a0e98..e55144b6c2d2 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -773,10 +773,7 @@ int __init microcode_init(void) get_online_cpus(); mutex_lock(µcode_mutex); - error = subsys_interface_register(&mc_cpu_interface); - if (!error) - perf_check_microcode(); mutex_unlock(µcode_mutex); put_online_cpus(); -- GitLab