From nobody Fri Jan 2 16:44:59 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74C99CD8CA7 for ; Tue, 10 Oct 2023 15:09:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233414AbjJJPI6 (ORCPT ); Tue, 10 Oct 2023 11:08:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233293AbjJJPIv (ORCPT ); Tue, 10 Oct 2023 11:08:51 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 643FCB8 for ; Tue, 10 Oct 2023 08:08:46 -0700 (PDT) Message-ID: <20231010150702.551141238@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696950524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=g/Yygr9A2Il7UvnXxciW5CWUkAO8Yu2F0f5qpSzvguA=; b=144ei3NnW+bCXOx31fsFaFPjODLcJ4BuZdguAbxZW8FQayQc/LZ65jfFRGFxy9LSHIJnrM BFo+VFyKc1EkoNbJd7wIk8cAkw93McVCL9JOqnXwSbjrZcI2prCs6fb/4hi4kiXY55IAeP QS5MhbJA/3SW9UOyxP44jFQpMoIQmI39ZdfT2F3xQrPEDAeaECqfQGRdR5wBDOd6lX6rlN iDSgal6RFT9Oyyw0z4G7PgIQ2idJRBZ4ZTYEBKtcc/s1I9pma+SASf9ZZlGVFRjJj6pJkq q/0vESVJ6N3jTrC1iRXCbnp8zjd+56hFP44f5YLtVC2fpmguHFllgpakwWFEvQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696950524; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=g/Yygr9A2Il7UvnXxciW5CWUkAO8Yu2F0f5qpSzvguA=; b=XkO1cBpyl7r/ik0f1fyWT5d2N0ZgKCx1IcXv18nXfhCEIR4nrDbwDs4gRdkcdMMSz1BVYS DDs0KgiruzBzwfCQ== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov Subject: [patch 3/5] x86/microcode/amd: Cache builtin/initrd microcode early References: <20231010145130.987300357@linutronix.de> MIME-Version: 1.0 Date: Tue, 10 Oct 2023 17:08:44 +0200 (CEST) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There is no reason to scan builtin/initrd microcode on each AP. Cache the builtin/initrd microcode in an early initcall so that the early AP loader can utilize the cache. The existing fs initcall which invoked save_microcode_in_initrd_amd() is still required to maintain the initrd_gone flag. Rename it accordingly. This will be removed once the AP loader code is converted to use the cache. Signed-off-by: Thomas Gleixner --- arch/x86/kernel/cpu/microcode/amd.c | 8 +++++++- arch/x86/kernel/cpu/microcode/core.c | 20 ++++---------------- 2 files changed, 11 insertions(+), 17 deletions(-) --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -527,12 +527,17 @@ void load_ucode_amd_early(unsigned int c =20 static enum ucode_state load_microcode_amd(u8 family, const u8 *data, size= _t size); =20 -int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax) +static int __init save_microcode_in_initrd(void) { + unsigned int cpuid_1_eax =3D native_cpuid_eax(1); + struct cpuinfo_x86 *c =3D &boot_cpu_data; struct cont_desc desc =3D { 0 }; enum ucode_state ret; struct cpio_data cp; =20 + if (c->x86_vendor !=3D X86_VENDOR_AMD || c->x86 < 0x10) + return 0; + find_blobs_in_containers(cpuid_1_eax, &cp); if (!(cp.data && cp.size)) return -EINVAL; @@ -549,6 +554,7 @@ int __init save_microcode_in_initrd_amd( =20 return 0; } +early_initcall(save_microcode_in_initrd); =20 /* * a small, trivial cache of per-family ucode patches --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -185,24 +185,13 @@ void load_ucode_ap(void) } } =20 -static int __init save_microcode_in_initrd(void) +/* Temporary workaround until find_microcode_in_initrd() is __init */ +static int __init mark_initrd_gone(void) { - struct cpuinfo_x86 *c =3D &boot_cpu_data; - int ret =3D -EINVAL; - - switch (c->x86_vendor) { - case X86_VENDOR_AMD: - if (c->x86 >=3D 0x10) - ret =3D save_microcode_in_initrd_amd(cpuid_eax(1)); - break; - default: - break; - } - initrd_gone =3D true; - - return ret; + return 0; } +fs_initcall(mark_initrd_gone); =20 struct cpio_data find_microcode_in_initrd(const char *path) { @@ -895,5 +884,4 @@ static int __init microcode_init(void) return error; =20 } -fs_initcall(save_microcode_in_initrd); late_initcall(microcode_init);