VIA/WonderMedia system timer IP can generate a watchdog reset when its
clocksource counter matches the value in the match register 0 and
watchdog function is enabled. For this to work, obvously the clock event
device must use a different match register (1~3) and respective interrupt.
Check if at least two interrupts are provided by the device tree, then use
match register 1 for system clock events and match register 0 for watchdog
respectively.
Signed-off-by: Alexey Charkov <alchark@gmail.com>
---
drivers/clocksource/Kconfig | 6 +++-
drivers/clocksource/timer-vt8500.c | 58 ++++++++++++++++++++++++++++++++++----
2 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 487c8525996724fbf9c6e9726dabb478d86513b9..e4f9aade058af1adc279274c6c711658f9f4cd0a 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -177,9 +177,13 @@ config TEGRA186_TIMER
config VT8500_TIMER
bool "VT8500 timer driver" if COMPILE_TEST
+ depends on ARCH_VT8500 || COMPILE_TEST
depends on HAS_IOMEM
+ select WATCHDOG
+ select WATCHDOG_CORE
help
- Enables support for the VT8500 driver.
+ Enables support for the timer and watchdog found on
+ VIA/WonderMedia VT8500 and related SoCs.
config NPCM7XX_TIMER
bool "NPCM7xx timer driver" if COMPILE_TEST
diff --git a/drivers/clocksource/timer-vt8500.c b/drivers/clocksource/timer-vt8500.c
index 9f28f30dcaf83ab4e9c89952175b0d4c75bd6b40..4e44133d455e1e9e016ddb6dfddca422295ab15c 100644
--- a/drivers/clocksource/timer-vt8500.c
+++ b/drivers/clocksource/timer-vt8500.c
@@ -22,6 +22,8 @@
#include <linux/of_address.h>
#include <linux/of_irq.h>
+#include <linux/watchdog.h>
+
#define VT8500_TIMER_OFFSET 0x0100
#define VT8500_TIMER_HZ 3000000
@@ -55,6 +57,9 @@
#define MIN_OSCR_DELTA 16
static void __iomem *regbase;
+static unsigned int sys_timer_ch; /* which match register to use
+ * for the system timer
+ */
static u64 vt8500_timer_read(struct clocksource *cs)
{
@@ -81,15 +86,15 @@ static int vt8500_timer_set_next_event(unsigned long cycles,
int loops = msecs_to_loops(10);
u64 alarm = clocksource.read(&clocksource) + cycles;
- while (readl(regbase + TIMER_ACC_STS_REG) & TIMER_ACC_WR_MATCH(0)
+ while (readl(regbase + TIMER_ACC_STS_REG) & TIMER_ACC_WR_MATCH(sys_timer_ch)
&& --loops)
cpu_relax();
- writel((unsigned long)alarm, regbase + TIMER_MATCH_REG(0));
+ writel((unsigned long)alarm, regbase + TIMER_MATCH_REG(sys_timer_ch));
if ((signed)(alarm - clocksource.read(&clocksource)) <= MIN_OSCR_DELTA)
return -ETIME;
- writel(TIMER_INT_EN_MATCH(0), regbase + TIMER_INT_EN_REG);
+ writel(TIMER_INT_EN_MATCH(sys_timer_ch), regbase + TIMER_INT_EN_REG);
return 0;
}
@@ -120,6 +125,40 @@ static irqreturn_t vt8500_timer_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}
+static int vt8500_watchdog_start(struct watchdog_device *wdd)
+{
+ u64 cycles = wdd->timeout * VT8500_TIMER_HZ;
+ u64 deadline = clocksource.read(&clocksource) + cycles;
+
+ writel((u32)deadline, regbase + TIMER_MATCH_REG(0));
+ writel(TIMER_WD_EN, regbase + TIMER_WATCHDOG_EN_REG);
+ return 0;
+}
+
+static int vt8500_watchdog_stop(struct watchdog_device *wdd)
+{
+ writel(0, regbase + TIMER_WATCHDOG_EN_REG);
+ return 0;
+}
+
+static const struct watchdog_ops vt8500_watchdog_ops = {
+ .start = vt8500_watchdog_start,
+ .stop = vt8500_watchdog_stop,
+};
+
+static const struct watchdog_info vt8500_watchdog_info = {
+ .identity = "VIA VT8500 watchdog",
+ .options = WDIOF_MAGICCLOSE |
+ WDIOF_KEEPALIVEPING |
+ WDIOF_SETTIMEOUT,
+};
+
+static struct watchdog_device vt8500_watchdog_device = {
+ .ops = &vt8500_watchdog_ops,
+ .info = &vt8500_watchdog_info,
+ .max_hw_heartbeat_ms = -1UL / (VT8500_TIMER_HZ / 1000),
+};
+
static int __init vt8500_timer_init(struct device_node *np)
{
int timer_irq, ret;
@@ -131,7 +170,9 @@ static int __init vt8500_timer_init(struct device_node *np)
return -ENXIO;
}
- timer_irq = irq_of_parse_and_map(np, 0);
+ sys_timer_ch = of_irq_count(np) > 1 ? 1 : 0;
+
+ timer_irq = irq_of_parse_and_map(np, sys_timer_ch);
if (!timer_irq) {
pr_err("%s: Missing irq description in Device Tree\n",
__func__);
@@ -140,7 +181,7 @@ static int __init vt8500_timer_init(struct device_node *np)
writel(TIMER_CTRL_ENABLE, regbase + TIMER_CTRL_REG);
writel(TIMER_STATUS_CLEARALL, regbase + TIMER_STATUS_REG);
- writel(~0, regbase + TIMER_MATCH_REG(0));
+ writel(~0, regbase + TIMER_MATCH_REG(sys_timer_ch));
ret = clocksource_register_hz(&clocksource, VT8500_TIMER_HZ);
if (ret) {
@@ -163,6 +204,13 @@ static int __init vt8500_timer_init(struct device_node *np)
clockevents_config_and_register(&clockevent, VT8500_TIMER_HZ,
MIN_OSCR_DELTA * 2, 0xf0000000);
+ if (!sys_timer_ch) {
+ pr_info("%s: Not enabling watchdog: only one irq was given\n",
+ __func__);
+ } else {
+ watchdog_register_device(&vt8500_watchdog_device);
+ }
+
return 0;
}
--
2.49.0On 06/05/2025 22:06, Alexey Charkov wrote: > VIA/WonderMedia system timer IP can generate a watchdog reset when its > clocksource counter matches the value in the match register 0 and > watchdog function is enabled. For this to work, obvously the clock event > device must use a different match register (1~3) and respective interrupt. > > Check if at least two interrupts are provided by the device tree, then use > match register 1 for system clock events and match register 0 for watchdog > respectively. > > Signed-off-by: Alexey Charkov <alchark@gmail.com> > --- > drivers/clocksource/Kconfig | 6 +++- > drivers/clocksource/timer-vt8500.c | 58 ++++++++++++++++++++++++++++++++++---- > 2 files changed, 58 insertions(+), 6 deletions(-) > > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig > index 487c8525996724fbf9c6e9726dabb478d86513b9..e4f9aade058af1adc279274c6c711658f9f4cd0a 100644 > --- a/drivers/clocksource/Kconfig > +++ b/drivers/clocksource/Kconfig > @@ -177,9 +177,13 @@ config TEGRA186_TIMER > > config VT8500_TIMER > bool "VT8500 timer driver" if COMPILE_TEST > + depends on ARCH_VT8500 || COMPILE_TEST Does not look related to this patch. > depends on HAS_IOMEM > + select WATCHDOG Drivers are not supposed to select user-visible symbols. Best regards, Krzysztof
On Wed, May 7, 2025 at 8:33 AM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > On 06/05/2025 22:06, Alexey Charkov wrote: > > VIA/WonderMedia system timer IP can generate a watchdog reset when its > > clocksource counter matches the value in the match register 0 and > > watchdog function is enabled. For this to work, obvously the clock event > > device must use a different match register (1~3) and respective interrupt. > > > > Check if at least two interrupts are provided by the device tree, then use > > match register 1 for system clock events and match register 0 for watchdog > > respectively. > > > > Signed-off-by: Alexey Charkov <alchark@gmail.com> > > --- > > drivers/clocksource/Kconfig | 6 +++- > > drivers/clocksource/timer-vt8500.c | 58 ++++++++++++++++++++++++++++++++++---- > > 2 files changed, 58 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig > > index 487c8525996724fbf9c6e9726dabb478d86513b9..e4f9aade058af1adc279274c6c711658f9f4cd0a 100644 > > --- a/drivers/clocksource/Kconfig > > +++ b/drivers/clocksource/Kconfig > > @@ -177,9 +177,13 @@ config TEGRA186_TIMER > > > > config VT8500_TIMER > > bool "VT8500 timer driver" if COMPILE_TEST > > + depends on ARCH_VT8500 || COMPILE_TEST > > Does not look related to this patch. Will drop in v2. > > depends on HAS_IOMEM > > + select WATCHDOG > > Drivers are not supposed to select user-visible symbols. Fair enough, thanks. Will add a separate nested user selectable option for the watchdog function and make it depend on both the driver itself and the watchdog core. Best regards, Alexey
© 2016 - 2025 Red Hat, Inc.