[PATCH v2] kvx: watchdog: Add early watchdog init

[PATCH v2] kvx: watchdog: Add early watchdog init

[Julian Vetter]

From: Jules Maselbas <jmaselbas@kalray.eu>

Add support for a watchdog that starts as early as possible in barebox.
So, if there is an issue the board is reset properly.

Signed-off-by: Julian Vetter <jvetter@kalrayinc.com>
---
 drivers/watchdog/Kconfig   | 11 +++++++++++
 drivers/watchdog/kvx_wdt.c | 16 ++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 762e37c9c2..71bc7bf0ac 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -89,6 +89,17 @@ config WATCHDOG_KVX
 	help
 	  Add support for the KVX core watchdog.
 
+config WATCHDOG_KVX_EARLY_INIT
+	bool "KVX Core watchdog early init"
+	depends on WATCHDOG_KVX
+	help
+	  Activate the watchdog with early initcall
+
+config WATCHDOG_KVX_EARLY_TIMEOUT
+	int "KVX Core watchdog early timeout in cycles"
+	depends on WATCHDOG_KVX_EARLY_INIT
+	default 100000000
+
 config WATCHDOG_BCM2835
 	bool "Watchdog for BCM283x SoCs"
 	depends on ARCH_BCM283X || COMPILE_TEST
diff --git a/drivers/watchdog/kvx_wdt.c b/drivers/watchdog/kvx_wdt.c
index be6b08b71c..3e66aa38ba 100644
--- a/drivers/watchdog/kvx_wdt.c
+++ b/drivers/watchdog/kvx_wdt.c
@@ -91,3 +91,19 @@ static struct driver kvx_wdt_driver = {
 	.of_compatible	= DRV_OF_COMPAT(kvx_wdt_of_match),
 };
 device_platform_driver(kvx_wdt_driver);
+
+#ifdef CONFIG_WATCHDOG_KVX_EARLY_INIT
+static int kvx_wdt_early_init(void)
+{
+	/* Set Start watchdog counting */
+	kvx_sfr_set(WDV, CONFIG_WATCHDOG_KVX_EARLY_TIMEOUT);
+	kvx_sfr_set(WDR, 0);
+
+	/* Start watchdog counting */
+	kvx_sfr_set_field(TCR, WUI, 1);
+	kvx_sfr_set_field(TCR, WCE, 1);
+
+	return 0;
+}
+core_initcall(kvx_wdt_early_init);
+#endif
-- 
2.34.1

Re: [PATCH v2] kvx: watchdog: Add early watchdog init

[Ahmad Fatoum]

On 24.10.24 15:08, Julian Vetter wrote:
> From: Jules Maselbas <jmaselbas@kalray.eu>
> 
> Add support for a watchdog that starts as early as possible in barebox.
> So, if there is an issue the board is reset properly.
> 
> Signed-off-by: Julian Vetter <jvetter@kalrayinc.com>

Reviewed-by: Ahmad Fatoum <a.fatoum@pengutronix.de>

Cheers,
Ahmad

> ---
>  drivers/watchdog/Kconfig   | 11 +++++++++++
>  drivers/watchdog/kvx_wdt.c | 16 ++++++++++++++++
>  2 files changed, 27 insertions(+)
> 
> diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
> index 762e37c9c2..71bc7bf0ac 100644
> --- a/drivers/watchdog/Kconfig
> +++ b/drivers/watchdog/Kconfig
> @@ -89,6 +89,17 @@ config WATCHDOG_KVX
>  	help
>  	  Add support for the KVX core watchdog.
>  
> +config WATCHDOG_KVX_EARLY_INIT
> +	bool "KVX Core watchdog early init"
> +	depends on WATCHDOG_KVX
> +	help
> +	  Activate the watchdog with early initcall
> +
> +config WATCHDOG_KVX_EARLY_TIMEOUT
> +	int "KVX Core watchdog early timeout in cycles"
> +	depends on WATCHDOG_KVX_EARLY_INIT
> +	default 100000000
> +
>  config WATCHDOG_BCM2835
>  	bool "Watchdog for BCM283x SoCs"
>  	depends on ARCH_BCM283X || COMPILE_TEST
> diff --git a/drivers/watchdog/kvx_wdt.c b/drivers/watchdog/kvx_wdt.c
> index be6b08b71c..3e66aa38ba 100644
> --- a/drivers/watchdog/kvx_wdt.c
> +++ b/drivers/watchdog/kvx_wdt.c
> @@ -91,3 +91,19 @@ static struct driver kvx_wdt_driver = {
>  	.of_compatible	= DRV_OF_COMPAT(kvx_wdt_of_match),
>  };
>  device_platform_driver(kvx_wdt_driver);
> +
> +#ifdef CONFIG_WATCHDOG_KVX_EARLY_INIT
> +static int kvx_wdt_early_init(void)
> +{
> +	/* Set Start watchdog counting */
> +	kvx_sfr_set(WDV, CONFIG_WATCHDOG_KVX_EARLY_TIMEOUT);
> +	kvx_sfr_set(WDR, 0);
> +
> +	/* Start watchdog counting */
> +	kvx_sfr_set_field(TCR, WUI, 1);
> +	kvx_sfr_set_field(TCR, WCE, 1);
> +
> +	return 0;
> +}
> +core_initcall(kvx_wdt_early_init);
> +#endif


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH v2] kvx: watchdog: Add early watchdog init

[Sascha Hauer]

On Thu, 24 Oct 2024 15:08:03 +0200, Julian Vetter wrote:
> Add support for a watchdog that starts as early as possible in barebox.
> So, if there is an issue the board is reset properly.
> 
> 

Applied, thanks!

[1/1] kvx: watchdog: Add early watchdog init
      https://git.pengutronix.de/cgit/barebox/commit/?id=7905ac59a488 (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>