From nobody Wed Dec 17 12:19:09 2025 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 8FFC2C4167B for ; Mon, 27 Nov 2023 09:27:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232795AbjK0J1q (ORCPT ); Mon, 27 Nov 2023 04:27:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232790AbjK0J1o (ORCPT ); Mon, 27 Nov 2023 04:27:44 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 892EC1A5; Mon, 27 Nov 2023 01:27:50 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BC9AE2F4; Mon, 27 Nov 2023 01:28:37 -0800 (PST) Received: from e129166.arm.com (unknown [10.57.4.90]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0A7E63F6C4; Mon, 27 Nov 2023 01:27:48 -0800 (PST) From: Lukasz Luba To: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, daniel.lezcano@linaro.org Cc: lukasz.luba@arm.com, rafael@kernel.org, stable@vger.kernel.org Subject: [PATCH] powercap: DTPM: Fix unneeded conversion to micro-Watts Date: Mon, 27 Nov 2023 09:28:19 +0000 Message-Id: <20231127092819.2019744-1-lukasz.luba@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The Power values coming from the Energy Model are already in uW. The PowerCap and DTPM framework operate on uW, thus all places should just use the values from EM. Fix the code which left and still does the unneeded conversion. Fixes: ae6ccaa65038 (PM: EM: convert power field to micro-Watts precision a= nd align drivers) Cc: # v5.19+ Signed-off-by: Lukasz Luba --- Hi Daniel, I have found an issue due to the uW in the EM. My apologies for that. I have check those with the Rockpi dev board with your DTPM module there. BTW, if you like to check the DTPM_devfreq there, you can apply that patch. It should create EM for your GPU there and setup DTPM GPU: https://lore.kernel.org/all/20231127081511.1911706-1-lukasz.luba@arm.com/ Regards, Lukasz drivers/powercap/dtpm_cpu.c | 6 +----- drivers/powercap/dtpm_devfreq.c | 11 +++-------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/drivers/powercap/dtpm_cpu.c b/drivers/powercap/dtpm_cpu.c index 2ff7717530bf..8a2f18fa3faf 100644 --- a/drivers/powercap/dtpm_cpu.c +++ b/drivers/powercap/dtpm_cpu.c @@ -24,7 +24,6 @@ #include #include #include -#include =20 struct dtpm_cpu { struct dtpm dtpm; @@ -104,8 +103,7 @@ static u64 get_pd_power_uw(struct dtpm *dtpm) if (pd->table[i].frequency < freq) continue; =20 - return scale_pd_power_uw(pd_mask, pd->table[i].power * - MICROWATT_PER_MILLIWATT); + return scale_pd_power_uw(pd_mask, pd->table[i].power); } =20 return 0; @@ -122,11 +120,9 @@ static int update_pd_power_uw(struct dtpm *dtpm) nr_cpus =3D cpumask_weight(&cpus); =20 dtpm->power_min =3D em->table[0].power; - dtpm->power_min *=3D MICROWATT_PER_MILLIWATT; dtpm->power_min *=3D nr_cpus; =20 dtpm->power_max =3D em->table[em->nr_perf_states - 1].power; - dtpm->power_max *=3D MICROWATT_PER_MILLIWATT; dtpm->power_max *=3D nr_cpus; =20 return 0; diff --git a/drivers/powercap/dtpm_devfreq.c b/drivers/powercap/dtpm_devfre= q.c index 91276761a31d..612c3b59dd5b 100644 --- a/drivers/powercap/dtpm_devfreq.c +++ b/drivers/powercap/dtpm_devfreq.c @@ -39,10 +39,8 @@ static int update_pd_power_uw(struct dtpm *dtpm) struct em_perf_domain *pd =3D em_pd_get(dev); =20 dtpm->power_min =3D pd->table[0].power; - dtpm->power_min *=3D MICROWATT_PER_MILLIWATT; =20 dtpm->power_max =3D pd->table[pd->nr_perf_states - 1].power; - dtpm->power_max *=3D MICROWATT_PER_MILLIWATT; =20 return 0; } @@ -54,13 +52,10 @@ static u64 set_pd_power_limit(struct dtpm *dtpm, u64 po= wer_limit) struct device *dev =3D devfreq->dev.parent; struct em_perf_domain *pd =3D em_pd_get(dev); unsigned long freq; - u64 power; int i; =20 for (i =3D 0; i < pd->nr_perf_states; i++) { - - power =3D pd->table[i].power * MICROWATT_PER_MILLIWATT; - if (power > power_limit) + if (pd->table[i].power > power_limit) break; } =20 @@ -68,7 +63,7 @@ static u64 set_pd_power_limit(struct dtpm *dtpm, u64 powe= r_limit) =20 dev_pm_qos_update_request(&dtpm_devfreq->qos_req, freq); =20 - power_limit =3D pd->table[i - 1].power * MICROWATT_PER_MILLIWATT; + power_limit =3D pd->table[i - 1].power; =20 return power_limit; } @@ -110,7 +105,7 @@ static u64 get_pd_power_uw(struct dtpm *dtpm) if (pd->table[i].frequency < freq) continue; =20 - power =3D pd->table[i].power * MICROWATT_PER_MILLIWATT; + power =3D pd->table[i].power; power *=3D status.busy_time; power >>=3D 10; =20 --=20 2.25.1