From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941598AbcJYJ5s (ORCPT ); Tue, 25 Oct 2016 05:57:48 -0400 Received: from mail.skyhub.de ([78.46.96.112]:36020 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753253AbcJYJz0 (ORCPT ); Tue, 25 Oct 2016 05:55:26 -0400 From: Borislav Petkov To: X86 ML Cc: LKML Subject: [PATCH 01/12] x86/microcode: Run the AP-loading routine only on the application processors Date: Tue, 25 Oct 2016 11:55:11 +0200 Message-Id: <20161025095522.11964-2-bp@alien8.de> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161025095522.11964-1-bp@alien8.de> References: <20161025095522.11964-1-bp@alien8.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Borislav Petkov 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 --- 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 9bd910a7dd0a..1a1d668263b9 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 620ab06bcf45..6b3929e80fd4 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; -- 2.10.0