Received: by 2002:a05:7412:3784:b0:e2:908c:2ebd with SMTP id jk4csp1435498rdb; Mon, 2 Oct 2023 09:23:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE1fVwrVm1yyq+UBrMNMxIoAfJ69IbuJ0iZMRQ+K/KdI1B3K6pewsE3Vi7+HB5x2WDkksvy X-Received: by 2002:a05:6a00:1503:b0:693:3be8:feba with SMTP id q3-20020a056a00150300b006933be8febamr11255913pfu.19.1696263796550; Mon, 02 Oct 2023 09:23:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696263796; cv=none; d=google.com; s=arc-20160816; b=Dt4TwbCdPwMIuAsn4LwFUe417L9RE48F8UG8PfpjA6QEjai42Tse70Dpm1cjUs0RNQ KPaGxKq/KosfOj8yu85wdRCmM/YDKS8jZ8orC65JdZLsGTSW7ysSkp4sV15kBtNpUpcQ jg3I1+wI1tA15paQpdbtaeo3IHDeS+Mn4ykq3odksLq5pZ6djchAzIXfGu1yQz0f4W1M cUiWYnmpvwhRmAv7humy42HeNS7zaGVa8RU9JUH5v6vxAOnOpk/5U09udh+btydYyFjP kKbKYr8RMhw28LUiFD/Z/zJCfCK0S8c+U2Q7hPLbOeNEn8grN7dR0ZAOcc9k2nVyCGl6 V60Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:mime-version:references:subject:cc:to:from :dkim-signature:dkim-signature:message-id; bh=ihivJowKww+fe1UCzdxyPRQezAmQeOqgMJYs1huTU/U=; fh=u57tXYamzTrJA+Ht8n1u7SfTMptrQaIb6LVW+jsaYf4=; b=dTiFjyKGR3gTmj8bwfPTMzqrKXnmFxSXBuT+99K2sEqSwaeP5+po/IcJMtwvXzlx+f KAdCZqHClTKFNiAkCERl+Is0+wXsCNH0v8nZfKiOurpNgWdpUnuCRwHVH6hneY20KULp sWf3B+YOk4MyBp5n7dFj89qoGN8OWC/0DKb6SFtaphuuCpVkaxxUMMg/psuQcIV0B7QT YxT//6tBpJ+49/ewByFLQEy+wcitKIMo1sEPqEDf3anRPMX8vwbZgKVnVcc6ZR6pW843 jRnnJ2k0dFFU+wvzXDyx9h4K0+CqMNimd9w5P7kYIo6q8bShgM7c4Ee3n5efTxB32R2T gxDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=wWaFWCqr; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=XNFufHle; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id z16-20020a656650000000b0057787e286c4si24881343pgv.680.2023.10.02.09.23.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 09:23:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=wWaFWCqr; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=XNFufHle; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 652138067A79; Mon, 2 Oct 2023 05:00:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236936AbjJBMAQ (ORCPT + 99 others); Mon, 2 Oct 2023 08:00:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236905AbjJBMAA (ORCPT ); Mon, 2 Oct 2023 08:00:00 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD17D115 for ; Mon, 2 Oct 2023 04:59:50 -0700 (PDT) Message-ID: <20231002115902.741173606@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696247989; 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=wWaFWCqriKzwJj+tiIe3SEuTR4hlFXDY8SbkqL5M2A7hg42Mp8ZhaL+ZVT0QgCiPf/5wK9 Ws+g2sstPgt9NDgziMd89XKkGJDR9XgUHm7Ouf0fRkQQOHRzSbi3W6B+vsdV1FZ4paHnPS jyXGHAbNqGdBEmx2vd+BvDwK3ls2518fFJz2Q/pNDaSX1inD4ZaMBbWClIg4+hBX3FwnIs SI/SLmb/kTgAErWaTk+QJjcA0Q4eD6h2IAQJ3acpH9MToicyE6Jtmr7ffbkEt9I1AeEnrd g9nrnOh8wREw1sGqWPox3Levp/XxoS+xs3Sirg+g4HJ2DUlY9lc5hgdhyA0AmQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696247989; 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=XNFufHleMeX20JiOkPES/gphi9j4ns1gcdEigvhaBEjZ1lz4CE9I1Tvy6Uk+J6lpu5QLY8 +36OP5/o9FAGURDA== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V4 12/30] x86/microcode/intel: Reuse intel_cpu_collect_info() References: <20231002115506.217091296@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Date: Mon, 2 Oct 2023 13:59:49 +0200 (CEST) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Mon, 02 Oct 2023 05:00:53 -0700 (PDT) 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) static int collect_cpu_info(int cpu_num, struct cpu_signature *csig) { - struct cpuinfo_x86 *c = &cpu_data(cpu_num); - unsigned int val[2]; - - memset(csig, 0, sizeof(*csig)); - - csig->sig = cpuid_eax(0x00000001); - - if ((c->x86_model >= 5) || (c->x86 > 6)) { - /* get processor flags from MSR 0x17 */ - rdmsr(MSR_IA32_PLATFORM_ID, val[0], val[1]); - csig->pf = 1 << ((val[1] >> 18) & 7); - } - - csig->rev = c->microcode; - + intel_collect_cpu_info(csig); return 0; }