From: linux@roeck-us.net (Guenter Roeck)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 09/11] watchdog: s3c2410: add restart handler
Date: Tue, 19 Aug 2014 17:45:36 -0700 [thread overview]
Message-ID: <1408495538-27480-10-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1408495538-27480-1-git-send-email-linux@roeck-us.net>
From: Heiko St?bner <heiko@sntech.de>
On a lot of Samsung systems the watchdog is responsible for restarting the
system and until now this code was contained in plat-samsung/watchdog-reset.c.
With the introduction of the restart handlers, this code can now move into
driver itself, removing the need for arch-specific code.
Tested on a S3C2442 based GTA02
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
v7: Added patch to series.
drivers/watchdog/s3c2410_wdt.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 7c6ccd0..2955aef 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/drivers/watchdog/s3c2410_wdt.c
@@ -41,6 +41,8 @@
#include <linux/of.h>
#include <linux/mfd/syscon.h>
#include <linux/regmap.h>
+#include <linux/reboot.h>
+#include <linux/delay.h>
#define S3C2410_WTCON 0x00
#define S3C2410_WTDAT 0x04
@@ -128,6 +130,7 @@ struct s3c2410_wdt {
unsigned long wtdat_save;
struct watchdog_device wdt_device;
struct notifier_block freq_transition;
+ struct notifier_block restart_handler;
struct s3c2410_wdt_variant *drv_data;
struct regmap *pmureg;
};
@@ -438,6 +441,31 @@ static inline void s3c2410wdt_cpufreq_deregister(struct s3c2410_wdt *wdt)
}
#endif
+static int s3c2410wdt_restart(struct notifier_block *this,
+ unsigned long mode, void *cmd)
+{
+ struct s3c2410_wdt *wdt = container_of(this, struct s3c2410_wdt,
+ restart_handler);
+ void __iomem *wdt_base = wdt->reg_base;
+
+ /* disable watchdog, to be safe */
+ writel(0, wdt_base + S3C2410_WTCON);
+
+ /* put initial values into count and data */
+ writel(0x80, wdt_base + S3C2410_WTCNT);
+ writel(0x80, wdt_base + S3C2410_WTDAT);
+
+ /* set the watchdog to go and reset... */
+ writel(S3C2410_WTCON_ENABLE | S3C2410_WTCON_DIV16 |
+ S3C2410_WTCON_RSTEN | S3C2410_WTCON_PRESCALE(0x20),
+ wdt_base + S3C2410_WTCON);
+
+ /* wait for reset to assert... */
+ mdelay(500);
+
+ return NOTIFY_DONE;
+}
+
static inline unsigned int s3c2410wdt_get_bootstatus(struct s3c2410_wdt *wdt)
{
unsigned int rst_stat;
@@ -592,6 +620,12 @@ static int s3c2410wdt_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, wdt);
+ wdt->restart_handler.notifier_call = s3c2410wdt_restart;
+ wdt->restart_handler.priority = 128;
+ ret = register_restart_handler(&wdt->restart_handler);
+ if (ret)
+ pr_err("cannot register restart handler, %d\n", ret);
+
/* print out a statement of readiness */
wtcon = readl(wdt->reg_base + S3C2410_WTCON);
@@ -621,6 +655,8 @@ static int s3c2410wdt_remove(struct platform_device *dev)
int ret;
struct s3c2410_wdt *wdt = platform_get_drvdata(dev);
+ unregister_restart_handler(&wdt->restart_handler);
+
ret = s3c2410wdt_mask_and_disable_reset(wdt, true);
if (ret < 0)
return ret;
--
1.9.1
next prev parent reply other threads:[~2014-08-20 0:45 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-20 0:45 [PATCH v7 00/11] kernel: Add support for restart handler call chain Guenter Roeck
2014-08-20 0:45 ` [PATCH v7 01/11] kernel: Add support for kernel " Guenter Roeck
2014-08-21 4:08 ` Doug Anderson
2014-08-20 0:45 ` [PATCH v7 02/11] power/restart: Call machine_restart instead of arm_pm_restart Guenter Roeck
2014-08-21 4:10 ` Doug Anderson
2014-08-21 4:42 ` Guenter Roeck
2014-08-21 19:30 ` Doug Anderson
2014-08-21 20:11 ` Guenter Roeck
2014-08-21 20:39 ` Sebastian Reichel
2014-08-23 17:20 ` Guenter Roeck
2014-08-20 0:45 ` [PATCH v7 03/11] arm64: Support restart through restart handler call chain Guenter Roeck
2014-08-21 4:13 ` Doug Anderson
2014-08-20 0:45 ` [PATCH v7 04/11] arm: " Guenter Roeck
2014-08-21 4:11 ` Doug Anderson
2014-08-22 1:32 ` Andreas Färber
2014-08-22 2:19 ` Guenter Roeck
2014-08-23 17:11 ` Andreas Färber
2014-08-20 0:45 ` [PATCH v7 05/11] watchdog: moxart: Register restart handler with kernel restart handler Guenter Roeck
2014-08-20 0:45 ` [PATCH v7 06/11] watchdog: alim7101: " Guenter Roeck
2014-08-20 0:45 ` [PATCH v7 07/11] watchdog: sunxi: " Guenter Roeck
2014-08-20 0:45 ` [PATCH v7 08/11] arm/arm64: Unexport restart handlers Guenter Roeck
2014-08-21 4:12 ` Doug Anderson
2014-12-04 13:36 ` Geert Uytterhoeven
2014-12-04 14:26 ` Guenter Roeck
2014-12-04 14:44 ` Geert Uytterhoeven
2014-12-04 14:51 ` Guenter Roeck
2014-12-04 15:06 ` Arnd Bergmann
2014-12-04 16:11 ` Guenter Roeck
2014-08-20 0:45 ` Guenter Roeck [this message]
2014-08-20 0:45 ` [PATCH v7 10/11] clk: samsung: register restart handlers for s3c2412 and s3c2443 Guenter Roeck
2014-09-03 19:05 ` Mike Turquette
2014-08-20 0:45 ` [PATCH v7 11/11] clk: rockchip: add restart handler Guenter Roeck
2014-08-21 4:15 ` Doug Anderson
2014-08-21 8:18 ` Heiko Stübner
2014-09-03 19:05 ` Mike Turquette
2014-08-23 16:35 ` [PATCH v7 00/11] kernel: Add support for restart handler call chain Guenter Roeck
2014-08-23 23:00 ` Heiko Stübner
2014-08-24 0:17 ` Guenter Roeck
2014-09-19 12:54 ` Pramod Gurav
2014-09-30 21:20 ` Andrew Morton
2014-09-30 22:30 ` Guenter Roeck
2014-09-30 23:40 ` Stephen Rothwell
2014-10-01 3:28 ` Guenter Roeck
2014-10-01 13:32 ` Heiko Stübner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1408495538-27480-10-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).