From: Antonio Borneo <antonio.borneo@foss.st.com>
To: Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@foss.st.com>,
Russell King <linux@armlinux.org.uk>,
Wim Van Sebroeck <wim@linux-watchdog.org>,
Guenter Roeck <linux@roeck-us.net>,
Yannick Fertre <yannick.fertre@foss.st.com>,
Christophe Roullier <christophe.roullier@foss.st.com>,
<devicetree@vger.kernel.org>,
<linux-stm32@st-md-mailman.stormreply.com>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Cc: "Antonio Borneo" <antonio.borneo@foss.st.com>,
linux-watchdog@vger.kernel.org,
"Clément Le Goffic" <clement.legoffic@foss.st.com>,
"Amelie Delaunay" <amelie.delaunay@foss.st.com>,
Sashiko <sashiko-bot@kernel.org>
Subject: [PATCH v4 05/15] watchdog: stm32_iwdg: add pretimeout support for iwdg v4.0
Date: Mon, 16 Nov 2026 14:24:06 +0100 [thread overview]
Message-ID: <20261116132416.1184447-6-antonio.borneo@foss.st.com> (raw)
In-Reply-To: <20261116132416.1184447-1-antonio.borneo@foss.st.com>
IWDG hardware version 4.0, used on STM32MP2xx platforms, has an
independent register ICR for acknowledging the pretimeout
interrupts.
This removes the need for serializing the accesses to the
EWCR register, used in previous versions.
Use the interrupt clear register (ICR) to acknowledge pretimeout
interrupts on hardware version 4.0 and later.
Don't check for HW version in stm32_iwdg_start() and always take
the lock. This makes the code simpler, avoiding the version check
and the duplicated write with and without lock, while adding the
negligible cost of the uncontended lock on HW v4.0.
Signed-off-by: Antonio Borneo <antonio.borneo@foss.st.com>
---
drivers/watchdog/stm32_iwdg.c | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/drivers/watchdog/stm32_iwdg.c b/drivers/watchdog/stm32_iwdg.c
index 1a5715ff9fab3..b3d39d916735f 100644
--- a/drivers/watchdog/stm32_iwdg.c
+++ b/drivers/watchdog/stm32_iwdg.c
@@ -31,6 +31,7 @@
#define IWDG_SR 0x0C /* Status Register */
#define IWDG_WINR 0x10 /* Windows Register */
#define IWDG_EWCR 0x14 /* Early Wake-up Register */
+#define IWDG_ICR 0x18 /* Interrupt Clear Register */
#define IWDG_VERR 0x3F4 /* Version Register */
/* IWDG_KR register bit mask */
@@ -56,11 +57,14 @@
#define EWCR_EWIC BIT(14) /* Watchdog early interrupt acknowledge */
#define EWCR_EWIE BIT(15) /* Watchdog early interrupt enable */
+#define ICR_EWIC BIT(15) /* Watchdog early interrupt acknowledge */
+
/* IWDG_VERR register mask */
#define VERR_MASK GENMASK(7, 0)
/* IWDG Compatibility */
#define ONF_MIN_VER 0x31
+#define ICR_MIN_VER 0x40
/* set timeout to 100000 us */
#define TIMEOUT_US 100000
@@ -203,13 +207,17 @@ static irqreturn_t stm32_iwdg_isr(int irq, void *wdog_arg)
unsigned long flags;
u32 reg;
- spin_lock_irqsave(&wdt->lock, flags);
+ if (wdt->hw_version >= ICR_MIN_VER) {
+ reg_write(wdt->regs, IWDG_ICR, ICR_EWIC);
+ } else {
+ spin_lock_irqsave(&wdt->lock, flags);
- reg = readl(wdt->regs + IWDG_EWCR);
- reg |= EWCR_EWIC;
- writel(reg, wdt->regs + IWDG_EWCR);
+ reg = readl(wdt->regs + IWDG_EWCR);
+ reg |= EWCR_EWIC;
+ writel(reg, wdt->regs + IWDG_EWCR);
- spin_unlock_irqrestore(&wdt->lock, flags);
+ spin_unlock_irqrestore(&wdt->lock, flags);
+ }
watchdog_notify_pretimeout(wdd);
--
2.34.1
next prev parent reply other threads:[~2026-11-16 13:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 13:24 [PATCH v4 00/15] Update watchdogs support on STM32MP platforms Antonio Borneo
2026-11-16 13:24 ` [PATCH v4 01/15] watchdog: stm32_iwdg: set driver data before requesting interrupt Antonio Borneo
2026-11-16 13:24 ` [PATCH v4 02/15] watchdog: stm32_iwdg: serialize accesses to EWCR register Antonio Borneo
2026-11-16 13:24 ` [PATCH v4 03/15] watchdog: stm32_iwdg: get hardware version during probe Antonio Borneo
2026-11-16 13:24 ` [PATCH v4 04/15] watchdog: stm32_iwdg: detect whether the watchdog is running Antonio Borneo
2026-11-16 13:24 ` Antonio Borneo [this message]
2026-11-16 13:24 ` [PATCH v4 06/15] ARM: stm32: enable arm smc watchdog on stm32mp1xx Antonio Borneo
2026-11-16 14:33 ` Guenter Roeck
2026-11-16 16:45 ` Antonio Borneo
2026-11-16 18:00 ` Guenter Roeck
2026-11-16 18:26 ` Antonio Borneo
2026-11-16 13:24 ` [PATCH v4 07/15] dt-bindings: watchdog: st,stm32-iwdg: add access-controllers property Antonio Borneo
2026-11-16 13:24 ` [PATCH v4 08/15] ARM: dts: stm32: add iwdg1 node on stm32mp151 SoC Antonio Borneo
2026-11-16 13:24 ` [PATCH v4 09/15] ARM: dts: stm32: enable iwdg1 on stm32mp15x ST boards Antonio Borneo
2026-11-16 13:24 ` [PATCH v4 10/15] ARM: dts: stm32: move arm smc watchdog to stm32mp151 SoC Antonio Borneo
2026-11-16 13:24 ` [PATCH v4 11/15] ARM: dts: stm32: enable arm smc watchdog on stm32mp15x scmi boards Antonio Borneo
2026-11-16 13:24 ` [PATCH v4 12/15] ARM: dts: stm32: add watchdog0 alias on ST stm32mp1xx boards Antonio Borneo
2026-11-16 13:24 ` [PATCH v4 13/15] arm64: dts: st: add iwdg1 and iwdg2 support to stm32mp231 Antonio Borneo
2026-11-16 13:24 ` [PATCH v4 14/15] arm64: dts: st: add iwdg1 and iwdg2 support to stm32mp251 Antonio Borneo
2026-11-16 13:24 ` [PATCH v4 15/15] arm64: dts: st: enable iwdg2 on stm32mp2xx ST boards Antonio Borneo
2026-11-16 14:37 ` [PATCH v4 00/15] Update watchdogs support on STM32MP platforms Guenter Roeck
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=20261116132416.1184447-6-antonio.borneo@foss.st.com \
--to=antonio.borneo@foss.st.com \
--cc=alexandre.torgue@foss.st.com \
--cc=amelie.delaunay@foss.st.com \
--cc=christophe.roullier@foss.st.com \
--cc=clement.legoffic@foss.st.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=linux@roeck-us.net \
--cc=mcoquelin.stm32@gmail.com \
--cc=robh@kernel.org \
--cc=sashiko-bot@kernel.org \
--cc=wim@linux-watchdog.org \
--cc=yannick.fertre@foss.st.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
all inboxes | Powered by JetHome®