From patchwork Wed Oct 19 08:32:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4822 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp223436wrs; Wed, 19 Oct 2022 02:37:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7bdjyY1zgQBQ5Q7C3dLhXdmQDEhB6fI/ISPl/0l2ROSK9tBujqVz0+l8yRFcIjf8CkrbIp X-Received: by 2002:a05:6402:2552:b0:45d:ecf:b23 with SMTP id l18-20020a056402255200b0045d0ecf0b23mr6537361edb.255.1666172250521; Wed, 19 Oct 2022 02:37:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666172250; cv=none; d=google.com; s=arc-20160816; b=lhA5KQZgNo5rz07IZ4ubEZHN2VzhgEO6suhMbJjv6SbzWPyn58jPFtkJAVs8KWU8LW 73VkcyQ0ZcLnHL3DEJQa7Rs5n3JJs05tY/16DDbNILezqyCHiIShDrqMT7M4jaV1L2G3 s+4AHnVTRaqMLh6pvfSQiGUJzpg2KzNVGfHTT+N0e0UFcKG9/6zkWIjvKbdUGREUSb4D cwnHXBpK9Cfgd7ZB3KZggYmRxR2/F/DCrknSW55zFVG8tTlZVhuQuf+mva6dYdB/gpD+ ZeNkK4w3BgjnjUeRF9BxaoDQSCGU25wl+lwwzhwvCQbjgwG5WMMYNISwOXFUerCQtIjf j1Mw== 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=Z+mgeY0NBF7ms7WW8XX9ye01kwCfYzAN3ty1cL3dAa8=; b=c7ohLZGz5XlcqEEpFrWLwUZaZiTzvM0ryoBi78HYU5t9j7YG7+ug7rHEfaQGsn9u7x zVOAMXnSQfFNxKLhX12pEZwvjlbdt8eriO5aRjs1/73zSgJs3bFNcVMsRDxbgxHPE3VP Jz3+ynyTwcAXy1tZrAcyMQIQDglyLHPhE+9jg4F0tbMQPbq/GS8mr4fph0oVRnN0u98F BAueKvmC1YvAUiPpCgrMQZohyY6ZCieLclOC2GkIJrIhMkNfeXJZ/uaaFLy+rT6+q5hV 4omGw86Lqe1k0w9cay1Fb6wO/x7CWgVdVP81ibe28flj3KYH8iC1p9lWl/lWCWLSb4Wz 31oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kvZXu4Pi; 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 l9-20020a1709062a8900b00780a3097d20si11384963eje.180.2022.10.19.02.37.05; Wed, 19 Oct 2022 02:37: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=@linuxfoundation.org header.s=korg header.b=kvZXu4Pi; 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 S233318AbiJSJUb (ORCPT + 99 others); Wed, 19 Oct 2022 05:20:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233465AbiJSJTT (ORCPT ); Wed, 19 Oct 2022 05:19:19 -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 ED807DCE8D; Wed, 19 Oct 2022 02:08:35 -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 720F161825; Wed, 19 Oct 2022 09:07:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A413C433D7; Wed, 19 Oct 2022 09:07:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170443; bh=BdUT6MVBWP9eWHoam61ekkpWBMFDaB0rW36JYnis4qU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kvZXu4Pimo1U3TIJO77OdgYVS9AFruhx/3Yr1lxxGyKwZCUg5Jforx2XqdU0IwlMo fQBIh8uiFEPXvcs8wZ4SEQtj/nxDXutR8/1ZTXGJNk9YZlQerVAArgx2GKnHe+vze3 PFIbN6IA+Q3H/xbcKYqx7vs0NOYsInobvtvyGETQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhang Rui , Wang Wendy , Len Brown , Sasha Levin Subject: [PATCH 6.0 657/862] tools/power turbostat: Use standard Energy Unit for SPR Dram RAPL domain Date: Wed, 19 Oct 2022 10:32:24 +0200 Message-Id: <20221019083318.988379410@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?1747108233856121125?= X-GMAIL-MSGID: =?utf-8?q?1747108233856121125?= From: Zhang Rui [ Upstream commit b2d433ae637626d44c9d4a75dd3330cf68fed9de ] 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 rapl_dram_energy_units quirk. Fixes: e7af1ed3fa47 ("tools/power turbostat: Support additional CPU model numbers") Signed-off-by: Zhang Rui Tested-by: Wang Wendy Signed-off-by: Len Brown Signed-off-by: Sasha Levin --- tools/power/x86/turbostat/turbostat.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 831dc32d45fa..b7d2a0cd0ac2 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -4560,7 +4560,6 @@ static double rapl_dram_energy_units_probe(int model, double rapl_energy_units) case INTEL_FAM6_SKYLAKE_X: /* SKX */ case INTEL_FAM6_XEON_PHI_KNL: /* KNL */ case INTEL_FAM6_ICELAKE_X: /* ICX */ - case INTEL_FAM6_SAPPHIRERAPIDS_X: /* SPR */ return (rapl_dram_energy_units = 15.3 / 1000000); default: return (rapl_energy_units);