From nobody Thu Dec 18 15:07:22 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 D10A3C4167B for ; Wed, 29 Nov 2023 11:08:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231754AbjK2LIp (ORCPT ); Wed, 29 Nov 2023 06:08:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232300AbjK2LI0 (ORCPT ); Wed, 29 Nov 2023 06:08:26 -0500 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 093E61FC3; Wed, 29 Nov 2023 03:08:21 -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 DF2262F4; Wed, 29 Nov 2023 03:09:07 -0800 (PST) Received: from e129166.arm.com (unknown [10.57.4.241]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 506623F5A1; Wed, 29 Nov 2023 03:08:18 -0800 (PST) From: Lukasz Luba To: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, rafael@kernel.org Cc: lukasz.luba@arm.com, dietmar.eggemann@arm.com, rui.zhang@intel.com, amit.kucheria@verdurent.com, amit.kachhap@gmail.com, daniel.lezcano@linaro.org, viresh.kumar@linaro.org, len.brown@intel.com, pavel@ucw.cz, mhiramat@kernel.org, qyousef@layalina.io, wvw@google.com Subject: [PATCH v5 07/23] PM: EM: Refactor how the EM table is allocated and populated Date: Wed, 29 Nov 2023 11:08:37 +0000 Message-Id: <20231129110853.94344-8-lukasz.luba@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231129110853.94344-1-lukasz.luba@arm.com> References: <20231129110853.94344-1-lukasz.luba@arm.com> 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" Split the process of allocation and data initialization for the EM table. The upcoming changes for modifiable EM will use it. This change is not expected to alter the general functionality. Signed-off-by: Lukasz Luba --- kernel/power/energy_model.c | 52 ++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/kernel/power/energy_model.c b/kernel/power/energy_model.c index 3c8542443dd4..99426b5eedb6 100644 --- a/kernel/power/energy_model.c +++ b/kernel/power/energy_model.c @@ -142,18 +142,25 @@ static int em_compute_costs(struct device *dev, struc= t em_perf_state *table, return 0; } =20 +static int em_allocate_perf_table(struct em_perf_domain *pd, + int nr_states) +{ + pd->table =3D kcalloc(nr_states, sizeof(struct em_perf_state), + GFP_KERNEL); + if (!pd->table) + return -ENOMEM; + + return 0; +} + static int em_create_perf_table(struct device *dev, struct em_perf_domain = *pd, + struct em_perf_state *table, int nr_states, struct em_data_callback *cb, unsigned long flags) { unsigned long power, freq, prev_freq =3D 0; - struct em_perf_state *table; int i, ret; =20 - table =3D kcalloc(nr_states, sizeof(*table), GFP_KERNEL); - if (!table) - return -ENOMEM; - /* Build the list of performance states for this performance domain */ for (i =3D 0, freq =3D 0; i < nr_states; i++, freq++) { /* @@ -165,7 +172,7 @@ static int em_create_perf_table(struct device *dev, str= uct em_perf_domain *pd, if (ret) { dev_err(dev, "EM: invalid perf. state: %d\n", ret); - goto free_ps_table; + return -EINVAL; } =20 /* @@ -175,7 +182,7 @@ static int em_create_perf_table(struct device *dev, str= uct em_perf_domain *pd, if (freq <=3D prev_freq) { dev_err(dev, "EM: non-increasing freq: %lu\n", freq); - goto free_ps_table; + return -EINVAL; } =20 /* @@ -185,7 +192,7 @@ static int em_create_perf_table(struct device *dev, str= uct em_perf_domain *pd, if (!power || power > EM_MAX_POWER) { dev_err(dev, "EM: invalid power: %lu\n", power); - goto free_ps_table; + return -EINVAL; } =20 table[i].power =3D power; @@ -194,16 +201,9 @@ static int em_create_perf_table(struct device *dev, st= ruct em_perf_domain *pd, =20 ret =3D em_compute_costs(dev, table, cb, nr_states, flags); if (ret) - goto free_ps_table; - - pd->table =3D table; - pd->nr_perf_states =3D nr_states; + return -EINVAL; =20 return 0; - -free_ps_table: - kfree(table); - return -EINVAL; } =20 static int em_create_pd(struct device *dev, int nr_states, @@ -234,11 +234,15 @@ static int em_create_pd(struct device *dev, int nr_st= ates, return -ENOMEM; } =20 - ret =3D em_create_perf_table(dev, pd, nr_states, cb, flags); - if (ret) { - kfree(pd); - return ret; - } + pd->nr_perf_states =3D nr_states; + + ret =3D em_allocate_perf_table(pd, nr_states); + if (ret) + goto free_pd; + + ret =3D em_create_perf_table(dev, pd, pd->table, nr_states, cb, flags); + if (ret) + goto free_pd_table; =20 if (_is_cpu_device(dev)) for_each_cpu(cpu, cpus) { @@ -249,6 +253,12 @@ static int em_create_pd(struct device *dev, int nr_sta= tes, dev->em_pd =3D pd; =20 return 0; + +free_pd_table: + kfree(pd->table); +free_pd: + kfree(pd); + return -EINVAL; } =20 static void --=20 2.25.1