linux-kernel - Re: [PATCH v2 2/2] watchdog: loongson1

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <89b3c1c9-025f-4157-ba99-af3a7097ae85@roeck-us.net>
Date:   Sun, 16 Apr 2023 09:16:40 -0700
From:   Guenter Roeck <linux@...ck-us.net>
To:     Keguang Zhang <keguang.zhang@...il.com>
Cc:     linux-watchdog@...r.kernel.org, linux-mips@...r.kernel.org,
        linux-kernel@...r.kernel.org,
        Wim Van Sebroeck <wim@...ux-watchdog.org>,
        Thomas Bogendoerfer <tsbogend@...ha.franken.de>,
        Yang Ling <gnaygnil@...il.com>
Subject: Re: [PATCH v2 2/2] watchdog: loongson1_wdt: Implement restart handler

On Thu, Mar 30, 2023 at 07:20:51PM +0800, Keguang Zhang wrote:
> Implement restart handler for the Loongson-1 watchdog driver and
> define the watchdog registers instead of including the legacy header.
> 
> Signed-off-by: Keguang Zhang <keguang.zhang@...il.com>

Reviewed-by: Guenter Roeck <linux@...ck-us.net>

> ---
> V1 -> V2: None
> ---
>  drivers/watchdog/loongson1_wdt.c | 19 ++++++++++++++++++-
>  1 file changed, 18 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/watchdog/loongson1_wdt.c b/drivers/watchdog/loongson1_wdt.c
> index bb3d075c0633..a0b6fe62e516 100644
> --- a/drivers/watchdog/loongson1_wdt.c
> +++ b/drivers/watchdog/loongson1_wdt.c
> @@ -7,7 +7,11 @@
>  #include <linux/module.h>
>  #include <linux/platform_device.h>
>  #include <linux/watchdog.h>
> -#include <loongson1.h>
> +
> +/* Loongson 1 Watchdog Register Definitions */
> +#define WDT_EN			0x0
> +#define WDT_TIMER		0x4
> +#define WDT_SET			0x8
>  
>  #define DEFAULT_HEARTBEAT	30
>  
> @@ -66,6 +70,18 @@ static int ls1x_wdt_stop(struct watchdog_device *wdt_dev)
>  	return 0;
>  }
>  
> +static int ls1x_wdt_restart(struct watchdog_device *wdt_dev,
> +			    unsigned long action, void *data)
> +{
> +	struct ls1x_wdt_drvdata *drvdata = watchdog_get_drvdata(wdt_dev);
> +
> +	writel(0x1, drvdata->base + WDT_EN);
> +	writel(0x1, drvdata->base + WDT_TIMER);
> +	writel(0x1, drvdata->base + WDT_SET);
> +
> +	return 0;
> +}
> +
>  static const struct watchdog_info ls1x_wdt_info = {
>  	.options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE,
>  	.identity = "Loongson1 Watchdog",
> @@ -77,6 +93,7 @@ static const struct watchdog_ops ls1x_wdt_ops = {
>  	.stop = ls1x_wdt_stop,
>  	.ping = ls1x_wdt_ping,
>  	.set_timeout = ls1x_wdt_set_timeout,
> +	.restart = ls1x_wdt_restart,
>  };
>  
>  static void ls1x_clk_disable_unprepare(void *data)