From patchwork Wed Oct 19 08:23:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5198 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp264473wrs; Wed, 19 Oct 2022 04:20:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Kk+IfNL8aSiLBzJFP8cGgBjarXtC5tC2BGYy/rK+8Yf3jVaeY4IP602iIEpwkliTESb0s X-Received: by 2002:a17:906:5daa:b0:791:8933:f9f0 with SMTP id n10-20020a1709065daa00b007918933f9f0mr6265709ejv.335.1666178406554; Wed, 19 Oct 2022 04:20:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666178406; cv=none; d=google.com; s=arc-20160816; b=OsRpO+EjIYAhAweUV3wlDP0+NFPcs3m2vN3rHY+gZ7yDJOp3PBJqqNLoExaOcxCGLC 1pVaj3YvWnPdNg0naQSf/JEWFgjc4hkX7LrU6LLn2N3fVRKZtrervEGcvBSO4asViK5v 8PpX+1j+UozGNDuAvhZEYWSskPk9ljXsHVA1pU/UNxyNbdJYKfrRhuRsHM6IxfV9u/9A LC7I+hS91t7ED2nNRmRUz3pIcoh6ojQiMFY77xrR3tD+5QwtOCounTPHt6mEN1tbrkEQ aF6JxKxu7cLNPXzMTX54SPfeiq5g5G3uHhJQQ1dZnhoD2p5pEVxDxotIFwYxpQJ4Nq7h YgbA== 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=OfgyzlQSkaVmP4HZ5nkib5r7hvH7TrLxdcovrVYebsZddTMKjdsuX9Hb+6Nw5liaf/ GyrYyKmoD3Py7HrxeQDEb0xzTgjOLKoEywqsD/jYrs9n5o6fV4YzdhCo/41i1RCleoOI EKMMBCqFm3CKVHiOPFsB3b8vC3ZEI6QKF9Nir/tqTpHUFYbhcsvOh+LcF+IaEov6cQt3 1CGsHzNU2ylYcCRe6OI3nNPaZyeSgmCqVvfz/h/GD99Fs05BR5zpt6xXpUrvW7CJe+zV GCXOCoWQucQSjWQm7Z7e7l0wDP8ZOAJ9n4jevZ/dXCHV76kMkhaxhw7fEqrQog03xt83 GHzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DQZmfMwV; 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 hq13-20020a1709073f0d00b0073317d6b047si8016892ejc.569.2022.10.19.04.19.41; Wed, 19 Oct 2022 04:20:06 -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=DQZmfMwV; 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 S233719AbiJSLI6 (ORCPT + 99 others); Wed, 19 Oct 2022 07:08:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232549AbiJSLI2 (ORCPT ); Wed, 19 Oct 2022 07:08:28 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA35F17C55E; Wed, 19 Oct 2022 03:37:07 -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 BFD5FB822DD; Wed, 19 Oct 2022 08:42:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36825C433B5; Wed, 19 Oct 2022 08:42:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666168932; bh=60PZ+RY33//MRdOs+d0W6qXIbeFiZGLYctjbhfQDJfs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DQZmfMwV6jhX7nNMhuAgAav1UfGjEyrIAqe5nzvMxUIvmL/o6jCAwGqMSJtrPZ1eW pw2e+ZD49aEDP4aDq3uL8WVIQWeFS5+vlBW6tOGDFvV5z37GetiGtOyivwDm3vIgCd AYssaVSuwU7vU3LJwvdF0dZxcbYG+EE05wiru81g= 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 6.0 101/862] powercap: intel_rapl: Use standard Energy Unit for SPR Dram RAPL domain Date: Wed, 19 Oct 2022 10:23:08 +0200 Message-Id: <20221019083254.368732759@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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?1747114688916623442?= X-GMAIL-MSGID: =?utf-8?q?1747114688916623442?= 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, };