From nobody Thu Apr 9 04:47:12 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 0C335C4332F for ; Wed, 2 Nov 2022 16:09:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231209AbiKBQJC (ORCPT ); Wed, 2 Nov 2022 12:09:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231124AbiKBQJA (ORCPT ); Wed, 2 Nov 2022 12:09:00 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B30272B1A5; Wed, 2 Nov 2022 09:08:59 -0700 (PDT) Date: Wed, 02 Nov 2022 16:08:55 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1667405337; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=409bMVTBRdKa8UrKbFq/pmwOU0N/BaKvfsRkl1vzBsg=; b=ZVhab/tXD9XYm93nhavxM2XwjRVRRlLyQ4PurB4njZ4E+GxaSv/fPOH6r6ke4vwTRZYxT/ 9AHTCHD1FBkrPiLTY2Itx8COmgDk7UBcrkida2M2tm9wLvOpZATNM8qn34uNhU/oREr0Jm XBdlT+cbfMX0+nBvh/rdC3vPUTyrmVGIawCCqeHaI8AygKlA/CLpOlnuY8NfGmvbRP3GfX KHhoOz6g0nfLMV7KiygyddnGsgRw367puCiFLnRF4VDOWAifTunx7xz64ZNn1VxfUU1iqU idNzXyV4bPCRRUNqcmcNIjv3rHLWAXdBsY6b+meNNg6AW2RP7MaGqgpmbS5MLw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1667405337; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=409bMVTBRdKa8UrKbFq/pmwOU0N/BaKvfsRkl1vzBsg=; b=PYW5/+4huF+SC7HV+QqyWwUQWNS6Kh1xDCcrYa8PzrHi6OCkkI/HJcl+uidNncKocBwsg2 NVyluJ2+r1TUAeCQ== From: "tip-bot2 for Borislav Petkov" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/microcode] x86/microcode: Drop struct ucode_cpu_info.valid Cc: Borislav Petkov , Ashok Raj , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221028142638.28498-6-bp@alien8.de> References: <20221028142638.28498-6-bp@alien8.de> MIME-Version: 1.0 Message-ID: <166740533523.6127.10746142712096251030.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/microcode branch of tip: Commit-ID: 254ed7cf4dd79a18bbc496ab53f6c82d45431c78 Gitweb: https://git.kernel.org/tip/254ed7cf4dd79a18bbc496ab53f6c82d4= 5431c78 Author: Borislav Petkov AuthorDate: Wed, 19 Oct 2022 19:25:27 +02:00 Committer: Borislav Petkov CommitterDate: Wed, 02 Nov 2022 16:45:46 +01:00 x86/microcode: Drop struct ucode_cpu_info.valid It is not needed anymore. Signed-off-by: Borislav Petkov Reviewed-by: Ashok Raj Link: https://lore.kernel.org/r/20221028142638.28498-6-bp@alien8.de --- arch/x86/include/asm/microcode.h | 1 - arch/x86/kernel/cpu/intel.c | 1 - arch/x86/kernel/cpu/microcode/core.c | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microc= ode.h index d4c36fb..d5a58bd 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h @@ -49,7 +49,6 @@ struct microcode_ops { =20 struct ucode_cpu_info { struct cpu_signature cpu_sig; - int valid; void *mc; }; extern struct ucode_cpu_info ucode_cpu_info[]; diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 2d7ea54..beb8ca5 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -210,7 +210,6 @@ int intel_cpu_collect_info(struct ucode_cpu_info *uci) csig.rev =3D intel_get_microcode_revision(); =20 uci->cpu_sig =3D csig; - uci->valid =3D 1; =20 return 0; } diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/mic= rocode/core.c index ffb249c..712aaff 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -554,9 +554,9 @@ void microcode_bsp_resume(void) int cpu =3D smp_processor_id(); struct ucode_cpu_info *uci =3D ucode_cpu_info + cpu; =20 - if (uci->valid && uci->mc) + if (uci->mc) microcode_ops->apply_microcode(cpu); - else if (!uci->mc) + else reload_early_microcode(); }