From nobody Fri Jan 2 18:51:51 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 621A2E95A91 for ; Mon, 9 Oct 2023 12:30:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376594AbjJIMae (ORCPT ); Mon, 9 Oct 2023 08:30:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346591AbjJIM3z (ORCPT ); Mon, 9 Oct 2023 08:29:55 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6114BEB; Mon, 9 Oct 2023 05:29:53 -0700 (PDT) Date: Mon, 09 Oct 2023 12:29:51 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696854592; 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=rTXhovNOZIDWGC4c0VkQwIbPl1uuIwZBpJ37xYxm70U=; b=fj513qKL+nsEj4B2BUX+XW2TaRDe7JX3edkPpP4zV8EVgDQFn+KroH48Fv3awo4IlOHP/G hjiy/oxl9Y8VnrdVDYoANWPlszEvqMgmpD7GlwpR1Ilc+PVATo9KL0PH8u2HWMMXWwHaXs 68eRMYHVkmn9IIk7yP8lswzts9PvpGVjz9mDmgTp3z/UPXkLHwcl0Ah0DJU0VI7ZGPO5KP XufgnsT53j60HMlbHFjiFi2UQFN5TdDgP8HkSnAuI42+j+DnaqyTP1Oxo8bn0MpEsgxJNf WVtCyiMwjaM73W9MNtlKqfRFpxO8/G+JGlepzQjcXW4pzFouykj1uq/090r8zg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696854592; 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=rTXhovNOZIDWGC4c0VkQwIbPl1uuIwZBpJ37xYxm70U=; b=zIbjdZbMkASzL4KiMKKOCJpFOHQ7/ykHlfdBELVOuuxAYs5Ox+KAngepGBrpnZ6whLZwVF A5Rg8BseeoXxO7AQ== From: "tip-bot2 for Thomas Gleixner" 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/intel: Reuse intel_cpu_collect_info() Cc: Thomas Gleixner , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231002115902.741173606@linutronix.de> References: <20231002115902.741173606@linutronix.de> MIME-Version: 1.0 Message-ID: <169685459143.3135.10907142011553803868.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: ac39a61afe4f452fa9dab568b810f6c410554242 Gitweb: https://git.kernel.org/tip/ac39a61afe4f452fa9dab568b810f6c41= 0554242 Author: Thomas Gleixner AuthorDate: Mon, 02 Oct 2023 13:59:49 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 03 Oct 2023 16:08:19 +02:00 x86/microcode/intel: Reuse intel_cpu_collect_info() No point for an almost duplicate function. Signed-off-by: Thomas Gleixner Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20231002115902.741173606@linutronix.de --- arch/x86/kernel/cpu/microcode/intel.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/mi= crocode/intel.c index fd97cc1..3817bb2 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -426,21 +426,7 @@ void reload_ucode_intel(void) =20 static int collect_cpu_info(int cpu_num, struct cpu_signature *csig) { - struct cpuinfo_x86 *c =3D &cpu_data(cpu_num); - unsigned int val[2]; - - memset(csig, 0, sizeof(*csig)); - - csig->sig =3D cpuid_eax(0x00000001); - - if ((c->x86_model >=3D 5) || (c->x86 > 6)) { - /* get processor flags from MSR 0x17 */ - rdmsr(MSR_IA32_PLATFORM_ID, val[0], val[1]); - csig->pf =3D 1 << ((val[1] >> 18) & 7); - } - - csig->rev =3D c->microcode; - + intel_collect_cpu_info(csig); return 0; }