* [PATCH] pinctrl: stm32: Add check for clk_enable()
@ 2024-12-05 4:59 Mingwei Zheng
2024-12-05 5:07 ` Marek Vasut
0 siblings, 1 reply; 2+ messages in thread
From: Mingwei Zheng @ 2024-12-05 4:59 UTC (permalink / raw)
To: linus.walleij, mcoquelin.stm32, alexandre.torgue, make24,
peng.fan, fabien.dessenne, marex
Cc: linux-gpio, linux-stm32, linux-arm-kernel, linux-kernel,
Mingwei Zheng, Jiasheng Jiang
Add check for the return value of clk_enable() to catch the potential
error. Add a cleanup loop to disable clocks already enabled in case
of an error during clock enabling for subsequent banks.
Fixes: 05d8af449d93 ("pinctrl: stm32: Keep pinctrl block clock enabled when LEVEL IRQ requested")
Signed-off-by: Mingwei Zheng <zmw12306@gmail.com>
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
drivers/pinctrl/stm32/pinctrl-stm32.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index 5b7fa77c1184..eb7b2f864d88 100644
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -1738,10 +1738,16 @@ int __maybe_unused stm32_pinctrl_resume(struct device *dev)
{
struct stm32_pinctrl *pctl = dev_get_drvdata(dev);
struct stm32_pinctrl_group *g = pctl->groups;
- int i;
+ int i, j, ret;
- for (i = 0; i < pctl->nbanks; i++)
- clk_enable(pctl->banks[i].clk);
+ for (i = 0; i < pctl->nbanks; i++) {
+ ret = clk_enable(pctl->banks[i].clk);
+ if (ret) {
+ for (j = 0; j < i; j++)
+ clk_disable(pctl->banks[j].clk);
+ return ret;
+ }
+ }
for (i = 0; i < pctl->ngroups; i++, g++)
stm32_pinctrl_restore_gpio_regs(pctl, g->pin);
--
2.34.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] pinctrl: stm32: Add check for clk_enable()
2024-12-05 4:59 [PATCH] pinctrl: stm32: Add check for clk_enable() Mingwei Zheng
@ 2024-12-05 5:07 ` Marek Vasut
0 siblings, 0 replies; 2+ messages in thread
From: Marek Vasut @ 2024-12-05 5:07 UTC (permalink / raw)
To: Mingwei Zheng, linus.walleij, mcoquelin.stm32, alexandre.torgue,
make24, peng.fan, fabien.dessenne
Cc: linux-gpio, linux-stm32, linux-arm-kernel, linux-kernel,
Jiasheng Jiang
On 12/5/24 5:59 AM, Mingwei Zheng wrote:
> Add check for the return value of clk_enable() to catch the potential
> error. Add a cleanup loop to disable clocks already enabled in case
> of an error during clock enabling for subsequent banks.
>
> Fixes: 05d8af449d93 ("pinctrl: stm32: Keep pinctrl block clock enabled when LEVEL IRQ requested")
> Signed-off-by: Mingwei Zheng <zmw12306@gmail.com>
> Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
> ---
> drivers/pinctrl/stm32/pinctrl-stm32.c | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
> index 5b7fa77c1184..eb7b2f864d88 100644
> --- a/drivers/pinctrl/stm32/pinctrl-stm32.c
> +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
> @@ -1738,10 +1738,16 @@ int __maybe_unused stm32_pinctrl_resume(struct device *dev)
> {
> struct stm32_pinctrl *pctl = dev_get_drvdata(dev);
> struct stm32_pinctrl_group *g = pctl->groups;
> - int i;
> + int i, j, ret;
>
> - for (i = 0; i < pctl->nbanks; i++)
> - clk_enable(pctl->banks[i].clk);
> + for (i = 0; i < pctl->nbanks; i++) {
> + ret = clk_enable(pctl->banks[i].clk);
> + if (ret) {
> + for (j = 0; j < i; j++)
Instead of this open-coded loop, can you please convert the driver to
clk_bulk*() API and then do simple clk_bulk_enable()/clk_bulk_disable()
here and everywhere ?
Thank you
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-12-05 5:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-05 4:59 [PATCH] pinctrl: stm32: Add check for clk_enable() Mingwei Zheng
2024-12-05 5:07 ` Marek Vasut
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox