From: Myeonghun Pak <mhun512@gmail.com>
To: Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>,
Vinod Koul <vkoul@kernel.org>, Frank Li <Frank.Li@kernel.org>
Cc: dmaengine@vger.kernel.org, linux-kernel@vger.kernel.org,
Myeonghun Pak <mhun512@gmail.com>, Ijae Kim <ae878000@gmail.com>
Subject: [PATCH] dmaengine: dw-axi-dmac: Fix cfgr_clk leak in resume error path
Date: Wed, 24 Jun 2026 16:43:04 +0900 [thread overview]
Message-ID: <20260624074307.68365-1-mhun512@gmail.com> (raw)
axi_dma_resume() enables cfgr_clk before enabling core_clk. If enabling
core_clk fails, the function currently returns the error without disabling
cfgr_clk.
This path is reachable from dw_probe(), which calls axi_dma_resume()
directly after pm_runtime_get_noresume(). The probe error path only
disables runtime PM, so cfgr_clk can remain prepared and enabled after a
failed probe.
Unwind cfgr_clk when core_clk enable fails so the resume helper keeps the
clock state balanced on all error paths.
Fixes: 1fe20f1b8454 ("dmaengine: Introduce DW AXI DMAC driver")
Co-developed-by: Ijae Kim <ae878000@gmail.com>
Signed-off-by: Ijae Kim <ae878000@gmail.com>
Signed-off-by: Myeonghun Pak <mhun512@gmail.com>
---
drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
index 5d74bc29cf..001ab7464e 100644
--- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
+++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
@@ -1333,12 +1333,17 @@ static int axi_dma_resume(struct axi_dma_chip *chip)
ret = clk_prepare_enable(chip->core_clk);
if (ret < 0)
- return ret;
+ goto err_disable_cfgr_clk;
axi_dma_enable(chip);
axi_dma_irq_enable(chip);
return 0;
+
+err_disable_cfgr_clk:
+ clk_disable_unprepare(chip->cfgr_clk);
+
+ return ret;
}
static int __maybe_unused axi_dma_runtime_suspend(struct device *dev)
--
2.47.1
next reply other threads:[~2026-06-24 7:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-24 7:43 Myeonghun Pak [this message]
2026-06-24 7:54 ` [PATCH] dmaengine: dw-axi-dmac: Fix cfgr_clk leak in resume error path sashiko-bot
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=20260624074307.68365-1-mhun512@gmail.com \
--to=mhun512@gmail.com \
--cc=Eugeniy.Paltsev@synopsys.com \
--cc=Frank.Li@kernel.org \
--cc=ae878000@gmail.com \
--cc=dmaengine@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vkoul@kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.