From: Simon South <simon@simonsouth.net>
To: tpiepho@gmail.com, thierry.reding@gmail.com,
u.kleine-koenig@pengutronix.de, lee.jones@linaro.org,
heiko@sntech.de, bbrezillon@kernel.org,
linux-pwm@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-rockchip@lists.infradead.org
Cc: simon@simonsouth.net
Subject: [PATCH v2 2/3] pwm: rockchip: Eliminate potential race condition when probing
Date: Sat, 19 Dec 2020 15:44:09 -0500 [thread overview]
Message-ID: <fcfb96fd2fd860ae3f08cb563c74eb864cdab41a.1608407584.git.simon@simonsouth.net> (raw)
In-Reply-To: <cover.1608407584.git.simon@simonsouth.net>
Commit 48cf973cae33 ("pwm: rockchip: Avoid glitches on already running
PWMs") introduced a potential race condition in rockchip_pwm_probe() as the
function could disable the clock of a PWM device after having registered it
through a call to pwmchip_add().
Eliminate this possibility by moving the code that disables the clock of a
non-enabled PWM ahead of the code that registers the device.
Also refactor the code slightly to eliminate goto targets as the error
handlers no longer share any recovery steps.
Fixes: 48cf973cae33 ("pwm: rockchip: Avoid glitches on already running PWMs")
Fixes: 457f74abbed0 ("pwm: rockchip: Keep enabled PWMs running while probing")
Reported-by: Trent Piepho <tpiepho@gmail.com>
Signed-off-by: Simon South <simon@simonsouth.net>
---
drivers/pwm/pwm-rockchip.c | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c
index d2058138ce1e..f286a498b82c 100644
--- a/drivers/pwm/pwm-rockchip.c
+++ b/drivers/pwm/pwm-rockchip.c
@@ -289,6 +289,7 @@ static int rockchip_pwm_probe(struct platform_device *pdev)
struct rockchip_pwm_chip *pc;
struct resource *r;
u32 enable_conf, ctrl;
+ bool enabled;
int ret, count;
id = of_match_device(rockchip_pwm_dt_ids, &pdev->dev);
@@ -335,7 +336,8 @@ static int rockchip_pwm_probe(struct platform_device *pdev)
ret = clk_prepare_enable(pc->pclk);
if (ret) {
dev_err(&pdev->dev, "Can't enable APB clk: %d\n", ret);
- goto err_clk;
+ clk_disable_unprepare(pc->clk);
+ return ret;
}
platform_set_drvdata(pdev, pc);
@@ -351,29 +353,26 @@ static int rockchip_pwm_probe(struct platform_device *pdev)
pc->chip.of_pwm_n_cells = 3;
}
- ret = pwmchip_add(&pc->chip);
- if (ret < 0) {
- clk_unprepare(pc->clk);
- dev_err(&pdev->dev, "pwmchip_add() failed: %d\n", ret);
- goto err_pclk;
- }
-
/* Keep the PWM clk enabled if the PWM appears to be up and running. */
enable_conf = pc->data->enable_conf;
ctrl = readl_relaxed(pc->base + pc->data->regs.ctrl);
- if ((ctrl & enable_conf) != enable_conf)
+ enabled = ((ctrl & enable_conf) == enable_conf);
+ if (!enabled)
clk_disable(pc->clk);
clk_disable(pc->pclk);
- return 0;
-
-err_pclk:
- clk_disable_unprepare(pc->pclk);
-err_clk:
- clk_disable_unprepare(pc->clk);
+ ret = pwmchip_add(&pc->chip);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "pwmchip_add() failed: %d\n", ret);
+ if (enabled)
+ clk_disable(pc->clk);
+ clk_unprepare(pc->clk);
+ clk_unprepare(pc->pclk);
+ return ret;
+ }
- return ret;
+ return 0;
}
static int rockchip_pwm_remove(struct platform_device *pdev)
--
2.29.2
next prev parent reply other threads:[~2020-12-19 20:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-19 20:44 [PATCH v2 0/3] pwm: rockchip: Eliminate potential race condition when probing Simon South
2020-12-19 20:44 ` [PATCH v2 1/3] pwm: rockchip: Enable APB clock during register access while probing Simon South
2020-12-21 8:22 ` Uwe Kleine-König
2020-12-19 20:44 ` Simon South [this message]
2020-12-21 8:50 ` [PATCH v2 2/3] pwm: rockchip: Eliminate potential race condition when probing Uwe Kleine-König
2020-12-22 16:26 ` Simon South
2020-12-19 20:44 ` [PATCH v2 3/3] pwm: rockchip: Do not start PWMs not already running Simon South
2020-12-21 9:05 ` Uwe Kleine-König
2020-12-22 16:32 ` Simon South
2020-12-22 17:23 ` Robin Murphy
2020-12-22 17:43 ` Simon South
2020-12-21 9:16 ` [PATCH v2 0/3] pwm: rockchip: Eliminate potential race condition when probing Uwe Kleine-König
2020-12-22 16:34 ` Simon South
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=fcfb96fd2fd860ae3f08cb563c74eb864cdab41a.1608407584.git.simon@simonsouth.net \
--to=simon@simonsouth.net \
--cc=bbrezillon@kernel.org \
--cc=heiko@sntech.de \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pwm@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=thierry.reding@gmail.com \
--cc=tpiepho@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).