Fixes for the SAMA5D2/SAMA5D4 watchdog
Subsystems (2)
cover Fixes for the SAMA5D2/SAMA5D4 watchdog
A previous change of the sama5d4_wdt driver broke the device probing with the device tree configuration described in existing DTS files, when no value is set for the "timeout-sec" property.
Moreover, specifying any other value than 16 seconds for "timeout-sec" leads to a watchdog reset immediately when opening the watchdog device. Fix this by respecting hardware constraints added in recent versions of the SAMA5D2 and SAMA5D4 datasheet.
Romain Izard (2):
watchdog: sama5d4: fix timeout-sec usage
watchdog: sama5d4: write the mode register in two steps
drivers/watchdog/sama5d4_wdt.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 watchdog: sama5d4: fix timeout-sec usage
When using watchdog_init_timeout to update the default timeout value, an error means that there is no "timeout-sec" in the relevant device tree node.
This should not prevent binding of the driver to the device.
--- drivers/watchdog/sama5d4_wdt.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/watchdog/sama5d4_wdt.c +1 -5
@@ -247,11 +247,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) } } - ret =watchdog_init_timeout (wdd, wdt_timeout, &pdev->dev); -if (ret) { -dev_err (&pdev->dev,"unable to set timeout value\n" ); -return ret; - } +watchdog_init_timeout (wdd, wdt_timeout, &pdev->dev); timeout =WDT_SEC2TICKS (wdd->timeout);
Signature · 1 line
2.17.1
PATCH 2/2 watchdog: sama5d4: write the mode register in two steps
In reply to Romain IzardThe specification for SAMA5D2 and SAMA5D4 chips, that use this IP for their watchdog timer, has the following advice regarding the Mode Register:
"When setting the WDDIS bit, and while it is set, the fields WDV and WDD must not be modified."
I have observed on a board based on a SAMA5D2 chip that using any other timeout duration than the default 16s in the device tree will reset the board when the watchdog device is opened; this is probably due to ignoring the aforementioned constraint.
To fix this, read the content of the Mode Register before writing it, and split the access into two parts if WDV or WDD need to be changed.
--- drivers/watchdog/sama5d4_wdt.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
drivers/watchdog/sama5d4_wdt.c +20 -7
@@ -46,7 +46,10 @@ MODULE_PARM_DESC(nowayout,"Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); -#define wdt_enabled (!(wdt->mr & AT91_WDT_WDDIS)) +#define wdt_enabled (reg) (!((reg) & AT91_WDT_WDDIS)) + +#define wdt_different_counters (reg_a, reg_b) \ + (((reg_a) ^ (reg_b)) & (AT91_WDT_WDV | AT91_WDT_WDD))#define wdt_read (wdt, field) \ readl_relaxed((wdt)->reg_base + (field))
@@ -78,8 +81,11 @@ static void wdt_write_nosleep(struct sama5d4_wdt *wdt, u32 field, u32 val)static int sama5d4_wdt_start (struct watchdog_device *wdd) {struct sama5d4_wdt *wdt =watchdog_get_drvdata (wdd); +u32 reg =wdt_read (wdt,AT91_WDT_MR ); wdt->mr &= ~AT91_WDT_WDDIS ; +if (!wdt_enabled (reg) &&wdt_different_counters (reg, wdt->mr)) +wdt_write (wdt,AT91_WDT_MR , reg & ~AT91_WDT_WDDIS );wdt_write (wdt,AT91_WDT_MR , wdt->mr);return 0 ;
@@ -88,8 +94,11 @@ static int sama5d4_wdt_start(struct watchdog_device *wdd)static int sama5d4_wdt_stop (struct watchdog_device *wdd) {struct sama5d4_wdt *wdt =watchdog_get_drvdata (wdd); +u32 reg =wdt_read (wdt,AT91_WDT_MR ); wdt->mr |=AT91_WDT_WDDIS ; +if (wdt_enabled (reg) &&wdt_different_counters (reg, wdt->mr)) +wdt_write (wdt,AT91_WDT_MR , wdt->mr & ~AT91_WDT_WDDIS );wdt_write (wdt,AT91_WDT_MR , wdt->mr);return 0 ;
@@ -122,7 +131,7 @@ static int sama5d4_wdt_set_timeout(struct watchdog_device *wdd,* If the watchdog is enabled, then the timeout can be updated. Else, * wait that the user enables it. */ -if (wdt_enabled) +if (wdt_enabled (wdt->mr))wdt_write (wdt,AT91_WDT_MR , wdt->mr & ~AT91_WDT_WDDIS ); wdd->timeout = timeout;
@@ -186,13 +195,17 @@ static int sama5d4_wdt_init(struct sama5d4_wdt *wdt)* If the watchdog is already running, we can safely update it. * Else, we have to disable it properly. */ -if (wdt_enabled) { + reg =wdt_read (wdt,AT91_WDT_MR ); +if (wdt_enabled (reg)) { +if (!wdt_enabled (wdt->mr)) +wdt_write_nosleep (wdt,AT91_WDT_MR , + wdt->mr & ~AT91_WDT_WDDIS );wdt_write_nosleep (wdt,AT91_WDT_MR , wdt->mr); - }else { - reg =wdt_read (wdt,AT91_WDT_MR ); -if (!(reg &AT91_WDT_WDDIS )) + }else if (wdt_enabled (wdt->mr)) { +if (wdt_different_counters (reg, wdt->mr))wdt_write_nosleep (wdt,AT91_WDT_MR , - reg |AT91_WDT_WDDIS ); + reg & ~AT91_WDT_WDDIS ); +wdt_write_nosleep (wdt,AT91_WDT_MR , wdt->mr); }return 0 ; }
Signature · 1 line
2.17.1
Alexandre Belloni
maintainerRe: [PATCH 2/2] watchdog: sama5d4: write the mode register in two steps
Quoted 6 lines · Romain Izard
The specification for SAMA5D2 and SAMA5D4 chips, that use this IP for their watchdog timer, has the following advice regarding the Mode Register:
"When setting the WDDIS bit, and while it is set, the fields WDV and WDD must not be modified."
Quoted 8 lines
I have observed on a board based on a SAMA5D2 chip that using any other timeout duration than the default 16s in the device tree will reset the board when the watchdog device is opened; this is probably due to ignoring the aforementioned constraint.
To fix this, read the content of the Mode Register before writing it, and split the access into two parts if WDV or WDD need to be changed.
Hum, that is really weird because when I developed 015b528644a84b0018d3286ecd6ea5f82dce0180, I tested with a program doing:
flags = WDIOS_DISABLECARD;
ioctl(fd, WDIOC_SETOPTIONS, &flags);
for (i = 16; i > 2; i--) {
ioctl(fd, WDIOC_SETTIMEOUT, &i);
}
ioctl(fd, WDIOC_KEEPALIVE, &dummy);
flags = WDIOS_ENABLECARD;
ioctl(fd, WDIOC_SETOPTIONS, &flags);
for (i = 16; i > 2; i--) {
ioctl(fd, WDIOC_SETTIMEOUT, &i);
}This would immediately reproduce the reset when changing WDV/WDD with WDDIS set.
I'll test again.
Quoted 80 lines
Signed-off-by Romain Izard <[email protected]>--- drivers/watchdog/sama5d4_wdt.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)drivers/watchdog/sama5d4_wdt.c +20
-7@@ -46,7 +46,10 @@ MODULE_PARM_DESC(nowayout,"Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); -#define wdt_enabled (!(wdt->mr & AT91_WDT_WDDIS)) +#define wdt_enabled (reg) (!((reg) & AT91_WDT_WDDIS)) + +#define wdt_different_counters (reg_a, reg_b) \ + (((reg_a) ^ (reg_b)) & (AT91_WDT_WDV | AT91_WDT_WDD))#define wdt_read (wdt, field) \ readl_relaxed((wdt)->reg_base + (field))@@ -78,8 +81,11 @@ static void wdt_write_nosleep(struct sama5d4_wdt *wdt, u32 field, u32 val)static int sama5d4_wdt_start (struct watchdog_device *wdd) {struct sama5d4_wdt *wdt =watchdog_get_drvdata (wdd); +u32 reg =wdt_read (wdt,AT91_WDT_MR ); wdt->mr &= ~AT91_WDT_WDDIS ; +if (!wdt_enabled (reg) &&wdt_different_counters (reg, wdt->mr)) +wdt_write (wdt,AT91_WDT_MR , reg & ~AT91_WDT_WDDIS );wdt_write (wdt,AT91_WDT_MR , wdt->mr);return 0 ;@@ -88,8 +94,11 @@ static int sama5d4_wdt_start(struct watchdog_device *wdd)static int sama5d4_wdt_stop (struct watchdog_device *wdd) {struct sama5d4_wdt *wdt =watchdog_get_drvdata (wdd); +u32 reg =wdt_read (wdt,AT91_WDT_MR ); wdt->mr |=AT91_WDT_WDDIS ; +if (wdt_enabled (reg) &&wdt_different_counters (reg, wdt->mr)) +wdt_write (wdt,AT91_WDT_MR , wdt->mr & ~AT91_WDT_WDDIS );wdt_write (wdt,AT91_WDT_MR , wdt->mr);return 0 ;@@ -122,7 +131,7 @@ static int sama5d4_wdt_set_timeout(struct watchdog_device *wdd,* If the watchdog is enabled, then the timeout can be updated. Else, * wait that the user enables it. */ -if (wdt_enabled) +if (wdt_enabled (wdt->mr))wdt_write (wdt,AT91_WDT_MR , wdt->mr & ~AT91_WDT_WDDIS ); wdd->timeout = timeout;@@ -186,13 +195,17 @@ static int sama5d4_wdt_init(struct sama5d4_wdt *wdt)* If the watchdog is already running, we can safely update it. * Else, we have to disable it properly. */ -if (wdt_enabled) { + reg =wdt_read (wdt,AT91_WDT_MR ); +if (wdt_enabled (reg)) { +if (!wdt_enabled (wdt->mr)) +wdt_write_nosleep (wdt,AT91_WDT_MR , + wdt->mr & ~AT91_WDT_WDDIS );wdt_write_nosleep (wdt,AT91_WDT_MR , wdt->mr); - }else { - reg =wdt_read (wdt,AT91_WDT_MR ); -if (!(reg &AT91_WDT_WDDIS )) + }else if (wdt_enabled (wdt->mr)) { +if (wdt_different_counters (reg, wdt->mr))wdt_write_nosleep (wdt,AT91_WDT_MR , - reg |AT91_WDT_WDDIS ); + reg & ~AT91_WDT_WDDIS ); +wdt_write_nosleep (wdt,AT91_WDT_MR , wdt->mr); }return 0 ; }Signature · 1 line
2.17.1
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [PATCH 1/2] watchdog: sama5d4: fix timeout-sec usage
In reply to Romain IzardQuoted 8 lines · Romain Izard
When using
watchdog_init_timeoutto update the default timeout value, an error means that there is no "timeout-sec" in the relevant device tree node.This should not prevent binding of the driver to the device.
Fixes 976932e40036 ("watchdog: sama5d4: make use of timeout-secs provided in devicetree")Signed-off-by Romain Izard <[email protected]>
Quoted 22 lines
--- drivers/watchdog/sama5d4_wdt.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)drivers/watchdog/sama5d4_wdt.c +1
-5@@ -247,11 +247,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) } } - ret =watchdog_init_timeout (wdd, wdt_timeout, &pdev->dev); -if (ret) { -dev_err (&pdev->dev,"unable to set timeout value\n" ); -return ret; - } +watchdog_init_timeout (wdd, wdt_timeout, &pdev->dev); timeout =WDT_SEC2TICKS (wdd->timeout);
Guenter Roeck
maintainerRe: [PATCH 2/2] watchdog: sama5d4: write the mode register in two steps
In reply to Romain IzardQuoted 11 lines · Romain Izard
The specification for SAMA5D2 and SAMA5D4 chips, that use this IP for their watchdog timer, has the following advice regarding the Mode Register:
"When setting the WDDIS bit, and while it is set, the fields WDV and WDD must not be modified."
I have observed on a board based on a SAMA5D2 chip that using any other timeout duration than the default 16s in the device tree will reset the board when the watchdog device is opened; this is probably due to ignoring the aforementioned constraint.
Quoted 4 lines
To fix this, read the content of the Mode Register before writing it, and split the access into two parts if WDV or WDD need to be changed.
Signed-off-by Romain Izard <[email protected]>
That code now looks terribly complicated. Assuming it is indeed necessary, would it be possible to update the affected register in its own function ?
Guenter
Quoted 79 lines
--- drivers/watchdog/sama5d4_wdt.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)drivers/watchdog/sama5d4_wdt.c +20
-7@@ -46,7 +46,10 @@ MODULE_PARM_DESC(nowayout,"Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); -#define wdt_enabled (!(wdt->mr & AT91_WDT_WDDIS)) +#define wdt_enabled (reg) (!((reg) & AT91_WDT_WDDIS)) + +#define wdt_different_counters (reg_a, reg_b) \ + (((reg_a) ^ (reg_b)) & (AT91_WDT_WDV | AT91_WDT_WDD))#define wdt_read (wdt, field) \ readl_relaxed((wdt)->reg_base + (field))@@ -78,8 +81,11 @@ static void wdt_write_nosleep(struct sama5d4_wdt *wdt, u32 field, u32 val)static int sama5d4_wdt_start (struct watchdog_device *wdd) {struct sama5d4_wdt *wdt =watchdog_get_drvdata (wdd); +u32 reg =wdt_read (wdt,AT91_WDT_MR ); wdt->mr &= ~AT91_WDT_WDDIS ; +if (!wdt_enabled (reg) &&wdt_different_counters (reg, wdt->mr)) +wdt_write (wdt,AT91_WDT_MR , reg & ~AT91_WDT_WDDIS );wdt_write (wdt,AT91_WDT_MR , wdt->mr);return 0 ;@@ -88,8 +94,11 @@ static int sama5d4_wdt_start(struct watchdog_device *wdd)static int sama5d4_wdt_stop (struct watchdog_device *wdd) {struct sama5d4_wdt *wdt =watchdog_get_drvdata (wdd); +u32 reg =wdt_read (wdt,AT91_WDT_MR ); wdt->mr |=AT91_WDT_WDDIS ; +if (wdt_enabled (reg) &&wdt_different_counters (reg, wdt->mr)) +wdt_write (wdt,AT91_WDT_MR , wdt->mr & ~AT91_WDT_WDDIS );wdt_write (wdt,AT91_WDT_MR , wdt->mr);return 0 ;@@ -122,7 +131,7 @@ static int sama5d4_wdt_set_timeout(struct watchdog_device *wdd,* If the watchdog is enabled, then the timeout can be updated. Else, * wait that the user enables it. */ -if (wdt_enabled) +if (wdt_enabled (wdt->mr))wdt_write (wdt,AT91_WDT_MR , wdt->mr & ~AT91_WDT_WDDIS ); wdd->timeout = timeout;@@ -186,13 +195,17 @@ static int sama5d4_wdt_init(struct sama5d4_wdt *wdt)* If the watchdog is already running, we can safely update it. * Else, we have to disable it properly. */ -if (wdt_enabled) { + reg =wdt_read (wdt,AT91_WDT_MR ); +if (wdt_enabled (reg)) { +if (!wdt_enabled (wdt->mr)) +wdt_write_nosleep (wdt,AT91_WDT_MR , + wdt->mr & ~AT91_WDT_WDDIS );wdt_write_nosleep (wdt,AT91_WDT_MR , wdt->mr); - }else { - reg =wdt_read (wdt,AT91_WDT_MR ); -if (!(reg &AT91_WDT_WDDIS )) + }else if (wdt_enabled (wdt->mr)) { +if (wdt_different_counters (reg, wdt->mr))wdt_write_nosleep (wdt,AT91_WDT_MR , - reg |AT91_WDT_WDDIS ); + reg & ~AT91_WDT_WDDIS ); +wdt_write_nosleep (wdt,AT91_WDT_MR , wdt->mr); }return 0 ; }Signature · 1 line
2.17.1
Re: [PATCH 1/2] watchdog: sama5d4: fix timeout-sec usage
In reply to Romain IzardQuoted 8 lines · Romain Izard
When using
watchdog_init_timeoutto update the default timeout value, an error means that there is no "timeout-sec" in the relevant device tree node.This should not prevent binding of the driver to the device.
Fixes 976932e40036 ("watchdog: sama5d4: make use of timeout-secs provided in devicetree")Signed-off-by Romain Izard <[email protected]>
Re: [PATCH 2/2] watchdog: sama5d4: write the mode register in two steps
In reply to Alexandre Belloni2018-09-14 12:27 GMT+02:00 Alexandre Belloni <[email protected]>:
Quoted 34 lines · Romain Izard
Quoted 6 lines
The specification for SAMA5D2 and SAMA5D4 chips, that use this IP for their watchdog timer, has the following advice regarding the Mode Register:
"When setting the WDDIS bit, and while it is set, the fields WDV and WDD must not be modified."
Quoted 8 lines
I have observed on a board based on a SAMA5D2 chip that using any other timeout duration than the default 16s in the device tree will reset the board when the watchdog device is opened; this is probably due to ignoring the aforementioned constraint.
To fix this, read the content of the Mode Register before writing it, and split the access into two parts if WDV or WDD need to be changed.
Hum, that is really weird because when I developed
015b528644a84b0018d3286ecd6ea5f82dce0180, I tested with a program doing:flags = WDIOS_DISABLECARD; ioctl(fd, WDIOC_SETOPTIONS, &flags); for (i = 16; i > 2; i--) { ioctl(fd, WDIOC_SETTIMEOUT, &i); } ioctl(fd, WDIOC_KEEPALIVE, &dummy); flags = WDIOS_ENABLECARD; ioctl(fd, WDIOC_SETOPTIONS, &flags); for (i = 16; i > 2; i--) { ioctl(fd, WDIOC_SETTIMEOUT, &i); }
Quoted 5 lines
This would immediately reproduce the reset when changing WDV/WDD with WDDIS set.
I'll test again.
The issue is visible when setting a custom value for the timeout on startup. In the past it was only possible to do so with a module parameter, and the previous patch in the series makes it possible to do with the device tree.
When using the Linux4SAM 5.7 release, it is sufficient to set the timeout on the command line to reproduce the issue:
In the bootloader:
# setenv bootargs $bootargs sama5d4_wdt.wdt_timeout=10
To trigger an immediate reset (with some code that should work):
# (echo 1; while sleep 3; do echo 1; done) > /dev/watchdog
Best regards,
Signature · 1 line
Romain Izard
Alexandre Belloni
maintainerRe: [PATCH 2/2] watchdog: sama5d4: write the mode register in two steps
Quoted 45 lines · Romain Izard
2018-09-14 12:27 GMT+02:00 Alexandre Belloni <[email protected]>:
Quoted 34 lines · Romain Izard
Quoted 6 lines
The specification for SAMA5D2 and SAMA5D4 chips, that use this IP for their watchdog timer, has the following advice regarding the Mode Register:
"When setting the WDDIS bit, and while it is set, the fields WDV and WDD must not be modified."
Quoted 8 lines
I have observed on a board based on a SAMA5D2 chip that using any other timeout duration than the default 16s in the device tree will reset the board when the watchdog device is opened; this is probably due to ignoring the aforementioned constraint.
To fix this, read the content of the Mode Register before writing it, and split the access into two parts if WDV or WDD need to be changed.
Hum, that is really weird because when I developed
015b528644a84b0018d3286ecd6ea5f82dce0180, I tested with a program doing:flags = WDIOS_DISABLECARD; ioctl(fd, WDIOC_SETOPTIONS, &flags); for (i = 16; i > 2; i--) { ioctl(fd, WDIOC_SETTIMEOUT, &i); } ioctl(fd, WDIOC_KEEPALIVE, &dummy); flags = WDIOS_ENABLECARD; ioctl(fd, WDIOC_SETOPTIONS, &flags); for (i = 16; i > 2; i--) { ioctl(fd, WDIOC_SETTIMEOUT, &i); }Quoted 5 lines
This would immediately reproduce the reset when changing WDV/WDD with WDDIS set.
I'll test again.
The issue is visible when setting a custom value for the timeout on startup. In the past it was only possible to do so with a module parameter, and the previous patch in the series makes it possible to do with the device tree.
Quoted 9 lines
When using the Linux4SAM 5.7 release, it is sufficient to set the timeout on the command line to reproduce the issue:
In the bootloader:
# setenv bootargs $bootargs sama5d4_wdt.wdt_timeout=10To trigger an immediate reset (with some code that should work):
# (echo 1; while sleep 3; do echo 1; done) >/dev/watchdog
Ok, I've tested and seen the issue. I agree with Guenter that it is probably worth having a function to update MR that takes the timeout value and whether the watchdog needs to be enabled. It would probably make caching mr unnecessary.
Signature · 3 lines
Alexandre Belloni, Bootlin Embedded Linux and Kernel engineering https://bootlin.com