From patchwork Mon Oct 24 11:27:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9694 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp544064wru; Mon, 24 Oct 2022 09:31:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM41oxsVbyLtY9j0IfdQBlNRMNVwt/nlSDvPOZKqH9aMbrVdiG0wqf2cRTo3J78oJwfDSXbt X-Received: by 2002:a17:906:3e01:b0:781:6462:700f with SMTP id k1-20020a1709063e0100b007816462700fmr28779152eji.307.1666629077408; Mon, 24 Oct 2022 09:31:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666629077; cv=none; d=google.com; s=arc-20160816; b=UlaRBcuQR4octbOLgLZ0l4tbu8xazGZFq3KvoYimk9QSTHMgEC6pQ5MmHWd1pLEB1x UMhnikZFOimIcKFMpQoy+TYXZAd+eSJQllZA0cjrjsQHlgVRKvImAhBxY6UwxFgdTjj8 aGkNtKOgYOvk59qECnsPITLsYFKv5YwO3sbrk8T8J0rKKzmLWHJuElFjsOTFQt73+GSU DOMheoZpQ3CBXzFnu32LoJuFamdQtIbY1l8fkKOorAQt3FTN8bkF4cBrMQZj+UQbLxo/ RcNpOLL9OE7Bq8+EnR5T3IG1PNJMGbQ5TPV1UeKrxKrmd3e/1KeVaiaSPkbXFmc+SWp9 j1hA== 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=sDNnzG1og7ay60z5PbBjB9i3ZIfRH5ut9Gn4TDL61uY=; b=XFO3RvoHxFOkWff4wxzuu2zkPmhOmvDdd30HaUbMrikUG/d4tGhFBPo/amCMWDXQKC +mBLUmv0K/dneZzOJwT+Uc43kYQWvuO/tvk+lJZgjqqOb1Avmh6jRDiF6YRzoPO+ldZ1 ssPxZ2Oqvwmsm+UCzmUi1e0gavr0D4CleONd5yPR6ek7RxRHinwkOcLo58iSnEpEH+4z m4TqtD2oDgciMUXf3qmh9lOu/YQUmlmZlUkkzSubCKqV4LLlFPWHfAo1+zsAF4hd0EcW LG+FZcgr6ptWUxDr3PXt3jDho9dAGlqTzFl5S6uo1z0CwYddWnab5RCGQ21wJL0oox5Q c4pQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kNDsNQgp; 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 c4-20020a170906154400b0078ddff4b3absi133672ejd.423.2022.10.24.09.30.53; Mon, 24 Oct 2022 09:31:17 -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=kNDsNQgp; 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 S233907AbiJXQQR (ORCPT + 99 others); Mon, 24 Oct 2022 12:16:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234003AbiJXQMc (ORCPT ); Mon, 24 Oct 2022 12:12:32 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 796594D808; Mon, 24 Oct 2022 08:01:53 -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 ams.source.kernel.org (Postfix) with ESMTPS id 5D40DB8159E; Mon, 24 Oct 2022 12:17:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0C01C433C1; Mon, 24 Oct 2022 12:17:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613874; bh=TnC0nw3vGFM0fLbfbRouKq97FKMT/UbbDwEy8JkEgmg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kNDsNQgpNDEE8mh4DIr0iQEjkVfmpGjrDaFztez22LKU1pXuDlAi7A35Fzn9ErcYk 2zyP6n3bYs/a/fcTQXnqQSps9mnKH8V9H1rmaBkciNDuRBxVD8eMn0lalRZ+3WmItY Tx+XK9liyzGpf8pXvG/JF6ZFXv465opMUoZ6Etug= 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.10 045/390] powercap: intel_rapl: Use standard Energy Unit for SPR Dram RAPL domain Date: Mon, 24 Oct 2022 13:27:22 +0200 Message-Id: <20221024113024.537040134@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 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?1747587251059922842?= X-GMAIL-MSGID: =?utf-8?q?1747587251059922842?= 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 @@ -979,7 +979,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, };