From patchwork Sat Aug 12 19:59:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 134979 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1915994vqi; Sat, 12 Aug 2023 15:07:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IENSq5ALwPOY7+N+H+kfqrDk77Ur0mla4DlwsoEOiAXEdVUNWgv4jlOfN0dyUNfH1/o3akZ X-Received: by 2002:a05:6a20:6a2c:b0:134:6839:c497 with SMTP id p44-20020a056a206a2c00b001346839c497mr5503468pzk.11.1691878033840; Sat, 12 Aug 2023 15:07:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691878033; cv=none; d=google.com; s=arc-20160816; b=oti1gfivPCRzs2loHBSPK7ti63Mx3WQUVDkRbg/i1wf1hZAZZhU8EhDyYIi6SVV/nq stO7jqqthaVYhzXI9Bhd5AOJ4jV//u3Qupw08BD6v5bL6pYjVNJc/9HL7QqcJiDGWqwy fOR2sBDtlZeOEHLFvGiVkPzyE3nDUzaDDLaEhgMT1RythvX5ZuRZ274JSgavNzq3UL/C bgGq2Q8AoZQATMv0k9ju8E4VudcM5uJ+BqT9nqx/v3J83c+mqJJ/njxbDXOxOawnnVQn AyozLUXZ8rF/Z62+MFf0gb33i+38nq9Nd6rMPAVWkvVeheJYlcWb1t9Rx8DWqxQvXvwD MTXg== 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=yVae3u0BRTnDkPuniOcxLkA1wgvMDfOA8XxNsc4ELm4=; b=fdsKXmNlkflBWf84VYeW09y70GSWdpVfAj6gg1+nDEzASCofUOQPX0tjrxVPeRAfRF C4FlxaWUbEKGxvGUXbj++ZruuDqVSZjm5CwM0il5D63GYyGV89koEaqkii0NlixCs9qS XNCwh3HaTaqWK5lA2MEW7ou+YkwMLjSH61ELxvNEX9iuYYysF4HKkQNmjQcGTQRNCJUI nozJ6dGL+s9YFzBvSH2E2FFv7km2rJ5J5FoRUQXNRy0YgH92rXZzf4sXa3Qz1nY7bnCu 9aVrr/Tx+LV3xpGyo8pSY6cVsYOpTRsVjWd4bHV+F1pnrwNqiNjVoOC6UpZqENh/dT3Y FbHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=zuNXQTul; 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::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 t184-20020a6381c1000000b0055fdd303743si5398875pgd.719.2023.08.12.15.07.00; Sat, 12 Aug 2023 15:07:13 -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=zuNXQTul; 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::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 S230499AbjHLUCa (ORCPT + 99 others); Sat, 12 Aug 2023 16:02:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230475AbjHLUCX (ORCPT ); Sat, 12 Aug 2023 16:02:23 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A37E63584 for ; Sat, 12 Aug 2023 13:01:57 -0700 (PDT) Message-ID: <20230812195728.767559362@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691870349; 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=zuNXQTulA8DtnMFk1kcH3noS0gOIC12+/0PSST/h+Rmc2YczU2Q5O471jiL/xl4AJqkClu OXONrmERT89Cs94ZdPx8qdBeNSAM4uzjLa3oetmdG0wLpCxONwYB9G/+Utwe2VaFFTfLDf 2PN0kIxBtnhoKAEaKQrPNktdHGrgdN53W2tjtf8P/6TRfBLV7RU+GS0LK3hpkYtW4cjPaq peX8HMUcixXza48s/EyCMDDk1QLkaHfi831eir3+XHJOsMwiQGsAklS4BTkEvjdny9rRXt 9Z21iRJNiEs6qEJVIcKWakKhE4makNymmMGuDwxG+M8ogV/xVZI21a9+XKFGDQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691870349; 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=oKOr19vBE0Rbk5OMlHnMPH7YRqTr0xsB63QVZRC/CVdLuXJZT5ZU9VnFkNr04H9EWJ+bcW aV2fjO0J8UNvNkCQ== From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Borislav Petkov , Ashok Raj , Arjan van de Ven , Nikolay Borisov Subject: [patch V2 21/37] x86/microcode/amd: Read revision from hardware in collect_cpu_info_amd() References: <20230812194003.682298127@linutronix.de> MIME-Version: 1.0 Date: Sat, 12 Aug 2023 21:59:09 +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: 1774062700967263412 X-GMAIL-MSGID: 1774062700967263412 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