From patchwork Sat Oct 22 07:19:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7208 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1090238wrr; Sat, 22 Oct 2022 00:46:13 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6UjK5KT+8L8DQQN+vv5yb7luGn7PTIXzd3zrp0XHQeGFcDHZe84nBZBBHUzEs7eW5Oe3gc X-Received: by 2002:a05:6a00:114c:b0:528:2c7a:630e with SMTP id b12-20020a056a00114c00b005282c7a630emr22941596pfm.86.1666424773038; Sat, 22 Oct 2022 00:46:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666424773; cv=none; d=google.com; s=arc-20160816; b=sZ17kma0p2HFmpwkwvXDSEFjlAf1wPGOMbvdA9VqZs6+vZP0Zsq/3BKP7sn791FKFl hGS7Qq/V23dRBfpjIyI018IhwkIWbJDxpMFrvJqmOTLOSUg+w4Fta3t4DelNOpQltJtO tK8Ndn5QsOuOd37HVb4Z4VNE79nT2bRLEG+emgB8HOqeg5fs52rusj5IGWpeIaO/ge+q E0Ph6hO7chN99WhtOk8YLxnL6KZ47QTdAq1lWXriQDBKh2+1oQcYf4g+OZGQQ9lIBz19 do5VZfAMTXxhAtZYnTWd04y0cf5awCecnNTzwZ9nskRw3jjqpHTVSfmRK/JPSNTf0G5k 5AbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pbR5Iq2QNzQXZ3bhiHLKQ7yyMXCbZ850s6WlML3zi+A=; b=nfKurIHdLMroLylAyzWsTCr//LfxWAhAEiDSPyMabBviVaUqOG+7QdtMyt89A+iSjm hROP9EFKueuf2y9OltZ/s7XYLv1Z86dAYq+1MAdqcD3pRJOPd/Pv6Cv0jYUCw5vmLpP9 DN5yTKFejRpBuwxcq2DpqWtwHtiHxuuNP5x0wyacV9BdrCFE8O50TwNA1iCovTB7Zv3A ++bdYfDXvI+0feJfGpNJMibL6LTA21U5ShwfU0WFGW1JLdDJO7DuozA5NbK8k2eK5ybK 9rzO2ryNximE4VutIjmJaFZm7Y9E+yg2/4jnbS/bKZfPSwnQ/7V4UnjrLzKpVKN2KRBh Ku6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Ym7djM2h; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u15-20020a170902e5cf00b00172f237cd04si32374700plf.108.2022.10.22.00.46.00; Sat, 22 Oct 2022 00:46: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=@linuxfoundation.org header.s=korg header.b=Ym7djM2h; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231335AbiJVHpd (ORCPT + 99 others); Sat, 22 Oct 2022 03:45:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231287AbiJVHnc (ORCPT ); Sat, 22 Oct 2022 03:43:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EE6F1EB552; Sat, 22 Oct 2022 00:42:19 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7A6F660AC7; Sat, 22 Oct 2022 07:38:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8872EC433D6; Sat, 22 Oct 2022 07:38:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424288; bh=60PZ+RY33//MRdOs+d0W6qXIbeFiZGLYctjbhfQDJfs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ym7djM2hC6N0M8LjFFoyoxCsiNE2ZZ8JMmApLPpImmmP4qQdjTK5rGA0M0PLqAP7t Ysg0t6sTwl+r97LwYE+U9/dbsa4Z4RaegiIkl0oauGHN8Et1XQr7pOY3MIXJdxAzKD WAjO4doPbq1lalGfFEiEXJ/VzwOdhRLUrCQTR4Jo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhang Rui , Wang Wendy , "Rafael J. Wysocki" Subject: [PATCH 5.19 090/717] powercap: intel_rapl: Use standard Energy Unit for SPR Dram RAPL domain Date: Sat, 22 Oct 2022 09:19:29 +0200 Message-Id: <20221022072431.304446345@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747373022419519148?= X-GMAIL-MSGID: =?utf-8?q?1747373022419519148?= From: Zhang Rui commit 4c081324df5608b73428662ca54d5221ea03a6bd upstream. 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_domain_energy_unit quirk. Fixes: 2d798d9f5967 ("powercap: intel_rapl: add support for Sapphire Rapids") Signed-off-by: Zhang Rui Tested-by: Wang Wendy Cc: 5.9+ # 5.9+ Signed-off-by: Rafael J. Wysocki Signed-off-by: Greg Kroah-Hartman --- drivers/powercap/intel_rapl_common.c | 1 - 1 file changed, 1 deletion(-) --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1035,7 +1035,6 @@ static const struct rapl_defaults rapl_d .check_unit = rapl_check_unit_core, .set_floor_freq = set_floor_freq_default, .compute_time_window = rapl_compute_time_window_core, - .dram_domain_energy_unit = 15300, .psys_domain_energy_unit = 1000000000, .spr_psys_bits = true, };