[tip:,perf/urgent] perf/x86/rapl: Use standard Energy Unit for SPR Dram RAPL domain
| Message ID | 166742778760.6127.12132934184185495445.tip-bot2@tip-bot2 |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp188031wru;
Wed, 2 Nov 2022 15:54:31 -0700 (PDT)
X-Google-Smtp-Source:
AMsMyM7Vil/cw3klpJGr2psmSVk67tbstKovGrB7KVtTXmOb+EJFrIp7CJTaLNOvAQ6sAG2wjJKE
X-Received: by 2002:a05:6a00:b90:b0:56d:5540:b83a with SMTP id
g16-20020a056a000b9000b0056d5540b83amr19934179pfj.74.1667429670767;
Wed, 02 Nov 2022 15:54:30 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1667429670; cv=none;
d=google.com; s=arc-20160816;
b=HrAMU6rgGEnVNYEcaFQhgl5o5xbGPbIuwqOf5HP3OYSGAAujEJeF+a/rzNygW3uIJM
tqu/H9v2MBWwCw49gBRWg7QDqWkIeShpNqxiCVpjfo6Dl+oWv0T3n/V5R1Sn8bmzy145
V6T8s3oviDrDMTczMmq9/kS8x1B0mNwxI3Rjt3bVpyvzqTeE7xPEhOhAXkZ3xOYq7pR3
FxM6HO/JfrMcxlFLsEhZsbeysOp2uog6EqbLxyey89U5XW6T/RKNYcuYRXSgQPlrhHKA
BknXHJAjAWO3/5r+2U+fmAxvGxmWMp6vkAJq8zY13nV7qU1jV911pGKHvO39co554fGH
MSaA==
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=DJFFxTBTuJKMnzFJ4AteZowL/17syVKOLV0VVt689mc=;
b=fIobNP5UD8JihATHWYP0lLe/vwLiETY8VElOhrJiD9KstbZvz9q2lIdnakjuNVClk4
3L1ATTup8DPoFElI5NJ1JuSAIohCrYVBN2ay818JUoOZwUq66RkP2A/KqF64NNEB4Kl0
ySOIbBiGiMbyLZOihUbdobc03aT8fRmhXLolORL7dUU86EdrSrCDfvaM35Ewr6zQyab5
Bkm7Z9g3ToV5L8doQAoAI3LJV3EXAdtEQREGJdvwh5h0Up+aIuLOXD4v/O2JW9uGolbc
ZOaWKxMWAXVKNr19ZRYORz1ALWiE2sAxpDxCdQ/58aUj6F7EJcEFKj3EVfehEXFkDqDx
F6Wg==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@linutronix.de header.s=2020 header.b=dZl8gbyg;
dkim=neutral (no key) header.i=@linutronix.de header.b=a39BTn9i;
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
ls3-20020a17090b350300b001fe2de6a2c9si4529134pjb.4.2022.11.02.15.54.17;
Wed, 02 Nov 2022 15:54:30 -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=dZl8gbyg;
dkim=neutral (no key) header.i=@linutronix.de header.b=a39BTn9i;
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 S231290AbiKBWXV (ORCPT <rfc822;yves.mi.zy@gmail.com> + 99 others);
Wed, 2 Nov 2022 18:23:21 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37610 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S231318AbiKBWXK (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Wed, 2 Nov 2022 18:23:10 -0400
Received: from galois.linutronix.de (Galois.linutronix.de
[IPv6:2a0a:51c0:0:12e:550::1])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BA94AE42;
Wed, 2 Nov 2022 15:23:10 -0700 (PDT)
Date: Wed, 02 Nov 2022 22:23:07 -0000
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020; t=1667427788;
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=DJFFxTBTuJKMnzFJ4AteZowL/17syVKOLV0VVt689mc=;
b=dZl8gbyg6m9LZaZLUioxV64iS2pg0AhIwj+Cq9H6GB5/GOEAHRAFtFYTd7aOOFNuC0ZUB8
8Jm+R/J18fVa/SLj83otEFSmZvCzZkQmnVquSTK7CUFJSm5hjSR6J4dAD3xYVVAcnaax7E
uncagbatC4nf+OjYXUG3xgRuX5Gl7p+H2w/FmAfZzkXD+AcgZ7n2MrmALnHZXT9Za3I1um
fPc6h5pt7Q3Lpv+ANCySEW/SFPPP32+K25N1J83a4PMHzVZDaV/XDOpVOIQkvumlLPuUPl
sk340MwFK0hxAGkdlI7+C0XLCUSn6WPrWooxJXU6GzB6XiwxWSmxTPN/4in9tQ==
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de;
s=2020e; t=1667427788;
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=DJFFxTBTuJKMnzFJ4AteZowL/17syVKOLV0VVt689mc=;
b=a39BTn9i/EuhgdRVmnmbI9omnklO9E86n9ON8iJPk+Ges1lbdSOEspT3JGzfNTUlFXLZYu
ssLlbkxJYkoLcABA==
From: "tip-bot2 for Zhang Rui" <tip-bot2@linutronix.de>
Sender: tip-bot2@linutronix.de
Reply-to: linux-kernel@vger.kernel.org
To: linux-tip-commits@vger.kernel.org
Subject: [tip: perf/urgent] perf/x86/rapl: Use standard Energy Unit for SPR
Dram RAPL domain
Cc: Zhang Rui <rui.zhang@intel.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Kan Liang <kan.liang@linux.intel.com>,
Wang Wendy <wendy.wang@intel.com>, x86@kernel.org,
linux-kernel@vger.kernel.org
In-Reply-To: <20220924054738.12076-3-rui.zhang@intel.com>
References: <20220924054738.12076-3-rui.zhang@intel.com>
MIME-Version: 1.0
Message-ID: <166742778760.6127.12132934184185495445.tip-bot2@tip-bot2>
Robot-ID: <tip-bot2@linutronix.de>
Robot-Unsubscribe: Contact <mailto:tglx@linutronix.de> to get blacklisted from
these emails
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,
SPF_PASS 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1748102152378404936?=
X-GMAIL-MSGID: =?utf-8?q?1748426734418414217?=
|
| Series |
[tip:,perf/urgent] perf/x86/rapl: Use standard Energy Unit for SPR Dram RAPL domain
|
|
Commit Message
tip-bot2 for Thomas Gleixner
Nov. 2, 2022, 10:23 p.m. UTC
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 80275ca9e525c198c7efe045c4a6cdb68a2ea763
Gitweb: https://git.kernel.org/tip/80275ca9e525c198c7efe045c4a6cdb68a2ea763
Author: Zhang Rui <rui.zhang@intel.com>
AuthorDate: Sat, 24 Sep 2022 13:47:37 +08:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Wed, 02 Nov 2022 12:22:05 +01:00
perf/x86/rapl: Use standard Energy Unit for SPR Dram RAPL domain
Intel Xeon servers used to use a fixed energy resolution (15.3uj) for
Dram RAPL domain. But on SPR, Dram RAPL domain follows the standard
energy resolution as described in MSR_RAPL_POWER_UNIT.
Remove the SPR Dram energy unit quirk.
Fixes: bcfd218b6679 ("perf/x86/rapl: Add support for Intel SPR platform")
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Tested-by: Wang Wendy <wendy.wang@intel.com>
Link: https://lkml.kernel.org/r/20220924054738.12076-3-rui.zhang@intel.com
---
arch/x86/events/rapl.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c index fea544e..a829492 100644 --- a/arch/x86/events/rapl.c +++ b/arch/x86/events/rapl.c @@ -619,12 +619,8 @@ static int rapl_check_hw_unit(struct rapl_model *rm) case RAPL_UNIT_QUIRK_INTEL_HSW: rapl_hw_unit[PERF_RAPL_RAM] = 16; break; - /* - * SPR shares the same DRAM domain energy unit as HSW, plus it - * also has a fixed energy unit for Psys domain. - */ + /* SPR uses a fixed energy unit for Psys domain. */ case RAPL_UNIT_QUIRK_INTEL_SPR: - rapl_hw_unit[PERF_RAPL_RAM] = 16; rapl_hw_unit[PERF_RAPL_PSYS] = 0; break; default: