From: "Rafael V. Volkmer" <rafael.v.volkmer@gmail.com>
To: rafael.v.volkmer@gmail.com
Cc: linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org,
ukleinek@kernel.org
Subject: [PATCH v5 5/6] pwm: tiehrpwm: account for active channels at probe
Date: Fri, 22 Aug 2025 01:50:05 -0300 [thread overview]
Message-ID: <20250822045005.4127-1-rafael.v.volkmer@gmail.com> (raw)
In-Reply-To: <20250822044806.4103-1-rafael.v.volkmer@gmail.com>
Handle already-running eHRPWM channels at probe. Detect active A/B from
AQCTL(A/B) when not software-forced in AQCSFRC, take one
pm_runtime_get_sync() per active channel, and enable tbclk only if at
least one is active. Keep PM refcounts and clocks consistent with the
hardware state.
Before: active hardware could miss runtime PM gets and clk enable.
After: PM/clk state matches active channels observed at probe.
Signed-off-by: Rafael V. Volkmer <rafael.v.volkmer@gmail.com>
---
drivers/pwm/pwm-tiehrpwm.c | 55 +++++++++++++++++++++++++++++++++-----
1 file changed, 49 insertions(+), 6 deletions(-)
diff --git a/drivers/pwm/pwm-tiehrpwm.c b/drivers/pwm/pwm-tiehrpwm.c
index 1dae3b8b5..a801912be 100644
--- a/drivers/pwm/pwm-tiehrpwm.c
+++ b/drivers/pwm/pwm-tiehrpwm.c
@@ -121,6 +121,9 @@
#define NUM_PWM_CHANNEL 2 /* EHRPWM channels */
+#define PWM_CHA 0
+#define PWM_CHB 1
+
struct ehrpwm_context {
u16 tbctl;
u16 tbprd;
@@ -582,13 +585,31 @@ static int ehrpwm_pwm_probe(struct platform_device *pdev)
struct ehrpwm_pwm_chip *pc;
struct pwm_chip *chip;
struct clk *clk;
- int ret;
+ int ret, ch_idx, ch_disable;
+
+ u16 aqcsfrc_reg, aqctla_reg, aqctlb_reg;
+
+ bool enabled_ch[NUM_PWM_CHANNEL] = { false, false };
chip = devm_pwmchip_alloc(&pdev->dev, NUM_PWM_CHANNEL, sizeof(*pc));
if (IS_ERR(chip))
return PTR_ERR(chip);
pc = to_ehrpwm_pwm_chip(chip);
+ pc->mmio_base = devm_platform_ioremap_resource(pdev, 0);
+ if (IS_ERR(pc->mmio_base))
+ return PTR_ERR(pc->mmio_base);
+
+ aqcsfrc_reg = readw(pc->mmio_base + AQCSFRC);
+ aqctla_reg = readw(pc->mmio_base + AQCTLA);
+ aqctlb_reg = readw(pc->mmio_base + AQCTLB);
+
+ if (aqctla_reg != 0 && !FIELD_GET(AQCSFRC_CSFA_MASK, aqcsfrc_reg))
+ enabled_ch[PWM_CHA] = true;
+
+ if (aqctlb_reg != 0 && !FIELD_GET(AQCSFRC_CSFB_MASK, aqcsfrc_reg))
+ enabled_ch[PWM_CHB] = true;
+
clk = devm_clk_get(&pdev->dev, "fck");
if (IS_ERR(clk)) {
if (of_device_is_compatible(np, "ti,am33xx-ecap")) {
@@ -608,10 +629,6 @@ static int ehrpwm_pwm_probe(struct platform_device *pdev)
chip->ops = &ehrpwm_pwm_ops;
- pc->mmio_base = devm_platform_ioremap_resource(pdev, 0);
- if (IS_ERR(pc->mmio_base))
- return PTR_ERR(pc->mmio_base);
-
/* Acquire tbclk for Time Base EHRPWM submodule */
pc->tbclk = devm_clk_get(&pdev->dev, "tbclk");
if (IS_ERR(pc->tbclk))
@@ -623,17 +640,43 @@ static int ehrpwm_pwm_probe(struct platform_device *pdev)
return ret;
}
+ if (enabled_ch[PWM_CHA] || enabled_ch[PWM_CHB]) {
+ ret = clk_enable(pc->tbclk);
+ if (ret) {
+ dev_err_probe(&pdev->dev, ret, "clk_enable(tbclk) failed\n");
+ goto err_clk_unprepare;
+ }
+ }
+
ret = pwmchip_add(chip);
if (ret < 0) {
dev_err(&pdev->dev, "pwmchip_add() failed: %d\n", ret);
- goto err_clk_unprepare;
+ goto err_disable_tbclk;
}
platform_set_drvdata(pdev, chip);
pm_runtime_enable(&pdev->dev);
+ for (ch_idx = 0; ch_idx < NUM_PWM_CHANNEL; ch_idx++) {
+ if (enabled_ch[ch_idx]) {
+ ret = pm_runtime_get_sync(&pdev->dev);
+ if (ret < 0) {
+ for (ch_disable = 0; ch_disable <= ch_idx; ch_disable++) {
+ if (enabled_ch[ch_disable])
+ pm_runtime_put_noidle(&pdev->dev);
+ }
+
+ pwmchip_remove(chip);
+ pm_runtime_disable(&pdev->dev);
+ return ret;
+ }
+ }
+ }
return 0;
+err_disable_tbclk:
+ if (enabled_ch[PWM_CHA] || enabled_ch[PWM_CHB])
+ clk_disable(pc->tbclk);
err_clk_unprepare:
clk_unprepare(pc->tbclk);
--
2.43.0
next prev parent reply other threads:[~2025-08-22 4:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-22 4:40 [PATCH v5 1/6] pwm: tiehrpwm: use GENMASK()/FIELD_PREP() for register fields Rafael V. Volkmer
2025-08-22 4:43 ` [PATCH v5 2/6] pwm: tiehrpwm: use FIELD_PREP()/FIELD_GET() for prescalers Rafael V. Volkmer
2025-08-22 4:45 ` [PATCH v5 3/6] pwm: tiehrpwm: refactor AQCTL macros Rafael V. Volkmer
2025-08-22 4:48 ` [PATCH v5 4/6] pwm: tiehrpwm: implement .get_state Rafael V. Volkmer
2025-08-22 4:50 ` Rafael V. Volkmer [this message]
2025-08-22 4:52 ` [PATCH v5 6/6] pwm: tiehrpwm: tidy prescale calculation style Rafael V. Volkmer
2025-08-25 8:27 ` [PATCH v5 1/6] pwm: tiehrpwm: use GENMASK()/FIELD_PREP() for register fields Uwe Kleine-König
2025-08-26 4:05 ` Rafael V. Volkmer
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=20250822045005.4127-1-rafael.v.volkmer@gmail.com \
--to=rafael.v.volkmer@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=ukleinek@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 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).