driver: watchdog: reset watchdog in designware_wdt_stop() function
PATCH v5 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@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.
---
v5:
fix build issue, and verify this patch with latest upstream u-boot. 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 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/watchdog/designware_wdt.c +15 -4
@@ -22,6 +22,7 @@struct designware_wdt_priv {void __iomem *base;unsigned int clk_khz; +struct reset_ctl_bulk *resets; };/*
@@ -95,6 +96,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 +156,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 v5 2/2 arm: socfpga: socfpga_stratix10: enable wdt command by default
From: MengLi <[email protected]>
In latest u-boot code, watchdog feature is implemented, so enable wdt command by default.
---
v2:
Change the title of this patch
--- configs/socfpga_stratix10_defconfig | 1 + 1 file changed, 1 insertion(+)
configs/socfpga_stratix10_defconfig +1 -0
@@ -39,6 +39,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 v5,2/2] arm: socfpga: socfpga_stratix10: enable wdt command by default
Quoted 6 lines · On 24.05.21 04:22, [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]>
Applied to u-boot-marvell/master
Thanks,
Stefan
Quoted 13 lines
---
v2:
Change the title of this patch--- 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 45
Quoted 7 lines
configs/socfpga_stratix10_defconfig +1
-0@@ -39,6 +39,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
Viele Grüße,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]
Quoted 65 lines · On 5/23/21 10:22 PM, [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]>---
v5:
fix build issue, and verify this patch with latest upstream u-boot. 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 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)drivers/watchdog/designware_wdt.c +13
-2@@ -22,6 +22,7 @@struct designware_wdt_priv {void __iomem *base;unsigned int clk_khz; +struct reset_ctl_bulk *resets; };/* @@ -95,6 +96,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 +156,11 @@ static int designware_wdt_probe(struct udevice *dev)#endif if (CONFIG_IS_ENABLED (DM_RESET )) { -struct reset_ctl_bulk resets; -
drivers/watchdog/designware_wdt.c static int designware_wdt_probe(struct udevice *dev) · line 166
Quoted 10 lines
drivers/watchdog/designware_wdt.c +2
-2- 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; }
Quoted 11 lines · On 24.05.21 04:22, [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]>
Applied to u-boot-marvell/master
Thanks,
Stefan
Quoted 53 lines
---
v5:
fix build issue, and verify this patch with latest upstream u-boot. 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 | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)drivers/watchdog/designware_wdt.c +13
-2@@ -22,6 +22,7 @@struct designware_wdt_priv {void __iomem *base;unsigned int clk_khz; +struct reset_ctl_bulk *resets; };/* @@ -95,6 +96,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 +156,11 @@ static int designware_wdt_probe(struct udevice *dev)#endif if (CONFIG_IS_ENABLED (DM_RESET )) { -struct reset_ctl_bulk resets; -
drivers/watchdog/designware_wdt.c static int designware_wdt_probe(struct udevice *dev) · line 166
Quoted 10 lines
drivers/watchdog/designware_wdt.c +2
-2- 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; }
Viele Grüße,
Stefan
Signature · 3 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]