From: Eddie Huang <eddie.huang@mediatek.com>
To: Wim Van Sebroeck <wim@iguana.be>, Guenter Roeck <linux@roeck-us.net>
Cc: Matthias Brugger <matthias.bgg@gmail.com>,
<linux-watchdog@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Sascha Hauer <kernel@pengutronix.de>,
Greta Zhang <greta.zhang@mediatek.com>,
Eddie Huang <eddie.huang@mediatek.com>
Subject: [PATCH v2 2/2] watchdog: add wdt shutdown callback to disable wdt if enabled
Date: Thu, 23 Jul 2015 13:49:11 +0800 [thread overview]
Message-ID: <1437630551-39650-3-git-send-email-eddie.huang@mediatek.com> (raw)
In-Reply-To: <1437630551-39650-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 056412c..6ad9df9 100644
--- a/drivers/watchdog/mtk_wdt.c
+++ b/drivers/watchdog/mtk_wdt.c
@@ -210,6 +210,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 (watchdog_active(&mtk_wdt->wdt_dev))
+ 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);
@@ -259,6 +267,7 @@ static const struct dev_pm_ops mtk_wdt_pm_ops = {
static struct platform_driver mtk_wdt_driver = {
.probe = mtk_wdt_probe,
.remove = mtk_wdt_remove,
+ .shutdown = mtk_wdt_shutdown,
.driver = {
.name = DRV_NAME,
.pm = &mtk_wdt_pm_ops,
--
1.8.1.1.dirty
next prev parent reply other threads:[~2015-07-23 5:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-23 5:49 [PATCH v2 0/2] Add Mediatek watchdog suspend resume and shutdown Eddie Huang
2015-07-23 5:49 ` [PATCH v2 1/2] watchdog: add wdt suspend/resume support Eddie Huang
2015-07-23 16:10 ` Guenter Roeck
2015-07-23 17:36 ` Matthias Brugger
2015-07-23 5:49 ` Eddie Huang [this message]
2015-07-23 16:12 ` [PATCH v2 2/2] watchdog: add wdt shutdown callback to disable wdt if enabled Guenter Roeck
2015-07-23 17:37 ` Matthias Brugger
2015-08-11 4:28 ` Daniel Kurtz
2015-08-11 4:42 ` Guenter Roeck
2015-08-11 7:38 ` Daniel Kurtz
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=1437630551-39650-3-git-send-email-eddie.huang@mediatek.com \
--to=eddie.huang@mediatek.com \
--cc=greta.zhang@mediatek.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=matthias.bgg@gmail.com \
--cc=wim@iguana.be \
/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
all inboxes | Powered by JetHome®