From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941968AbcJYQ3B (ORCPT ); Tue, 25 Oct 2016 12:29:01 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39734 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941746AbcJYQ2y (ORCPT ); Tue, 25 Oct 2016 12:28:54 -0400 Date: Tue, 25 Oct 2016 09:27:48 -0700 From: tip-bot for Borislav Petkov Message-ID: Cc: bp@suse.de, mingo@kernel.org, luto@kernel.org, brgerst@gmail.com, jpoimboe@redhat.com, bp@alien8.de, torvalds@linux-foundation.org, hpa@zytor.com, dvlasenk@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, peterz@infradead.org Reply-To: bp@suse.de, mingo@kernel.org, luto@kernel.org, jpoimboe@redhat.com, brgerst@gmail.com, torvalds@linux-foundation.org, bp@alien8.de, hpa@zytor.com, dvlasenk@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, peterz@infradead.org In-Reply-To: <20161025095522.11964-2-bp@alien8.de> References: <20161025095522.11964-2-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/microcode] x86/microcode: Run the AP-loading routine only on the application processors Git-Commit-ID: 777284b66f2326c7cb4c541e2224b638b562a9d3 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 777284b66f2326c7cb4c541e2224b638b562a9d3 Gitweb: http://git.kernel.org/tip/777284b66f2326c7cb4c541e2224b638b562a9d3 Author: Borislav Petkov AuthorDate: Tue, 25 Oct 2016 11:55:11 +0200 Committer: Ingo Molnar CommitDate: Tue, 25 Oct 2016 12:28:57 +0200 x86/microcode: Run the AP-loading routine only on the application processors cpu_init() is run also on the BSP (in addition to the APs): x86_64_start_kernel |-> x86_64_start_reservations |-> start_kernel |-> trap_init |-> cpu_init |-> load_ucode_ap ... but we run the AP (Application Processors) microcode loading routine there too even though we have a BSP-specific routine for that: load_ucode_bsp(). Which is unnecessary. So let's limit the AP microcode loading routine to the APs only. Remove a useless comment while at it. Signed-off-by: Borislav Petkov Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/20161025095522.11964-2-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/cpu/common.c | 7 ++----- arch/x86/kernel/cpu/microcode/amd.c | 5 ----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 9bd910a..1a1d668 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -1462,11 +1462,8 @@ void cpu_init(void) */ cr4_init_shadow(); - /* - * Load microcode on this cpu if a valid microcode is available. - * This is early microcode loading procedure. - */ - load_ucode_ap(); + if (cpu) + load_ucode_ap(); t = &per_cpu(cpu_tss, cpu); oist = &per_cpu(orig_ist, cpu); diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index 620ab06..6b3929e 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -357,17 +357,12 @@ static void __init get_bsp_sig(void) #else void load_ucode_amd_ap(void) { - unsigned int cpu = smp_processor_id(); struct equiv_cpu_entry *eq; struct microcode_amd *mc; u8 *cont = container; u32 rev, eax; u16 eq_id; - /* Exit if called on the BSP. */ - if (!cpu) - return; - if (!container) return;