driver: watchdog: reset watchdog in designware_wdt_stop() function
PATCH v4 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.
---
v4:
Remove the unauthorized signature.
v3:
Add the resets to designware_wdt_priv and initialize it in probe(). v2:
Change "#if CONFIG_IS_ENABLED(DM_RESET)" into
"if (CONFIG_IS_ENABLED(DM_RESET)) {", and define the variable into if condition sentence.
--- drivers/watchdog/designware_wdt.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-)
drivers/watchdog/designware_wdt.c +15 -4
@@ -23,6 +23,7 @@struct designware_wdt_priv {void __iomem *base;unsigned int clk_khz; +struct reset_ctl_bulk *resets; };/*
@@ -96,6 +97,18 @@ static int designware_wdt_stop(struct udevice *dev)designware_wdt_reset (dev);writel (0 , priv->base +DW_WDT_CR ); +if (CONFIG_IS_ENABLED (DM_RESET )) { +int ret; + + ret =reset_assert_bulk (priv->resets); +if (ret) +return ret; + + ret =reset_deassert_bulk (priv->resets); +if (ret) +return ret; + } +return 0 ; }
@@ -143,13 +143,11 @@ static int designware_wdt_probe(struct udevice *dev)#endif if (CONFIG_IS_ENABLED (DM_RESET )) { -struct reset_ctl_bulk resets; - - ret =reset_get_bulk (dev, &resets); + ret =reset_get_bulk (dev, priv->resets);if (ret) goto err; - ret =reset_deassert_bulk (&resets); + ret = reset_deassert_bulk((priv->resets);if (ret) goto err; }
Signature · 1 line
2.17.1
PATCH v4 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_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y
Signature · 1 line
2.17.1
Re: [PATCH v4,2/2] driver: watchdog: enable wdt command by default
Quoted 15 lines · On 11.05.21 09:35, [email protected] wrote:
From: MengLi <[email protected]>
In latest u-boot code, watchdog feature is implemented, so enable wdt command by default.
Signed-off-by Meng Li <[email protected]>--- configs/socfpga_stratix10_defconfig | 1 + 1 file changed, 1 insertion(+)configs/socfpga_stratix10_defconfig +0
-0
configs/socfpga_stratix10_defconfig CONFIG_CMD_CACHE=y · line 43
Quoted 4 lines
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
This patch is not really a "watchdog" patch. Please change the commit subject line to something like this:
arm: socfpga: socfpga_stratix10: Enable watchdog command
Thanks,
Stefan
Quoted 59 lines · On 11.05.21 09:35, [email protected] wrote:
From: MengLi <[email protected]>
In uboot command line environment, watchdog is not able to be stopped with below commands:
SOCFPGA_STRATIX10# wdt dev watchdog@ffd00200SOCFPGA_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]>Reviewed-by Stefan Roese <[email protected]>---
v4:
Remove the unauthorized signature.
v3:
Add the resets todesignware_wdt_privand initialize it inprobe(). v2:
Change "#ifCONFIG_IS_ENABLED(DM_RESET)" into
"if (CONFIG_IS_ENABLED(DM_RESET)) {", and define the variable into if condition sentence.--- drivers/watchdog/designware_wdt.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-)drivers/watchdog/designware_wdt.c +13
-0@@ -23,6 +23,7 @@struct designware_wdt_priv {void __iomem *base;unsigned int clk_khz; +struct reset_ctl_bulk *resets; };/* @@ -96,6 +97,18 @@ static int designware_wdt_stop(struct udevice *dev)designware_wdt_reset (dev);writel (0 , priv->base +DW_WDT_CR ); +if (CONFIG_IS_ENABLED (DM_RESET )) { +int ret; + + ret =reset_assert_bulk (priv->resets); +if (ret) +return ret; + + ret =reset_deassert_bulk (priv->resets); +if (ret) +return ret; + } +return 0 ; }@@ -143,13 +143,11 @@ static int designware_wdt_probe(struct udevice *dev)#endif
drivers/watchdog/designware_wdt.c static int designware_wdt_probe(struct udevice *dev) · line 150
Quoted 10 lines
drivers/watchdog/designware_wdt.c +2
-4if (CONFIG_IS_ENABLED (DM_RESET )) { -struct reset_ctl_bulk resets; - - ret =reset_get_bulk (dev, &resets); + ret =reset_get_bulk (dev, priv->resets);if (ret) goto err; - ret =reset_deassert_bulk (&resets); + ret = reset_deassert_bulk((priv->resets);
Please see the double open "(" and the single closing ")" above!
Did you ever at least build-test this? Please send a fixed and also *tested* v5.
Thanks,
Stefan