clocksource: fix Tegra234 SoC Watchdog Timer.
Subsystems (2)
v4 cover clocksource: fix Tegra234 SoC Watchdog Timer.
From: robelin <[email protected]>
This set of patches includes a fix for watchdog for it may not bark due to self-pinging and adds WDIOC_GETTIMELEFT support.
--
V4:
- Improve the precision of timeleft value
V3:
- Improve comment description
- Refactor to fit codeline within 80 columns
- Remove unused if(0) blocks
V2:
- Fix a compilation error, a warning and updates copyright --
Pohsun Su (2):
clocksource/drivers/timer-tegra186: add WDIOC_GETTIMELEFT support clocksource/drivers/timer-tegra186: fix watchdog self-pinging
robelin (1):
clocksource/drivers/timer-tegra186: Remove unused bits
drivers/clocksource/timer-tegra186.c | 92 +++++++++++++++++----------- 1 file changed, 55 insertions(+), 37 deletions(-)
Signature · 1 line
2.34.1
PATCH v4 1/3 clocksource/drivers/timer-tegra186: add WDIOC_GETTIMELEFT support
From: Pohsun Su <[email protected]>
This change adds support for WDIOC_GETTIMELEFT so userspace programs can get the number of seconds before system reset by the watchdog timer via ioctl.
--- drivers/clocksource/timer-tegra186.c | 56 +++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-)
drivers/clocksource/timer-tegra186.c +55 -1
@@ -1,8 +1,9 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2019-2020 NVIDIA Corporation. All rights reserved. +* Copyright (c) 2019-2025 NVIDIA Corporation. All rights reserved. */ +#include <linux/bitfield.h> #include <linux/clocksource.h> #include <linux/module.h> #include <linux/interrupt.h>
@@ -30,6 +31,7 @@#define TMRSR 0x004#define TMRSR_INTR_CLR BIT(30) +#define TMRSR_PCV GENMASK(28, 0)#define TMRCSSR 0x008#define TMRCSSR_SRC_USEC (0 << 0)
@@ -46,6 +48,9 @@#define WDTCR_TIMER_SOURCE_MASK 0xf#define WDTCR_TIMER_SOURCE (x) ((x) & 0xf) +#define WDTSR 0x004 +#define WDTSR_CURRENT_EXPIRATION_COUNT GENMASK(14, 12) +#define WDTCMDR 0x008#define WDTCMDR_DISABLE_COUNTER BIT(1)#define WDTCMDR_START_COUNTER BIT(0)
@@ -235,12 +240,61 @@ static int tegra186_wdt_set_timeout(struct watchdog_device *wdd,return 0 ; } +static unsigned int tegra186_wdt_get_timeleft (struct watchdog_device *wdd) +{ +struct tegra186_wdt *wdt =to_tegra186_wdt (wdd); +u32 timeleft, expiration, val; + +if (!watchdog_active (&wdt->base)) { +/* return zero if the watchdog timer is not activated. */ +return 0 ; + } + +/* +* Reset occurs on the fifth expiration of the +* watchdog timer and so when the watchdog timer is configured, +* the actual value programmed into the counter is 1/5 of the +* timeout value. Once the counter reaches 0, expiration count +* will be increased by 1 and the down counter restarts. +* Hence to get the time left before system reset we must +* combine 2 parts: +* 1. value of the current down counter +* 2. (number of counter expirations remaining) * (timeout/5) +*/ + +/* Get the current number of counter expirations. Should be a +* value between 0 and 4 +*/ + val =readl_relaxed (wdt->regs +WDTSR ); + expiration =FIELD_GET (WDTSR_CURRENT_EXPIRATION_COUNT , val); + +/* Get the current counter value in microsecond. +*/ + val =readl_relaxed (wdt->tmr->regs +TMRSR ); + timeleft =FIELD_GET (TMRSR_PCV , val); + +/* +* Calculate the time remaining by adding the time for the +* counter value to the time of the counter expirations that +* remain. Do the multiplication first on purpose just to keep +* the precision due to the integer division. +*/ + timeleft += wdt->base.timeout * (4 - expiration) /5 ; +/* +* Convert the current counter value to seconds, +* rounding up to the nearest second. +*/ + timeleft = (timeleft +USEC_PER_SEC /2 ) /USEC_PER_SEC ; +return timeleft; +} +static const struct watchdog_ops tegra186_wdt_ops = { .owner =THIS_MODULE , .start = tegra186_wdt_start, .stop = tegra186_wdt_stop, .ping = tegra186_wdt_ping, .set_timeout = tegra186_wdt_set_timeout, + .get_timeleft = tegra186_wdt_get_timeleft, }; static struct tegra186_wdt *tegra186_wdt_create(struct tegra186_timer *tegra,
Signature · 1 line
2.34.1
Jon Hunter
maintainerRe: [PATCH v4 1/3] clocksource/drivers/timer-tegra186: add WDIOC_GETTIMELEFT support
Quoted 66 lines · Robert Lin
From: Pohsun Su <[email protected]>
This change adds support for
WDIOC_GETTIMELEFTso userspace programs can get the number of seconds before system reset by the watchdog timer via ioctl.Signed-off-by Pohsun Su <[email protected]>Signed-off-by Robert Lin <[email protected]>--- drivers/clocksource/timer-tegra186.c | 56 +++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-)drivers/clocksource/timer-tegra186.c +23
-1@@ -1,8 +1,9 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2019-2020 NVIDIA Corporation. All rights reserved. +* Copyright (c) 2019-2025 NVIDIA Corporation. All rights reserved. */ +#include <linux/bitfield.h> #include <linux/clocksource.h> #include <linux/module.h> #include <linux/interrupt.h> @@ -30,6 +31,7 @@#define TMRSR 0x004#define TMRSR_INTR_CLR BIT(30) +#define TMRSR_PCV GENMASK(28, 0)#define TMRCSSR 0x008#define TMRCSSR_SRC_USEC (0 << 0)@@ -46,6 +48,9 @@#define WDTCR_TIMER_SOURCE_MASK 0xf#define WDTCR_TIMER_SOURCE (x) ((x) & 0xf) +#define WDTSR 0x004 +#define WDTSR_CURRENT_EXPIRATION_COUNT GENMASK(14, 12) +#define WDTCMDR 0x008#define WDTCMDR_DISABLE_COUNTER BIT(1)#define WDTCMDR_START_COUNTER BIT(0)@@ -235,12 +240,61 @@ static int tegra186_wdt_set_timeout(struct watchdog_device *wdd,return 0 ; } +static unsigned int tegra186_wdt_get_timeleft (struct watchdog_device *wdd) +{ +struct tegra186_wdt *wdt =to_tegra186_wdt (wdd); +u32 timeleft, expiration, val; + +if (!watchdog_active (&wdt->base)) { +/* return zero if the watchdog timer is not activated. */ +return 0 ; + } + +/* +* Reset occurs on the fifth expiration of the +* watchdog timer and so when the watchdog timer is configured, +* the actual value programmed into the counter is 1/5 of the +* timeout value. Once the counter reaches 0, expiration count +* will be increased by 1 and the down counter restarts. +* Hence to get the time left before system reset we must
drivers/clocksource/timer-tegra186.c static int tegra186_wdt_set_timeout(struct watchdog_device *wdd, · line 269
Quoted 10 lines
drivers/clocksource/timer-tegra186.c +10
-0+* combine 2 parts: +* 1. value of the current down counter +* 2. (number of counter expirations remaining) * (timeout/5) +*/ + +/* Get the current number of counter expirations. Should be a +* value between 0 and 4 +*/ + val =readl_relaxed (wdt->regs +WDTSR ); + expiration =FIELD_GET (WDTSR_CURRENT_EXPIRATION_COUNT , val);
The above says 'should be between 0 and 4', however, we never check.
I am wondering if we should ...
if (WARN_ON(expiration > 4)
expiration = 4;
To avoid any overflow later on.
Quoted 31 lines
drivers/clocksource/timer-tegra186.c +22
-0+ +/* Get the current counter value in microsecond. +*/ + val =readl_relaxed (wdt->tmr->regs +TMRSR ); + timeleft =FIELD_GET (TMRSR_PCV , val); + +/* +* Calculate the time remaining by adding the time for the +* counter value to the time of the counter expirations that +* remain. Do the multiplication first on purpose just to keep +* the precision due to the integer division. +*/ + timeleft += wdt->base.timeout * (4 - expiration) /5 ; +/* +* Convert the current counter value to seconds, +* rounding up to the nearest second. +*/ + timeleft = (timeleft +USEC_PER_SEC /2 ) /USEC_PER_SEC ; +return timeleft; +} +static const struct watchdog_ops tegra186_wdt_ops = { .owner =THIS_MODULE , .start = tegra186_wdt_start, .stop = tegra186_wdt_stop, .ping = tegra186_wdt_ping, .set_timeout = tegra186_wdt_set_timeout, + .get_timeleft = tegra186_wdt_get_timeleft, }; static struct tegra186_wdt *tegra186_wdt_create(struct tegra186_timer *tegra,
Signature · 1 line
nvpublic
RE: [PATCH v4 1/3] clocksource/drivers/timer-tegra186: add WDIOC_GETTIMELEFT support
Quoted 97 lines
-----Original Message-----
From: Jon Hunter <[email protected]>
Sent: Thursday, April 17, 2025 7:10 PM
To: Robert Lin <[email protected]>; [email protected]; [email protected]; [email protected]; Pohsun Su <[email protected]>
Cc: [email protected]; [email protected]; Sumit Gupta <[email protected]>
Subject: Re: [PATCH v4 1/3] clocksource/drivers/timer-tegra186: addWDIOC_GETTIMELEFTsupportQuoted 10 lines · Robert Lin
From: Pohsun Su <[email protected]>
This change adds support for
WDIOC_GETTIMELEFTso userspace programs can get the number of seconds before system reset by the watchdog timer via ioctl.Signed-off-by Pohsun Su <[email protected]>Signed-off-by Robert Lin <[email protected]>--- drivers/clocksource/timer-tegra186.c | 56+++++++++++++++++++++++++++-
Quoted 27 lines
1 file changed, 55 insertions(+), 1 deletion(-)drivers/clocksource/timer-tegra186.c +3
-1@@ -1,8 +1,9 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2019-2020 NVIDIA Corporation. All rights reserved. +* Copyright (c) 2019-2025 NVIDIA Corporation. All rights reserved. */ +#include <linux/bitfield.h> #include <linux/clocksource.h> #include <linux/module.h> #include <linux/interrupt.h> @@ -30,6 +31,7 @@#define TMRSR 0x004#define TMRSR_INTR_CLR BIT(30) +#define TMRSR_PCV GENMASK(28, 0)#define TMRCSSR 0x008#define TMRCSSR_SRC_USEC (0 << 0)drivers/clocksource/timer-tegra186.c line 56
Quoted 9 lines
drivers/clocksource/timer-tegra186.c +3
-0@@ -46,6 +48,9 @@#define WDTCR_TIMER_SOURCE_MASK 0xf#define WDTCR_TIMER_SOURCE (x) ((x) & 0xf) +#define WDTSR 0x004 +#define WDTSR_CURRENT_EXPIRATION_COUNT GENMASK(14, 12) +#define WDTCMDR 0x008#define WDTCMDR_DISABLE_COUNTER BIT(1)#define WDTCMDR_START_COUNTER BIT(0) @@ -235,12 +240,61 @@static
Quoted 21 lines
int tegra186_wdt_set_timeout(struct
watchdog_device*wdd,
return 0;
}drivers/clocksource/timer-tegra186.c +17
-0+static unsigned int tegra186_wdt_get_timeleft (struct watchdog_device +*wdd) { +struct tegra186_wdt *wdt =to_tegra186_wdt (wdd); +u32 timeleft, expiration, val; + +if (!watchdog_active (&wdt->base)) { +/* return zero if the watchdog timer is not activated. */ +return 0 ; + } + +/* +* Reset occurs on the fifth expiration of the +* watchdog timer and so when the watchdog timer is configured, +* the actual value programmed into the counter is 1/5 of the +* timeout value. Once the counter reaches 0, expiration count +* will be increased by 1 and the down counter restarts. +* Hence to get the time left before system reset we must drivers/clocksource/timer-tegra186.c static int tegra186_wdt_set_timeout(struct watchdog_device *wdd, · line 269
Quoted 10 lines
drivers/clocksource/timer-tegra186.c +10
-0+* combine 2 parts: +* 1. value of the current down counter +* 2. (number of counter expirations remaining) * (timeout/5) +*/ + +/* Get the current number of counter expirations. Should be a +* value between 0 and 4 +*/ + val =readl_relaxed (wdt->regs +WDTSR ); + expiration =FIELD_GET (WDTSR_CURRENT_EXPIRATION_COUNT , val);The above says 'should be between 0 and 4', however, we never check.
Quoted 7 lines
I am wondering if we should ...
if (
WARN_ON(expiration > 4)expiration = 4;To avoid any overflow later on.
Warning for the bad value seems to be good. But for the part to forcibly bound the value to 4, I'm not sure if this makes sense. Using the bad value from WDTSR or 4 both lead to wrong timeleft value at the end.
Quoted 3 lines
--
nvpublic
Jon Hunter
maintainerRe: [PATCH v4 1/3] clocksource/drivers/timer-tegra186: add WDIOC_GETTIMELEFT support
Quoted 99 lines · Robert Lin
Quoted 99 lines
-----Original Message-----
From: Jon Hunter <[email protected]>
Sent: Thursday, April 17, 2025 7:10 PM
To: Robert Lin <[email protected]>; [email protected]; [email protected]; [email protected]; Pohsun Su <[email protected]>
Cc: [email protected]; [email protected]; Sumit Gupta <[email protected]>
Subject: Re: [PATCH v4 1/3] clocksource/drivers/timer-tegra186: addWDIOC_GETTIMELEFTsupportQuoted 10 lines · Robert Lin
From: Pohsun Su <[email protected]>
This change adds support for
WDIOC_GETTIMELEFTso userspace programs can get the number of seconds before system reset by the watchdog timer via ioctl.Signed-off-by Pohsun Su <[email protected]>Signed-off-by Robert Lin <[email protected]>--- drivers/clocksource/timer-tegra186.c | 56+++++++++++++++++++++++++++-
Quoted 27 lines
1 file changed, 55 insertions(+), 1 deletion(-)drivers/clocksource/timer-tegra186.c +3
-1@@ -1,8 +1,9 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (c) 2019-2020 NVIDIA Corporation. All rights reserved. +* Copyright (c) 2019-2025 NVIDIA Corporation. All rights reserved. */ +#include <linux/bitfield.h> #include <linux/clocksource.h> #include <linux/module.h> #include <linux/interrupt.h> @@ -30,6 +31,7 @@#define TMRSR 0x004#define TMRSR_INTR_CLR BIT(30) +#define TMRSR_PCV GENMASK(28, 0)#define TMRCSSR 0x008#define TMRCSSR_SRC_USEC (0 << 0)drivers/clocksource/timer-tegra186.c line 56
Quoted 9 lines
drivers/clocksource/timer-tegra186.c +3
-0@@ -46,6 +48,9 @@#define WDTCR_TIMER_SOURCE_MASK 0xf#define WDTCR_TIMER_SOURCE (x) ((x) & 0xf) +#define WDTSR 0x004 +#define WDTSR_CURRENT_EXPIRATION_COUNT GENMASK(14, 12) +#define WDTCMDR 0x008#define WDTCMDR_DISABLE_COUNTER BIT(1)#define WDTCMDR_START_COUNTER BIT(0) @@ -235,12 +240,61 @@static
Quoted 21 lines
int tegra186_wdt_set_timeout(struct
watchdog_device*wdd,return 0; }drivers/clocksource/timer-tegra186.c +17
-0+static unsigned int tegra186_wdt_get_timeleft (struct watchdog_device +*wdd) { +struct tegra186_wdt *wdt =to_tegra186_wdt (wdd); +u32 timeleft, expiration, val; + +if (!watchdog_active (&wdt->base)) { +/* return zero if the watchdog timer is not activated. */ +return 0 ; + } + +/* +* Reset occurs on the fifth expiration of the +* watchdog timer and so when the watchdog timer is configured, +* the actual value programmed into the counter is 1/5 of the +* timeout value. Once the counter reaches 0, expiration count +* will be increased by 1 and the down counter restarts. +* Hence to get the time left before system reset we must drivers/clocksource/timer-tegra186.c static int tegra186_wdt_set_timeout(struct watchdog_device *wdd, · line 269
Quoted 10 lines
drivers/clocksource/timer-tegra186.c +10
-0+* combine 2 parts: +* 1. value of the current down counter +* 2. (number of counter expirations remaining) * (timeout/5) +*/ + +/* Get the current number of counter expirations. Should be a +* value between 0 and 4 +*/ + val =readl_relaxed (wdt->regs +WDTSR ); + expiration =FIELD_GET (WDTSR_CURRENT_EXPIRATION_COUNT , val);The above says 'should be between 0 and 4', however, we never check.
I am wondering if we should ...
Quoted 7 lines
Quoted 5 lines
if (
WARN_ON(expiration > 4)expiration = 4;To avoid any overflow later on.
Warning for the bad value seems to be good. But for the part to forcibly bound the value to 4, I'm not sure if this makes sense. Using the bad value from WDTSR or 4 both lead to wrong timeleft value at the end.
I was looking at the code, and if it is 4, then the following ...
timeleft += wdt->base.timeout * (4 - expiration) / 5;
... becomes 0. However, given that in this case something very bad has happened, then the other alternative may be to just ...
if (WARN_ON(expiration > 4)
return 0;
Jon
Signature · 1 line
nvpublic
PATCH v4 2/3 clocksource/drivers/timer-tegra186: fix watchdog self-pinging
In reply to Robert LinFrom: Pohsun Su <[email protected]>
This change removes watchdog self-pinging behavior.
The timer irq handler is triggered due to the 1st expiration, the handler disables and enables watchdog but also implicitly clears the expiration count so the count can only be 0 or 1.
Since this watchdog supports opened, configured, or pinged by systemd, We remove this behavior or the watchdog may not bark when systemd crashes since the 5th expiration never comes.
--- drivers/clocksource/timer-tegra186.c | 27 --------------------------- 1 file changed, 27 deletions(-)
drivers/clocksource/timer-tegra186.c +0 -27
@@ -175,9 +175,6 @@ static void tegra186_wdt_enable(struct tegra186_wdt *wdt) value &= ~WDTCR_PERIOD_MASK ; value |=WDTCR_PERIOD (1 ); -/* enable local interrupt for WDT petting */ - value |=WDTCR_LOCAL_INT_ENABLE ; -/* enable local FIQ and remote interrupt for debug dump */ if (0 ) value |= WDTCR_REMOTE_INT_ENABLE |
@@ -420,23 +417,10 @@ static int tegra186_timer_usec_init(struct tegra186_timer *tegra)return clocksource_register_hz (&tegra->usec,USEC_PER_SEC ); } -static irqreturn_t tegra186_timer_irq (int irq,void *data) -{ -struct tegra186_timer *tegra = data; - -if (watchdog_active (&tegra->wdt->base)) { -tegra186_wdt_disable (tegra->wdt); -tegra186_wdt_enable (tegra->wdt); - } - -return IRQ_HANDLED ; -} -static int tegra186_timer_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;struct tegra186_timer *tegra; -unsigned int irq;int err; tegra =devm_kzalloc (dev,sizeof (*tegra),GFP_KERNEL );
@@ -455,8 +439,6 @@ static int tegra186_timer_probe(struct platform_device *pdev)if (err <0 )return err; - irq = err; -/* create a watchdog using a preconfigured timer */ tegra->wdt =tegra186_wdt_create (tegra,0 );if (IS_ERR (tegra->wdt)) {
@@ -483,17 +465,8 @@ static int tegra186_timer_probe(struct platform_device *pdev) goto unregister_osc; } - err =devm_request_irq (dev, irq, tegra186_timer_irq,0 , -"tegra186-timer" , tegra); -if (err <0 ) { -dev_err (dev,"failed to request IRQ#%u: %d\n" , irq, err); - goto unregister_usec; - } -return 0 ; -unregister_usec: -clocksource_unregister (&tegra->usec); unregister_osc:clocksource_unregister (&tegra->osc); unregister_tsc:
Signature · 1 line
2.34.1
PATCH v4 3/3 clocksource/drivers/timer-tegra186: Remove unused bits
In reply to Robert LinFrom: robelin <[email protected]>
The intention to keep the unsed if(0) block is gone now. Remove them for clean codes.
--- drivers/clocksource/timer-tegra186.c | 9 --------- 1 file changed, 9 deletions(-)
drivers/clocksource/timer-tegra186.c +0 -9
@@ -175,15 +175,6 @@ static void tegra186_wdt_enable(struct tegra186_wdt *wdt) value &= ~WDTCR_PERIOD_MASK ; value |=WDTCR_PERIOD (1 ); -/* enable local FIQ and remote interrupt for debug dump */ -if (0 ) - value |=WDTCR_REMOTE_INT_ENABLE | -WDTCR_LOCAL_FIQ_ENABLE ; - -/* enable system debug reset (doesn't properly reboot) */ -if (0 ) - value |=WDTCR_SYSTEM_DEBUG_RESET_ENABLE ; -/* enable system POR reset */ value |=WDTCR_SYSTEM_POR_RESET_ENABLE ;
Signature · 1 line
2.34.1
Jon Hunter
maintainerQuoted 8 lines · Robert Lin
From: robelin <[email protected]>
This set of patches includes a fix for watchdog for it may not bark due to self-pinging and adds
WDIOC_GETTIMELEFTsupport.--
V4:
- Improve the precision of timeleft value
I believe you also fixed the unused variable warning too!
Jon
Quoted 21 lines
V3:
- Improve comment description
- Refactor to fit codeline within 80 columns
- Remove unused if(0) blocksV2:
- Fix a compilation error, a warning and updates copyright --Pohsun Su (2):
clocksource/drivers/timer-tegra186: addWDIOC_GETTIMELEFTsupport clocksource/drivers/timer-tegra186: fix watchdog self-pingingrobelin (1):
clocksource/drivers/timer-tegra186: Remove unused bitsdrivers/clocksource/timer-tegra186.c | 92 +++++++++++++++++----------- 1 file changed, 55 insertions(+), 37 deletions(-)
Signature · 1 line
nvpublic
Quoted 14 lines
-----Original Message-----
From: Jon Hunter <[email protected]>
Sent: Thursday, April 17, 2025 7:01 PM
To: Robert Lin <[email protected]>; [email protected]; [email protected]; [email protected]; Pohsun Su <[email protected]>
Cc: [email protected]; [email protected]; Sumit Gupta <[email protected]>
Subject: Re: [PATCH v4 0/3] clocksource: fix Tegra234 SoC Watchdog Timer.Quoted 2 lines · Robert Lin
From: robelin <[email protected]>
Quoted 9 lines
Quoted 6 lines
This set of patches includes a fix for watchdog for it may not bark due to self-pinging and adds
WDIOC_GETTIMELEFTsupport.--
V4:
- Improve the precision of timeleft valueI believe you also fixed the unused variable warning too!
Right. Sorry for missing the description. I think I can improve this in patch v5, after Thierry's comments for other fixes that I need to do.
All the best,
Robert Lin