driver: watchdog: reset watchdog in designware_wdt_stop() function
PATCH 1/2 driver: watchdog: reset watchdog in designware_wdt_stop() function
From: MengLi <[email protected]>
In uboot command line environment, watchdog is not able to be stopped with below commands:SOCFPGA_STRATIX10 # wdt dev watchdog at ffd00200 SOCFPGA_STRATIX10 # wdt stop
Refer to watchdog driver in linux kernel, it is also need to reset watchdog after disable it so that the disable action takes effect.
--- drivers/watchdog/designware_wdt.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
drivers/watchdog/designware_wdt.c +17 -0
@@ -92,10 +92,27 @@ static int designware_wdt_reset(struct udevice *dev)static int designware_wdt_stop (struct udevice *dev) {struct designware_wdt_priv *priv =dev_get_priv (dev); +__maybe_unused int ret;designware_wdt_reset (dev);writel (0 , priv->base +DW_WDT_CR ); +#if CONFIG_IS_ENABLED (DM_RESET ) +struct reset_ctl_bulk resets; + + ret =reset_get_bulk (dev, &resets); +if (ret) +return ret; + + ret =reset_assert_bulk (&resets); +if (ret) +return ret; + + ret =reset_deassert_bulk (&resets); +if (ret) +return ret; +#endif +return 0 ; }
Signature · 1 line
2.17.1
PATCH 2/2 driver: watchdog: enable wdt command by default
From: MengLi <[email protected]>
In latest u-boot code, watchdog feature is implemented, so enable wdt command by default.
--- configs/socfpga_stratix10_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/socfpga_stratix10_defconfig +1 -0
@@ -40,6 +40,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_WDT=y CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
Signature · 1 line
2.17.1
PATCH 1/2 driver: watchdog: reset watchdog in designware_wdt_stop() function
In reply to Meng.Li at windriver.comQuoted 19 lines · Meng.Li at windriver.com
From: MengLi <[email protected]>
In uboot command line environment, watchdog is not able to be stopped with below commands:
SOCFPGA_STRATIX10# wdt dev watchdog atffd00200SOCFPGA_STRATIX10# wdt stop
Refer to watchdog driver in linux kernel, it is also need to reset watchdog after disable it so that the disable action takes effect.Signed-off-by Meng Li <[email protected]>--- drivers/watchdog/designware_wdt.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)drivers/watchdog/designware_wdt.c +0
-0
drivers/watchdog/designware_wdt.c static int designware_wdt_reset(struct udevice *dev) · line 95
Quoted 4 lines
drivers/watchdog/designware_wdt.c +1
-0@@ -92,10 +92,27 @@ static int designware_wdt_reset(struct udevice *dev)static int designware_wdt_stop (struct udevice *dev) {struct designware_wdt_priv *priv =dev_get_priv (dev); +__maybe_unused int ret;
You add "ret" here as "__maybe_unused" and ...
drivers/watchdog/designware_wdt.c static int designware_wdt_reset(struct udevice *dev) · line 101
Quoted 6 lines
drivers/watchdog/designware_wdt.c +2
-0designware_wdt_reset (dev);writel (0 , priv->base +DW_WDT_CR ); +#if CONFIG_IS_ENABLED (DM_RESET ) +struct reset_ctl_bulk resets;
... here this struct. Please add both above as __maybe_unsed. I assume that checkpatch and other tools will complain about variable declarations in the code path.
BTW: It should be possible to change the above #if CONFIG_ to this
if (CONFIG_IS_ENABLED(DM_RESET)) {Then you can put both variable declarations in here:
if (CONFIG_IS_ENABLED(DM_RESET)) {
struct reset_ctl_bulk resets;
int ret;Please check if this works and resubmit.
Thanks,
Stefan
Quoted 18 lines
drivers/watchdog/designware_wdt.c +14
-0+ + ret =reset_get_bulk (dev, &resets); +if (ret) +return ret; + + ret =reset_assert_bulk (&resets); +if (ret) +return ret; + + ret =reset_deassert_bulk (&resets); +if (ret) +return ret; +#endif +return 0 ; }