Received: by 2002:a05:6602:18e:0:0:0:0 with SMTP id m14csp3927033ioo; Mon, 30 May 2022 13:09:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxlZu6o3n4s3yzxdAJ0WUW2CboNEgFeJ83RhDIICHdsz9ZG1KiZi5pIS4u7qWQ7dUpMNTr4 X-Received: by 2002:a17:902:c2c1:b0:161:c6af:278e with SMTP id c1-20020a170902c2c100b00161c6af278emr58220221pla.151.1653941353324; Mon, 30 May 2022 13:09:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653941353; cv=none; d=google.com; s=arc-20160816; b=LDt6WfLcGV67a9Wk3ynwBUXu9TZSWV+xDJFG0UkEX0GEAMOra5MAMqNsLVC8I2gnO+ OyMMKVZYG5MtxPRvYgHmNmGYs/gCtO8KdxZHrBbaRlHlzeAJgg1pgzJHJPsdlQSZVFqs M47CIDLY0+7MbJMeySjWVtx7CCqgXxiHyWwnUK5SKOdnlELXc0iSiaohMyNzoAkmam4R H+peq+pAaZe5RXcmH8JXhYaAk0hC59B/w768J6SmOiQVs5UD2M1QHR9Cfovrdmj7porC +bSd0UIT6WE0Ex7EOpUwfA2JM6jFKhf91ys6FVP8Y7REv2Phl77jVGOUVZQXQG77t454 CwYw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=U0hFM8xJQMWaYepMMJqhxr1JsI/ZyLO+Ck3pXsYiRls=; b=hHnwTaIwWlE+Sy7FO/+GCVVUNjmR/vqpfc2MkxHbWeQPaHD5r5XIQSb6jacsFK+rHj QLcQ6Xrzc6WtD2ZSRpdMFL86gSJJLZB3lN3JP4rL03iqnCno9fbwj5iiPUMd5mWQie8r zhhitIBaEhdAQ2SyvsE5v+5qi6InEQPyds9unCjw+DPMOzsKO3jkWrqo8LZvY0CXT8qk 5L3ssr4iJ1KnReRI5sVoySK4Sc5jvWLg8lrI0DWN20XlkAdRz0isSmkSs7bRqJAEJ1jO Lih8B2ZzNE2Hcl4YJhTS1OrZ2ECbpTe5A2ZQm6S1DiX8LBx2+FX+mlhK0EVnh7lAFQhS G1DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bcx0teN8; 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=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f2-20020a654002000000b0038233e5d18dsi17058568pgp.491.2022.05.30.13.08.59; Mon, 30 May 2022 13:09: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=@kernel.org header.s=k20201202 header.b=bcx0teN8; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240517AbiE3O3W (ORCPT + 99 others); Mon, 30 May 2022 10:29:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241484AbiE3ORh (ORCPT ); Mon, 30 May 2022 10:17:37 -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 CA2E653A41; Mon, 30 May 2022 06:47:33 -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 DAD0560FDA; Mon, 30 May 2022 13:47:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A891C3411C; Mon, 30 May 2022 13:47:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653918452; bh=X0JSBJCMl164uPRpCFAKDoP0BwSaR6OSa+/yCCXETJM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bcx0teN8odUVYtDV1l0h5MQUPom/dGLsjgNlQZQAOafDoRAsXQSu6OauRlce7Mrek bW7h2eMJP63FDXcXtlYSbjv2aIontMKT87g4wAE4IkjgghcXycL0BaHIcW+L90Ou8x dAEw0Tf/VX3mU1+VRvJCx6Slp4d5bnKg1LVvyeqgA/i2Pckg1L6F8u5F0wpx66rswb +zoQTXYqfJqCUdoQ5h8wSy6n5n1XKCSVm2QDirQf9fKiij3C72vWjoF64aNIUB2sf+ qXLfHQjfkA5RgyM+QLV5gQ/DfFDGkgrBvTgE48lKUN8Y5x1dVqlIPZ3Ap+TMrcsfkO wpo1QaCXU4+KQ== 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.4 12/55] tools/power turbostat: fix ICX DRAM power numbers Date: Mon, 30 May 2022 09:46:18 -0400 Message-Id: <20220530134701.1935933-12-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220530134701.1935933-1-sashal@kernel.org> References: <20220530134701.1935933-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 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,T_SCC_BODY_TEXT_LINE 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 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 988326b67a91..8bf6b01b3560 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -3865,6 +3865,7 @@ rapl_dram_energy_units_probe(int model, double rapl_energy_units) case INTEL_FAM6_HASWELL_X: /* HSX */ case INTEL_FAM6_BROADWELL_X: /* BDX */ 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