From: William Theesfeld <william@theesfeld.net>
To: Xingyu Wu <xingyu.wu@starfivetech.com>
Cc: Ziv Xu <ziv.xu@starfivetech.com>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 0/6] watchdog: starfive: runtime PM cleanup
Date: Fri, 5 Jun 2026 09:11:49 -0400 [thread overview]
Message-ID: <cover.1780664848.git.william@theesfeld.net> (raw)
In-Reply-To: <20260605122336.159546-1-william@theesfeld.net>
The v1 patch was a one-line conversion of pm_runtime_get_sync() to
pm_runtime_resume_and_get() in starfive_wdt_pm_start(). On review,
the StarFive maintainers pointed out one edge case the v1 fix had
missed, plus five pre-existing issues in the surrounding runtime PM
handling that all need to be addressed before the original fix is
useful in practice.
This v2 turns the single fix into a six-patch series. Each patch
addresses one independent issue and can be reviewed in isolation;
they are ordered roughly from the simplest correctness fix to the
ones requiring a small amount of restructuring.
The series:
1/6 Expand the original v1 fix so the runtime PM reference is also
released when starfive_wdt_start() fails after a successful
pm_runtime_resume_and_get().
2/6 Treat a return value of 1 from pm_runtime_put_sync() as success
in both starfive_wdt_pm_stop() and the probe path; the watchdog
framework currently propagates the value verbatim and the probe
takes the err_unregister_wdt path on a non-error return.
3/6 Restructure starfive_wdt_probe() error handling into three
labels (err_pm_disable / err_put_pm / err_unregister_wdt) so
every failure path balances exactly the resources it has
acquired. Previously two early failure paths returned without
calling pm_runtime_disable() and several later paths leaked the
runtime PM reference.
4/6 Gate the system suspend / resume callbacks with
pm_runtime_status_suspended() so the WDOGLOAD / WDOGCONTROL
accesses run only when the device is actually clocked. When
the device was already runtime-suspended the previous code
triggered a synchronous external abort.
5/6 Make starfive_wdt_shutdown() only drop the PM refcount when
WDOG_ACTIVE is set, and stop just the hardware (no PM touch)
when only WDOG_HW_RUNNING is set. This avoids the refcount
underflow that the previous unconditional pm_stop() produced.
6/6 Release the early_enable PM refcount in starfive_wdt_remove()
when WDOG_HW_RUNNING is still asserted at unregister time. The
watchdog framework's stop-on-unregister path only runs the
stop op when WDOG_ACTIVE is set, so the early-enable +
never-opened combination otherwise leaks the probe-time
reference.
The whole series builds cleanly with CONFIG_STARFIVE_WATCHDOG=m on
x86_64 defconfig. Runtime testing would require StarFive JH7100 /
JH7110 hardware and has not been performed.
William Theesfeld (6):
watchdog: starfive: balance PM refcount when start operation fails
watchdog: starfive: treat pm_runtime_put_sync() positive return as
success
watchdog: starfive: balance PM refcount and disable in probe error
paths
watchdog: starfive: guard system suspend/resume hardware access
watchdog: starfive: avoid PM refcount underflow in shutdown
watchdog: starfive: release early_enable PM refcount on remove
drivers/watchdog/starfive-wdt.c | 92 ++++++++++++++++++++++++++-------
1 file changed, 73 insertions(+), 19 deletions(-)
--
2.54.0
next prev parent reply other threads:[~2026-06-05 13:12 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-05 12:23 [PATCH] watchdog: starfive: use pm_runtime_resume_and_get() to fix refcount leak William Theesfeld
2026-06-05 12:35 ` sashiko-bot
2026-06-05 13:11 ` William Theesfeld [this message]
2026-06-05 13:11 ` [PATCH v2 1/6] watchdog: starfive: balance PM refcount when start operation fails William Theesfeld
2026-06-05 13:23 ` sashiko-bot
2026-06-05 13:11 ` [PATCH v2 2/6] watchdog: starfive: treat pm_runtime_put_sync() positive return as success William Theesfeld
2026-06-05 13:26 ` sashiko-bot
2026-06-05 13:11 ` [PATCH v2 3/6] watchdog: starfive: balance PM refcount and disable in probe error paths William Theesfeld
2026-06-05 13:24 ` sashiko-bot
2026-06-05 13:11 ` [PATCH v2 4/6] watchdog: starfive: guard system suspend/resume hardware access William Theesfeld
2026-06-05 13:27 ` sashiko-bot
2026-06-05 13:11 ` [PATCH v2 5/6] watchdog: starfive: avoid PM refcount underflow in shutdown William Theesfeld
2026-06-05 13:29 ` sashiko-bot
2026-06-05 13:11 ` [PATCH v2 6/6] watchdog: starfive: release early_enable PM refcount on remove William Theesfeld
2026-06-05 13:33 ` sashiko-bot
2026-06-05 17:19 ` [PATCH v3 0/6] watchdog: starfive: runtime PM cleanup William Theesfeld
2026-06-05 17:19 ` [PATCH v3 1/6] watchdog: starfive: balance PM refcount when start operation fails William Theesfeld
2026-06-05 17:19 ` [PATCH v3 2/6] watchdog: starfive: treat pm_runtime_put_sync() positive return as success William Theesfeld
2026-06-05 17:19 ` [PATCH v3 3/6] watchdog: starfive: balance PM refcount and disable in probe error paths William Theesfeld
2026-06-05 17:19 ` [PATCH v3 4/6] watchdog: starfive: guard system suspend/resume hardware access William Theesfeld
2026-06-05 17:19 ` [PATCH v3 5/6] watchdog: starfive: avoid PM refcount underflow in shutdown William Theesfeld
2026-06-05 17:19 ` [PATCH v3 6/6] watchdog: starfive: release early_enable PM refcount on remove William Theesfeld
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=cover.1780664848.git.william@theesfeld.net \
--to=william@theesfeld.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=wim@linux-watchdog.org \
--cc=xingyu.wu@starfivetech.com \
--cc=ziv.xu@starfivetech.com \
/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