From patchwork Mon Oct 2 11:59:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 147364 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1539494vqb; Mon, 2 Oct 2023 09:23:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGLa/Z2QiavU/avRyVhR9vjFhxF1k8NUIxhMDUaKiaflUXhDmuAgbV0jqXkjGURJRHYjptt X-Received: by 2002:a17:902:da86:b0:1be:f45c:bc38 with SMTP id j6-20020a170902da8600b001bef45cbc38mr14388875plx.2.1696263825787; Mon, 02 Oct 2023 09:23:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696263825; cv=none; d=google.com; s=arc-20160816; b=ppDYPnBfofxfOpRGgOIb3pGMlKdyfu6yN8h4+mRagBKWxfS6drXPPgUbcS2hhqoZUH 2t/Mjqtn6mC7VeqXHTjGbGX6tsBm36zFHa5TwD3i5vEtWnM9rhtSemKIeEhhJhA+oPvG p5/QRZNWzfzLUlzbEJ4bmaIDYwRYYFmmxITEm2Lb+ck7o/PLABEhSo3ihAqBu0DUshiR 1RpxvW4fFP2BxgfdRV33CeBc4nnJn4d3t0cMafIruhT+iZ29+rEfG0/O4oRm7F0aonV8 FVySC2i5NJOsLiY8XXlB86YcAt1IK7bDiRXBJM+kFYdeGHo+V4Z1cmWS6Zkj8aNGMCAK nUeg== 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=wSIKumgnxSQh4jImaEIP58qXBdiBffu/K6t5/ntvIzQ=; fh=u57tXYamzTrJA+Ht8n1u7SfTMptrQaIb6LVW+jsaYf4=; b=DPQG8BUSwdcJqYXKunoJFMY61GCwokelkBUYrItxwB1Vm2r7EtAu05YxgA8cqIdOAi 1x3WsXLKbBDnz99irDwjmg6gk4IvhUUvQuFSer8fVXoMtJ1J/I/5HmxKd8JIFY8+4Zxp QdAfQoKqSmuFyx7XkzDcMlwPQZ6a+AsFDvRW7v9S6gMdf4vq8XaFVEWhFqyMVL//iXwi NCHTUDka0l6p2xcz50U9qedrbkzSWtC1IiNvguN2AdNhHixFOTYTM+51JFG2Tti5AcL8 qKksZPKI3EkOx5xwhRRj0BXym/Fw9cOCasquPV5jBdNKwwkzDDaYdpt0j2kpD7MDwDkg raLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=tSDpcr5r; dkim=neutral (no key) header.i=@linutronix.de header.b=TBKKTtA1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id s1-20020a170903200100b001c62139b16esi16884140pla.4.2023.10.02.09.23.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 09:23:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=tSDpcr5r; dkim=neutral (no key) header.i=@linutronix.de header.b=TBKKTtA1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 28BA180A2226; Mon, 2 Oct 2023 05:00:58 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236960AbjJBMAa (ORCPT + 18 others); Mon, 2 Oct 2023 08:00:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236921AbjJBMAA (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 403D71B6 for ; Mon, 2 Oct 2023 04:59:53 -0700 (PDT) Message-ID: <20231002115902.854919221@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1696247991; 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=wSIKumgnxSQh4jImaEIP58qXBdiBffu/K6t5/ntvIzQ=; b=tSDpcr5rWCDpa5okkQctpU3oe2fk8ZQztVdUP8lJ+eg0iqaXsaT8RZcr9YMh3l+dJdnfOL vha25su6LdaNwPHe6Z4hc+g7DBiKcXHokZ9ID3LtOWYJjJ/dBXnE2gwySfxhERfwD7+bsu GE4adkXnzmhS15Jl5Rx/96uLkoCSKsOxCnBdVokVccSUBJEDnC92kJt0A13vd7RaCodcAj CLMr0pxWkNBjn8KU5geQc4CUrozwM+sDlX5fa7qFdal8eHIrmjOYSk4GO61KsC5ifRzQNB 3wwCiS+nSwyFDlVYsQnv3anxR+p+dlJpNNySE4M+/1eh9M5sJmDDqZbmrz1Mmw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1696247991; 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=wSIKumgnxSQh4jImaEIP58qXBdiBffu/K6t5/ntvIzQ=; b=TBKKTtA1j5HNxDEtmf3rFeMukhPCQNSKVB+EtkrfabEqMwQCo24qURJXZz2bMSmEpjxagS u2s0llm9RrQTIwBw== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , "Chang S. Bae" , Arjan van de Ven , Nikolay Borisov Subject: [patch V4 14/30] x86/microcode/amd: Read revision from hardware in collect_cpu_info_amd() References: <20231002115506.217091296@linutronix.de> MIME-Version: 1.0 Date: Mon, 2 Oct 2023 13:59:51 +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 groat.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 (groat.vger.email [0.0.0.0]); Mon, 02 Oct 2023 05:00:58 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778661537379673995 X-GMAIL-MSGID: 1778661537379673995 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 @@ -634,12 +634,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