From patchwork Tue Sep 12 07:58:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 138214 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp445496vqx; Tue, 12 Sep 2023 07:26:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFKHoia+5R/EHW7QlfRAftqxYfH2sr+Hd9iXeuFL55E8ii2Ev04boUWN0XEzTGQ6lApZhCr X-Received: by 2002:a17:902:d4c6:b0:1c3:8464:cad1 with SMTP id o6-20020a170902d4c600b001c38464cad1mr12836775plg.26.1694528806912; Tue, 12 Sep 2023 07:26:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694528806; cv=none; d=google.com; s=arc-20160816; b=L3Ac51xNvTkUwOrwhER9F54BfN14t72tO82t0ty+Y92U4lYK1t2QPlC2XSyFmeYtTw B9E0z69/uJFBK3ErezAMbWVT1CiNUwjgC9KgQm4YjWa+o7GpzLciVIpvGt1vLZGP7eFr efKyVUUVok9rwIOGBp8oTg1aBN3QowpPJveL/blkjeonX+rgZxWQd0Znb/Gbo/tVrvZn 0UjU/9QPRiQAzRLn/P1SW+cC27g+QfSAujrchpTRL2y6pOw1qT0ZTessV7ie17S/1VRr OFYNO91tOiyV0N4NONHmG6mA1onLw39phsvDjaHJzdp4cVleJ7cc36zdJ56PJBl4SM5M VODg== 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=kkIW+v+zNIk9lQpoyroVUgRr0ogOwnyVqvNr/VLjf7s=; fh=u57tXYamzTrJA+Ht8n1u7SfTMptrQaIb6LVW+jsaYf4=; b=NvMZfe+KxlnRUhc9u3ComfKhzte0df60GtKNi3jOKHbgIlfxqR4bUmb9cPkiibIjTX nDLYGCh5ZkxkDY3wyZkgwJOLTOz/wIwuOPORllsOIUnB+QIjBilQUkYkcSuLRaR1XlEe XfVWtbUC6GKlgHNXHhouwuqli6H7Y4aoUSeqsOK028+LPdGKRbp8+c1rFyaTTi1R2elk Fhcby1ugHF1E+DgewavNpPBL5Yrgjm0SYhnlG2xMrcn4ikj/BxhwLLSYL7sMcGiB78d6 XxCvhHOqEFh6+EKMG2G+In1SliSq/cylirBgzW85Fs+n2VXRi7yEoKgmGmdkhc8n6k6i I/GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=MmUz0z9x; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=k8+2iG5J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id lq13-20020a170903144d00b001bd9c43c896si7738196plb.287.2023.09.12.07.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 07:26:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=MmUz0z9x; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=k8+2iG5J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id B9A4481D6DB1; Tue, 12 Sep 2023 00:59:11 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231996AbjILH6y (ORCPT + 39 others); Tue, 12 Sep 2023 03:58:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232127AbjILH6i (ORCPT ); Tue, 12 Sep 2023 03:58:38 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8598219A1 for ; Tue, 12 Sep 2023 00:58:07 -0700 (PDT) Message-ID: <20230912065501.656264495@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1694505486; 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=kkIW+v+zNIk9lQpoyroVUgRr0ogOwnyVqvNr/VLjf7s=; b=MmUz0z9xeJcrJnxPWAhM0Sg9irL5LYgARz0uyeEaDH49TpRkPWpFfdIeun756Hw9CzJCgr HcE0+36CM8yqUrZTC3+N4XKggFfmqs2nEeTMUnbrtSA4jYJdoX0SnTEhdUuxl9wTCoqcmF cJfWnR6QFOJNGFZQ2Yn826PEDE0YPyW+1TSBpaa4E6a+8xcf5iVKMGxq9iL/v0X5u1pvTh QfHnC59V/7lkdTO8uDeUTXJ73kaVBLIjBrYgUSSg1rrWw05XdnPI2kFESehEwXhV+bS8LL i8ECiTGFkpP2+uqiFvEGf7ArEgcC/uEfmOCVnq1HmHpawVwzWGAVvFa7CU4qzA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1694505486; 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=kkIW+v+zNIk9lQpoyroVUgRr0ogOwnyVqvNr/VLjf7s=; b=k8+2iG5JfnEGJAuQRw8Z7ZzyuRb880eqYgK9XpNXEhGaZUVQv5PAFFf05u5VWP+04t5PSY jE+MezHcy/Fb0gAg== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V3 14/30] x86/microcode/amd: Read revision from hardware in collect_cpu_info_amd() References: <20230912065249.695681286@linutronix.de> MIME-Version: 1.0 Date: Tue, 12 Sep 2023 09:58:05 +0200 (CEST) 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 (fry.vger.email [0.0.0.0]); Tue, 12 Sep 2023 00:59:11 -0700 (PDT) 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 fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776842237757282028 X-GMAIL-MSGID: 1776842237757282028 Prepare to decrapify the core initialization logic which invokes microcode_ops::apply_microcode() several times just to set cpu_data::microcode. Signed-off-by: Thomas Gleixner --- V2: New patch --- arch/x86/kernel/cpu/microcode/amd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c @@ -673,12 +673,12 @@ void reload_ucode_amd(unsigned int cpu) static int collect_cpu_info_amd(int cpu, struct cpu_signature *csig) { - struct cpuinfo_x86 *c = &cpu_data(cpu); struct ucode_cpu_info *uci = ucode_cpu_info + cpu; + u32 dummy __always_unused; struct ucode_patch *p; csig->sig = cpuid_eax(0x00000001); - csig->rev = c->microcode; + rdmsr(MSR_AMD64_PATCH_LEVEL, csig->rev, dummy); /* * a patch could have been loaded early, set uci->mc so that