leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

watchdog: mpc8xx_wdt: Allow selection of watchdog mode through environment

Browse Source 
The mpc8xx watchdog can work either in 'reset mode' or 'NMI mode'.
The selection can be done at startup only.
It is desirable to select the mode without rebuilding U-boot.
It is also desirable to disable the watchdog without rebuilding.

At watchdog startup, check environment variable 'watchdog_mode'.
If it is 'off', the watchdog is not started. If it is 'nmi',
the watchdog is started in NMI mode. Otherwise, it is started
in reset mode which is the default mode.

Signed-off-by: Charles Frey <charles.frey@c-s.fr>
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
This commit is contained in:
Charles Frey 2020-02-19 16:50:15 +00:00 committed by Tom Rini
parent dbfd9e0e61
commit ea8de984e5
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/watchdog/mpc8xx_wdt.c
View File

@ -4,6 +4,7 @@
*/ */
#include <common.h> #include <common.h>
#include <env.h>
#include <dm.h> #include <dm.h>
#include <wdt.h> #include <wdt.h>
#include <mpc8xx.h> #include <mpc8xx.h>
@ -21,8 +22,15 @@ void hw_watchdog_reset(void)
static int mpc8xx_wdt_start(struct udevice *dev, u64 timeout, ulong flags) static int mpc8xx_wdt_start(struct udevice *dev, u64 timeout, ulong flags)
{ {
immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR; immap_t __iomem *immap = (immap_t __iomem *)CONFIG_SYS_IMMR;
u32 val = CONFIG_SYS_SYPCR;
const char *mode = env_get("watchdog_mode");
out_be32(&immap->im_siu_conf.sc_sypcr, CONFIG_SYS_SYPCR); if (strcmp(mode, "off") == 0)
val = val & ~(SYPCR_SWE | SYPCR_SWRI);
else if (strcmp(mode, "nmi") == 0)
val = (val & ~SYPCR_SWRI) | SYPCR_SWE;
out_be32(&immap->im_siu_conf.sc_sypcr, val);
if (!(in_be32(&immap->im_siu_conf.sc_sypcr) & SYPCR_SWE)) if (!(in_be32(&immap->im_siu_conf.sc_sypcr) & SYPCR_SWE))
return -EBUSY; return -EBUSY;