From patchwork Sat Aug 12 19:59:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 134953 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1898927vqi; Sat, 12 Aug 2023 14:15:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFqGsxmeRyY6aWU0UrvlrZbZ/LhLXCBFhci8Q4ziDsKUTEmhEL0i9uSw/3gGSoKUX+HQCJm X-Received: by 2002:a05:6a20:1447:b0:12f:eb74:72b6 with SMTP id a7-20020a056a20144700b0012feb7472b6mr5085706pzi.60.1691874901570; Sat, 12 Aug 2023 14:15:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691874901; cv=none; d=google.com; s=arc-20160816; b=t+SFsPC0px8VlqjJUyMgIxeM/vWWXiLUIXlUfFOVbeEvmaqqxu73xi17rOgLzuT3Y/ RJS4JQ5P2009l6ulby1kIhWFp5QWbBEQZkjNPIGEkWujAQ+mzXucUeqmyuOqMFoPoafo ewTdCZIB9jbsXHNxAUgMb0A9hBMTtKFtW0tSF+RZA23DAG6LHSAmMW6Cewps76dLldMT gMZ9X3nl38RLL5UmxxV6THstr24cOJgbvcbTANV8LsbNUMk1oi385cTf00lOmIwJWUiZ firWLQDKPH7WD/BN0RL/bd5YNyWkhGeTcrp0/plSfziemMA2k2ccwmYd8RwDULk1ZMFp 0uBg== 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=GDewIFngkCI+5WnVcXevrKcgDXFsMW2Rc1mq3io3ymU=; fh=yVae3u0BRTnDkPuniOcxLkA1wgvMDfOA8XxNsc4ELm4=; b=r3+sbM+yM2b4Y5SqEnaR5EmMxGLItaeFvc0aITK8IJ0egjOhRVnAf25MA9a95ri0Er yWW3QXk9NFMlngA+3DjVcH5UY82Tp37C8Y5zmy/mpdsUbDWww1kcft5AYjlYOaNb/kBH O6IfZv6F1qvG4xz5tMqcyIcms7RNijkGblwZfRV5zXtF16SYRI4PWalC0GzUlb0+i06s Oq59F0me9UxVin/1JRz0WGX3z2CA16kEAQobKtOfeCYw1SnToyUueoP6u4KsXQqwY5R8 GBXd6J6VsXw/JUoTZzIIVCx4QPCefzqFlYNdDrkjnOpGJ6Vttdd1owUlNUDrGfNVe+o/ 2AbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="SzDZ/hMv"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=ADY0IDxh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 81-20020a630154000000b0055b12581c75si5294958pgb.675.2023.08.12.14.14.49; Sat, 12 Aug 2023 14:15:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="SzDZ/hMv"; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=ADY0IDxh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231167AbjHLUG2 (ORCPT + 99 others); Sat, 12 Aug 2023 16:06:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230451AbjHLUG0 (ORCPT ); Sat, 12 Aug 2023 16:06:26 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57EBB1BD8 for ; Sat, 12 Aug 2023 13:05:59 -0700 (PDT) Message-ID: <20230812195728.649375687@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691870346; 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=GDewIFngkCI+5WnVcXevrKcgDXFsMW2Rc1mq3io3ymU=; b=SzDZ/hMvJh/0Z3hzYNfiQofVDznOJ5EAz6wODCsS0ZcL/xbh6IACQFM76wJCpxEnFQ5UyQ KTH+DdnzGOJwklFpJP65q1JGtdf46PYLUpIht4rT4dpfyayX7zEHSsicsN6mUzQS0XJuk+ HqCDXjtUnAk+9xvIsbcPLlvXlj9aqTrLudUH+wecGyS5Sg306WPEJqlYLPO24J3kr7d3ug HhT8IEokz3ovZAefQ5hdSk4LvVoVED7CC0XyrcUr1ofkQjnbb7ZQzxbExkxD5p/AJMO6ee YEaWIUPQmvEjv6SQbQZkc9eF3EWjbNDTkfHfqDWbm3ddTaCKaElfDMF9v9EJ4A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691870346; 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=GDewIFngkCI+5WnVcXevrKcgDXFsMW2Rc1mq3io3ymU=; b=ADY0IDxh4OJy63obIP9ZvEn7D3GClq2W+0PU7mXfrmB4c1RyipkAOEEk9C/ysDaeDchW+1 OdSJmMPhi432vgCg== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , Ashok Raj , Arjan van de Ven , Nikolay Borisov Subject: [patch V2 19/37] x86/microcode/intel: Reuse intel_cpu_collect_info() References: <20230812194003.682298127@linutronix.de> MIME-Version: 1.0 Date: Sat, 12 Aug 2023 21:59:06 +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,URIBL_BLOCKED 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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1774059416863578717 X-GMAIL-MSGID: 1774059416863578717 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 @@ -506,21 +506,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; }