From nobody Fri Dec 19 04:49:13 2025 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 2EDBFCA0ECA for ; Tue, 12 Sep 2023 07:58:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232191AbjILH6o (ORCPT ); Tue, 12 Sep 2023 03:58:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55214 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232095AbjILH62 (ORCPT ); Tue, 12 Sep 2023 03:58:28 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6651C1733 for ; Tue, 12 Sep 2023 00:58:04 -0700 (PDT) Message-ID: <20230912065501.530637507@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694505483; 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=ihivJowKww+fe1UCzdxyPRQezAmQeOqgMJYs1huTU/U=; b=wj1dVLTGF6RgQZ93P3v00gpeCt+n3ShYIi8VyQFE55ZOsZOXkp6ajCHFqdMtSDVxOo4qVm s9AoaiRwqEmjibvFZnZ02gCd0yYaNngTLCZqDYCOG5ukSHrxA8gn775Kd++ALwx8y3nlOd Bv875kw34ZDaO/BgQEecef9lrugWjpN7o1YHSLZXFc2HjjejFqfzVNZ0g6mq8Z+vCgW8tt +uBcYa128XANDG0st3buDjsZo2mSUOW4fEJjRwKjuDGu49TyNYqcUwmeebS5G+bymprNke UmBec4clGrp9SVwcPic0rnNj0Cv0hGb2vzGshg6+uPhzouO9mxNgekxQbrUibA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694505483; 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=ihivJowKww+fe1UCzdxyPRQezAmQeOqgMJYs1huTU/U=; b=pjHTtTC9LC4Q6P8H4sYw/dU1Irf8uOq7L4qiAeB9uAO0JCf+WSRPi7+kH1Vcpg4K5aOnMk bkHtbiYKaEiWYLCQ== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V3 12/30] x86/microcode/intel: Reuse intel_cpu_collect_info() References: <20230912065249.695681286@linutronix.de> MIME-Version: 1.0 Date: Tue, 12 Sep 2023 09:58:02 +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" No point for an almost duplicate function. Signed-off-by: Thomas Gleixner --- V2: New patch --- arch/x86/kernel/cpu/microcode/intel.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c @@ -425,21 +425,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; }