From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B96A3C433F5 for ; Mon, 30 May 2022 13:48:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238141AbiE3NsR (ORCPT ); Mon, 30 May 2022 09:48:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238345AbiE3NpS (ORCPT ); Mon, 30 May 2022 09:45:18 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 472AB8FD61; Mon, 30 May 2022 06:32:49 -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 019E5B80DB6; Mon, 30 May 2022 13:32:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CCE5DC36AEA; Mon, 30 May 2022 13:32:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653917566; bh=RBHz7ZF803gdhje7BfbRLZ/t4QWWO44yiiVcusiMfKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YQOVAByj7i2yYGqlIgmMr2uMzOf5UYFZIUyV2zdjXXWMpuX2MJhyOmcp4gxjt7xaI TzGTC4TUIUWDmZB9n6yFwOzH0X9xLyEmNGToFI2qNCnVN8VZd4YhuRrlHv4hA3H5oD ELyfXcrScrIIY54G3K03FzmEekemPDoFBA09BxeLkWwoI7IdZXEClnGpE8fPcpf3iK y08wagPCAFNkmHyBu9agpkiuk6o54i+IrKVZCsMtFQqjXfyaymI4BDK6vk1dFSRjsJ lTbwzFMZ8xUzcugY/r/f4Mmv/ipuVc0yrtcO2K3HvNnqvENFj1j3cNZxr+QxXT+nPu LCtvSjVK1j0Zg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Len Brown , Srinivas Pandruvada , Sasha Levin , lenb@kernel.org, linux-pm@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 028/135] tools/power turbostat: fix ICX DRAM power numbers Date: Mon, 30 May 2022 09:29:46 -0400 Message-Id: <20220530133133.1931716-28-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530133133.1931716-1-sashal@kernel.org> References: <20220530133133.1931716-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Len Brown [ Upstream commit 6397b6418935773a34b533b3348b03f4ce3d7050 ] ICX (and its duplicates) require special hard-coded DRAM RAPL units, rather than using the generic RAPL energy units. Reported-by: Srinivas Pandruvada Signed-off-by: Len Brown Signed-off-by: Sasha Levin --- tools/power/x86/turbostat/turbostat.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 47d3ba895d6d..4f176bbf29f4 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -4376,6 +4376,7 @@ static double rapl_dram_energy_units_probe(int model, double rapl_energy_units) case INTEL_FAM6_BROADWELL_X: /* BDX */ case INTEL_FAM6_SKYLAKE_X: /* SKX */ case INTEL_FAM6_XEON_PHI_KNL: /* KNL */ + case INTEL_FAM6_ICELAKE_X: /* ICX */ return (rapl_dram_energy_units = 15.3 / 1000000); default: return (rapl_energy_units); -- 2.35.1