From patchwork Mon Oct 2 11:59:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 147313 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1457188vqb; Mon, 2 Oct 2023 07:15:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEzjf5HZ5Q5624J5/HCUDEEFTDPGjIhAEyRwOPo36m09yLYhoEB9CBxgiV37z8KWU6i1g+R X-Received: by 2002:a92:c94f:0:b0:349:67b0:6045 with SMTP id i15-20020a92c94f000000b0034967b06045mr11456694ilq.3.1696256106701; Mon, 02 Oct 2023 07:15:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696256106; cv=none; d=google.com; s=arc-20160816; b=rC0T2KDY5BMx1RYQnK75voXj3YE2URDfl7QcgoqorJh76qMam4TMlIMpfsJEnt3qFn xSHa75JewJ+MjHtBBB/5gjQAHXzinQ0fSuzKVx3pRZn8an8tjSsVuZ+IYpvKdm5MvFTv tiwgEk/i4dB0FsQ2+y1y0Bw74JCQ9h9u7PS/W6H2RXM7GNcvnKkz0srlkPOiTwkxCRTB y/zFmN2giHiicnYKNGX1W4ZVkh4SJzwm67SEU5KG+9Kc6L4iEAzhrxh9XEXemJOh/IS8 RMbL8K1r6rPID/K6Bci0bNhKrYQWigIs4kL2e/8Q5DjIUbBBIUKHJxANcDwdyQBlSjYv mEUQ== 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; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id j190-20020a6380c7000000b0057745d87b4csi26910052pgd.526.2023.10.02.07.15.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 07:15:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; 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; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 snail.vger.email (Postfix) with ESMTP id D235B810C2CC; Mon, 2 Oct 2023 05:00:47 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236937AbjJBMAQ (ORCPT + 18 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 Date: Mon, 2 Oct 2023 13:59:49 +0200 (CEST) X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 02 Oct 2023 05:00:47 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778653443590584341 X-GMAIL-MSGID: 1778653443590584341 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; }