From patchwork Thu Oct 12 18:20:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 152106 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1419538vqb; Thu, 12 Oct 2023 11:21:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGzWKdwoILZncl4g/eKLSGV7ZWb1XOKXirOIj5XROwih1WjeMhSNnXmoStBL/Ix8Iy1lFdA X-Received: by 2002:a92:cdac:0:b0:357:59ca:38ec with SMTP id g12-20020a92cdac000000b0035759ca38ecmr2407531ild.1.1697134864677; Thu, 12 Oct 2023 11:21:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697134864; cv=none; d=google.com; s=arc-20160816; b=j2M99PQiBTxjphgiaretShfPN9Gf3IiRXeaJjzmRM/BHrlC06+vai89aIEzqfR8ymw yrUPyZMtrUsvMg1nslFaXGHRg8jIoOZBO3zlgenoiRRpNeTt1oSBAmxNOedfs4h6etlT bkaPIjP6zRySpjmszoAMle2CgpcSWnaKDRoW7fT3aBvZuDJtRGOv5EwzXPXwFQxqQa5B MwAxxnXeEMu0o8kOWiWY3Z46GfE/hV1NRfTE+QI9Xrm66/nNzrPKaqKXs1zG1wAwPs82 ecyzyp6X3o/GMVjw/iKBacg5YrMUJdiuDmpYi+9bJijmePl5pQC2qQxb/rpPlb2RGYJr ze7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=O3jHAuNIXAPhyFONCLzgwQk08/kHkQsm5jfg/En/LeQ=; fh=FsA4X6TM/Cu0YgiOH8p8rwht8mQDptbKVCkPDNUScRk=; b=s4RzapXFpNv3AbZp/c2TTnxra3/ubVQASEJsini0JtiBrG3EXre58WzB1ceGKa7cdJ R3dgLhMEs+O3iRCU6mf/JSqVQK4sVfcItctpIFkseaZJ3F+/e5Fz+jfXr+qB4nVzacKY 2h4rrou/2+efThBIHXcKXTo9zezn6e16uZpZrqUPGVn6IsiYQgqhKToTMCEzwq/AZNcV 0g/0+m9Og0MihT3+HV93PEh5UkVxXtmYK8p+D4ltCCHymMVqDpAMSStKus4yY+BjLqhc kqA2a0Sj2Vd1XWnopDUYNLwv4ftWP7b7VORoPgEXe/hTlRjT0lC6Da+p2Vm9x8puO17+ KwPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ddt6I8uh; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id bv8-20020a632e08000000b0055fc5e67d56si2751058pgb.7.2023.10.12.11.21.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 11:21:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=ddt6I8uh; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 7E9158082DE4; Thu, 12 Oct 2023 11:21:02 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379676AbjJLSUy (ORCPT + 19 others); Thu, 12 Oct 2023 14:20:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379624AbjJLSUv (ORCPT ); Thu, 12 Oct 2023 14:20:51 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EA4FCC; Thu, 12 Oct 2023 11:20:49 -0700 (PDT) Date: Thu, 12 Oct 2023 18:20:47 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697134847; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O3jHAuNIXAPhyFONCLzgwQk08/kHkQsm5jfg/En/LeQ=; b=ddt6I8uhlgwkL+dFz2uOmtgc4Wb1WphOOvcQ8A/ARafGL8mEXE/FQ9aApj1kxCDRoXhiV5 jMaPsttWIxxeV5ps6Al9V0Sr+80KWIAWEDQ9kYy3FR25OftrUnpzPFqf+BfT2Ue+OSRrOq oX32YAebbj1J+1mjTMlzdOe5xUCQ52612asBX+wmxCk+KQ0TaEZDpVHNbWWlkgHjc8TvtG 6Lk0PtFX9609309+X2sSyJXU5OfBIAMZu4PegWEs3OQ1pmikXgFvLt4aB7GofMnV3q44P0 0X/oVAEmX5RJwNdKVmNffUOKkYBLxetNqSewTRMcuDa3eSoU7UiA4BC7o7Zz3A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697134847; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O3jHAuNIXAPhyFONCLzgwQk08/kHkQsm5jfg/En/LeQ=; b=l0i7AyM/UIZjpkCYzY+ELFtk3RCYB9exdlWZq0Rv3DysJrOIoA6WAtcQ8K+iPfy499QMry pwmQumccLYIpiwCw== From: "tip-bot2 for Borislav Petkov" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] x86/cpu: Fix the AMD Fam 17h, Fam 19h, Zen2 and Zen4 MSR enumerations Cc: "Borislav Petkov (AMD)" , Ingo Molnar , Peter Zijlstra , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <169713484702.3135.9739629828157326909.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.8 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 agentk.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 (agentk.vger.email [0.0.0.0]); Thu, 12 Oct 2023 11:21:02 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779574887626480277 X-GMAIL-MSGID: 1779574887626480277 The following commit has been merged into the perf/core branch of tip: Commit-ID: deedec0a152a3d7fa5b04ef9431aeb71802835b5 Gitweb: https://git.kernel.org/tip/deedec0a152a3d7fa5b04ef9431aeb71802835b5 Author: Borislav Petkov AuthorDate: Thu, 12 Oct 2023 20:01:59 +02:00 Committer: Ingo Molnar CommitterDate: Thu, 12 Oct 2023 20:10:39 +02:00 x86/cpu: Fix the AMD Fam 17h, Fam 19h, Zen2 and Zen4 MSR enumerations The comments introduced in in the merge conflict fixup in: 8f4156d58713 ("Merge branch 'x86/urgent' into perf/core, to resolve conflict") ... aren't right: AMD naming schemes are more complex than implied, family 0x17 is Zen1 and 2, family 0x19 is spread around Zen 3 and 4. So there's indeed four separate MSR namespaces for: MSR_F17H_ MSR_F19H_ MSR_ZEN2_ MSR_ZEN4_ ... and the namespaces cannot be merged. Fix it up. No change in functionality. Signed-off-by: Borislav Petkov (AMD) Signed-off-by: Ingo Molnar Cc: Peter Zijlstra Link: https://lore.kernel.org/r/D99589F4-BC5D-430B-87B2-72C20370CF57@exactcode.com --- arch/x86/include/asm/msr-index.h | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 0ad9ba8..f8b5028 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -637,18 +637,20 @@ /* AMD Last Branch Record MSRs */ #define MSR_AMD64_LBR_SELECT 0xc000010e -/* Fam 19h (Zen 4) MSRs */ -#define MSR_F19H_UMC_PERF_CTL 0xc0010800 -#define MSR_F19H_UMC_PERF_CTR 0xc0010801 - -#define MSR_ZEN4_BP_CFG 0xc001102e +/* Zen4 */ +#define MSR_ZEN4_BP_CFG 0xc001102e #define MSR_ZEN4_BP_CFG_SHARED_BTB_FIX_BIT 5 -/* Fam 17h (Zen 2) MSRs */ -#define MSR_F17H_IRPERF 0xc00000e9 +/* Fam 19h MSRs */ +#define MSR_F19H_UMC_PERF_CTL 0xc0010800 +#define MSR_F19H_UMC_PERF_CTR 0xc0010801 -#define MSR_ZEN2_SPECTRAL_CHICKEN 0xc00110e3 -#define MSR_ZEN2_SPECTRAL_CHICKEN_BIT BIT_ULL(1) +/* Zen 2 */ +#define MSR_ZEN2_SPECTRAL_CHICKEN 0xc00110e3 +#define MSR_ZEN2_SPECTRAL_CHICKEN_BIT BIT_ULL(1) + +/* Fam 17h MSRs */ +#define MSR_F17H_IRPERF 0xc00000e9 /* Fam 16h MSRs */ #define MSR_F16H_L2I_PERF_CTL 0xc0010230