From: Felix Gu <gu_0233@qq.com>
To: "Rafael J. Wysocki" <rafael@kernel.org>,
Viresh Kumar <viresh.kumar@linaro.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@collabora.com>
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, Felix Gu <gu_0233@qq.com>
Subject: [PATCH v2] cpufreq: mediatek-hw: Fix resource leaks in init function
Date: Tue, 06 Jan 2026 01:26:29 +0800 [thread overview]
Message-ID: <tencent_68F699431A877005CF0887CF888B440BF808@qq.com> (raw)
In mtk_cpu_resources_init(), if mtk_cpu_create_freq_table() fails, the
function returns directly without releasing the resources.
Similarly, in mtk_cpufreq_hw_cpu_init(), if the driver returns -ENODEV,
it fails to clean up. Fix this by calling mtk_cpufreq_hw_cpu_exit()
to properly release resources.
Signed-off-by: Felix Gu <gu_0233@qq.com>
---
Changes in v2:
- Move mtk_cpufreq_hw_cpu_exit() before mtk_cpufreq_hw_cpu_init() to fix compilation.
- Link to v1: https://lore.kernel.org/lkml/tencent_0B346CE1589FE10E0110418896F129323709@qq.com/
---
drivers/cpufreq/mediatek-cpufreq-hw.c | 29 +++++++++++++++++------------
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git a/drivers/cpufreq/mediatek-cpufreq-hw.c b/drivers/cpufreq/mediatek-cpufreq-hw.c
index ae4500ab4891..3e74c32bb273 100644
--- a/drivers/cpufreq/mediatek-cpufreq-hw.c
+++ b/drivers/cpufreq/mediatek-cpufreq-hw.c
@@ -278,18 +278,32 @@ static int mtk_cpu_resources_init(struct platform_device *pdev,
ret = mtk_cpu_create_freq_table(pdev, data);
if (ret) {
dev_info(dev, "Domain-%d failed to create freq table\n", index);
- return ret;
+ goto unmap_base;
}
policy->freq_table = data->table;
policy->driver_data = data;
return 0;
+unmap_base:
+ iounmap(base);
release_region:
release_mem_region(res->start, resource_size(res));
return ret;
}
+static void mtk_cpufreq_hw_cpu_exit(struct cpufreq_policy *policy)
+{
+ struct mtk_cpufreq_domain *data = policy->driver_data;
+ struct resource *res = data->res;
+ void __iomem *base = data->base;
+
+ /* HW should be in paused state now */
+ writel_relaxed(0x0, data->reg_bases[REG_FREQ_ENABLE]);
+ iounmap(base);
+ release_mem_region(res->start, resource_size(res));
+}
+
static int mtk_cpufreq_hw_cpu_init(struct cpufreq_policy *policy)
{
struct platform_device *pdev = cpufreq_get_driver_data();
@@ -322,6 +336,8 @@ static int mtk_cpufreq_hw_cpu_init(struct cpufreq_policy *policy)
if (!(sig & CPUFREQ_HW_STATUS)) {
pr_info("cpufreq hardware of CPU%d is not enabled\n",
policy->cpu);
+ /* call mtk_cpufreq_hw_cpu_exit to cleanup the resource */
+ mtk_cpufreq_hw_cpu_exit(policy);
return -ENODEV;
}
@@ -331,17 +347,6 @@ static int mtk_cpufreq_hw_cpu_init(struct cpufreq_policy *policy)
return 0;
}
-static void mtk_cpufreq_hw_cpu_exit(struct cpufreq_policy *policy)
-{
- struct mtk_cpufreq_domain *data = policy->driver_data;
- struct resource *res = data->res;
- void __iomem *base = data->base;
-
- /* HW should be in paused state now */
- writel_relaxed(0x0, data->reg_bases[REG_FREQ_ENABLE]);
- iounmap(base);
- release_mem_region(res->start, resource_size(res));
-}
static void mtk_cpufreq_register_em(struct cpufreq_policy *policy)
{
---
base-commit: 52ae6ea5bd7c7286dcba463b6323b640b22af833
change-id: 20260105-mediatek-cpufreq-hw-a2afa5c8275a
Best regards,
--
Felix Gu <gu_0233@qq.com>
next reply other threads:[~2026-01-05 17:26 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-05 17:26 Felix Gu [this message]
2026-01-09 18:01 ` Markus Elfring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_68F699431A877005CF0887CF888B440BF808@qq.com \
--to=gu_0233@qq.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=rafael@kernel.org \
--cc=viresh.kumar@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®