linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: eddie.huang@mediatek.com (Eddie Huang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] watchdog: add wdt shutdown callback to disable wdt if enabled
Date: Wed, 22 Jul 2015 11:26:50 +0800	[thread overview]
Message-ID: <1437535610-51314-3-git-send-email-eddie.huang@mediatek.com> (raw)
In-Reply-To: <1437535610-51314-1-git-send-email-eddie.huang@mediatek.com>

From: Greta Zhang <greta.zhang@mediatek.com>

Without .shutdown(), watchdog might reset the system during power off.
For example, if watchdog's timeout is set to 30s, then it is reset to
zero by mtk_wdt_ping(). During power off, no app will ping watchdog,
but watchdog is still running and may trigger reset.

Signed-off-by: Greta Zhang <greta.zhang@mediatek.com>
Signed-off-by: Eddie Huang <eddie.huang@mediatek.com>
---
 drivers/watchdog/mtk_wdt.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c
index 5ef3910..c6741a5 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -217,6 +217,14 @@ static int mtk_wdt_probe(struct platform_device *pdev)
 	return 0;
 }
 
+static void mtk_wdt_shutdown(struct platform_device *pdev)
+{
+	struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev);
+
+	if (mtk_wdt->started)
+		mtk_wdt_stop(&mtk_wdt->wdt_dev);
+}
+
 static int mtk_wdt_remove(struct platform_device *pdev)
 {
 	struct mtk_wdt_dev *mtk_wdt = platform_get_drvdata(pdev);
@@ -266,6 +274,7 @@ MODULE_DEVICE_TABLE(of, mtk_wdt_dt_ids);
 static struct platform_driver mtk_wdt_driver = {
 	.probe		= mtk_wdt_probe,
 	.remove		= mtk_wdt_remove,
+	.shutdown	= mtk_wdt_shutdown,
 	.suspend	= mtk_wdt_suspend,
 	.resume		= mtk_wdt_resume,
 	.driver		= {
-- 
1.8.1.1.dirty

  parent reply	other threads:[~2015-07-22  3:26 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-22  3:26 [PATCH 0/2] Add Mediatek watchdog suspend resume and shutdown Eddie Huang
2015-07-22  3:26 ` [PATCH 1/2] watchdog: add wdt suspend/resume support Eddie Huang
2015-07-22  3:45   ` Guenter Roeck
2015-07-23  4:45     ` Eddie Huang
2015-07-22  3:26 ` Eddie Huang [this message]
2015-07-22  3:48   ` [PATCH 2/2] watchdog: add wdt shutdown callback to disable wdt if enabled Guenter Roeck

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=1437535610-51314-3-git-send-email-eddie.huang@mediatek.com \
    --to=eddie.huang@mediatek.com \
    --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).