From: minyard@acm.org
To: linux-watchdog@vger.kernel.org,
Guenter Roeck <linux@roeck-us.net>,
Wim Van Sebroeck <wim@linux-watchdog.org>
Cc: Corey Minyard <cminyard@mvista.com>,
Jerry Hoemann <jerry.hoemann@hpe.com>,
NXP Linux Team <linux-imx@nxp.com>,
Orson Zhai <orsonzhai@gmail.com>,
Baolin Wang <baolin.wang@linaro.org>,
Chunyan Zhang <zhang.lyra@gmail.com>
Subject: [PATCH 12/12] watchdog: Set the preaction fields for drivers supporting pretimeout
Date: Mon, 19 Aug 2019 15:37:11 -0500
Message-ID: <20190819203711.32599-13-minyard@acm.org> (raw)
In-Reply-To: <20190819203711.32599-1-minyard@acm.org>
From: Corey Minyard <cminyard@mvista.com>
None can be changed, so no need for the set operation. The only
one not done was kempld_wdt.c; I couldn't figure out how the
pretimeout worked in that one.
Cc: Jerry Hoemann <jerry.hoemann@hpe.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Cc: Orson Zhai <orsonzhai@gmail.com>
Cc: Baolin Wang <baolin.wang@linaro.org>
Cc: Chunyan Zhang <zhang.lyra@gmail.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
---
drivers/watchdog/hpwdt.c | 3 +++
drivers/watchdog/imx2_wdt.c | 1 +
drivers/watchdog/imx_sc_wdt.c | 1 +
drivers/watchdog/pm8916_wdt.c | 1 +
drivers/watchdog/softdog.c | 1 +
drivers/watchdog/sprd_wdt.c | 1 +
6 files changed, 8 insertions(+)
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 7d34bcf1c45b..4c8875dac5fa 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -228,6 +228,9 @@ static struct watchdog_device hpwdt_dev = {
.timeout = DEFAULT_MARGIN,
.pretimeout = PRETIMEOUT_SEC,
.max_hw_heartbeat_ms = HPWDT_MAX_TIMER * 1000,
+#ifdef CONFIG_HPWDT_NMI_DECODING
+ .preaction = WDIOP_NMI,
+#endif
};
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index 32af3974e6bb..14f64523f12b 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -280,6 +280,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)
wdog->min_timeout = 1;
wdog->timeout = IMX2_WDT_DEFAULT_TIME;
wdog->max_hw_heartbeat_ms = IMX2_WDT_MAX_TIME * 1000;
+ wdog->preaction = WDIOP_INTERRUPT;
wdog->parent = &pdev->dev;
ret = platform_get_irq(pdev, 0);
diff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c
index 78eaaf75a263..164bde58036a 100644
--- a/drivers/watchdog/imx_sc_wdt.c
+++ b/drivers/watchdog/imx_sc_wdt.c
@@ -169,6 +169,7 @@ static int imx_sc_wdt_probe(struct platform_device *pdev)
wdog->max_timeout = MAX_TIMEOUT;
wdog->parent = dev;
wdog->timeout = DEFAULT_TIMEOUT;
+ wdog->preaction = WDIOP_INTERRUPT;
watchdog_init_timeout(wdog, 0, dev);
watchdog_stop_on_reboot(wdog);
diff --git a/drivers/watchdog/pm8916_wdt.c b/drivers/watchdog/pm8916_wdt.c
index 2d3652004e39..b70cd45067d6 100644
--- a/drivers/watchdog/pm8916_wdt.c
+++ b/drivers/watchdog/pm8916_wdt.c
@@ -184,6 +184,7 @@ static int pm8916_wdt_probe(struct platform_device *pdev)
wdt->wdev.max_timeout = PM8916_WDT_MAX_TIMEOUT;
wdt->wdev.timeout = PM8916_WDT_DEFAULT_TIMEOUT;
wdt->wdev.pretimeout = 0;
+ wdt->wdev.preaction = WDIOP_INTERRUPT;
watchdog_set_drvdata(&wdt->wdev, wdt);
watchdog_init_timeout(&wdt->wdev, 0, dev);
diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
index 3e4885c1545e..cb3f829d8bcb 100644
--- a/drivers/watchdog/softdog.c
+++ b/drivers/watchdog/softdog.c
@@ -125,6 +125,7 @@ static struct watchdog_device softdog_dev = {
.min_timeout = 1,
.max_timeout = 65535,
.timeout = TIMER_MARGIN,
+ .preaction = WDIOP_INTERRUPT,
};
static int __init softdog_init(void)
diff --git a/drivers/watchdog/sprd_wdt.c b/drivers/watchdog/sprd_wdt.c
index edba4e278685..d70c738c7356 100644
--- a/drivers/watchdog/sprd_wdt.c
+++ b/drivers/watchdog/sprd_wdt.c
@@ -302,6 +302,7 @@ static int sprd_wdt_probe(struct platform_device *pdev)
wdt->wdd.min_timeout = SPRD_WDT_MIN_TIMEOUT;
wdt->wdd.max_timeout = SPRD_WDT_MAX_TIMEOUT;
wdt->wdd.timeout = SPRD_WDT_MAX_TIMEOUT;
+ wdt->wdd.preaction = WDIOP_INTERRUPT;
ret = sprd_wdt_enable(wdt);
if (ret) {
--
2.17.1
prev parent reply index
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190819203711.32599-1-minyard@acm.org>
2019-08-19 20:37 ` [PATCH 01/12] watchdog: NULL the default governor if it is unregistered minyard
2019-08-19 22:35 ` Guenter Roeck
2019-08-19 20:37 ` [PATCH 02/12] watchdog: Add the ability to provide data to read minyard
2019-08-19 21:50 ` Guenter Roeck
2019-08-19 22:43 ` Guenter Roeck
2019-08-20 0:23 ` Corey Minyard
2019-08-20 1:09 ` Jerry Hoemann
2019-08-20 12:12 ` Corey Minyard
2019-08-20 13:53 ` Guenter Roeck
2019-08-20 15:58 ` Corey Minyard
2019-08-20 17:14 ` Guenter Roeck
2019-08-20 18:16 ` Corey Minyard
2019-08-19 20:37 ` [PATCH 03/12] watchdog: Add a pretimeout governor to provide read data minyard
2019-08-19 20:37 ` [PATCH 04/12] watchdog: Allow pretimeout governor setting to be accessed from modules minyard
2019-08-19 21:49 ` Guenter Roeck
2019-08-20 0:24 ` Corey Minyard
2019-08-19 20:37 ` [PATCH 05/12] watchdog:ipmi: Move the IPMI watchdog to drivers/watchdog minyard
2019-08-19 20:37 ` [PATCH 06/12] watchdog:ipmi: Convert over to the standard watchdog infrastructure minyard
2019-08-19 20:37 ` [PATCH 07/12] watchdog:ipmi: Add the ability to fetch the current time left minyard
2019-08-19 20:37 ` [PATCH 08/12] watchdog: Add the ability to set the action of a timeout minyard
2019-08-19 21:58 ` Guenter Roeck
2019-08-20 0:39 ` Corey Minyard
2019-08-20 14:17 ` Guenter Roeck
2019-08-20 19:39 ` Corey Minyard
2019-08-19 20:37 ` [PATCH 09/12] watchdog:ipmi: Implement action and preaction functions minyard
2019-08-19 20:37 ` [PATCH 10/12] watchdog: Add a way to set the governor through the ioctl minyard
2019-08-19 20:37 ` [PATCH 11/12] watchdog: Add a sample program that can fully use the watchdog interface minyard
2019-08-19 20:37 ` minyard [this message]
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=20190819203711.32599-13-minyard@acm.org \
--to=minyard@acm.org \
--cc="[PATCH 00/12]"@minyard.net \
--cc=Convert@minyard.net \
--cc=IPMI@minyard.net \
--cc=baolin.wang@linaro.org \
--cc=cminyard@mvista.com \
--cc=interface@minyard.net \
--cc=jerry.hoemann@hpe.com \
--cc=linux-imx@nxp.com \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=orsonzhai@gmail.com \
--cc=standard@minyard.net \
--cc=the@minyard.net \
--cc=to@minyard.net \
--cc=watchdog@minyard.net \
--cc=wim@linux-watchdog.org \
--cc=zhang.lyra@gmail.com \
/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
Linux-Watchdog Archive on lore.kernel.org
Archives are clonable:
git clone --mirror https://lore.kernel.org/linux-watchdog/0 linux-watchdog/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 linux-watchdog linux-watchdog/ https://lore.kernel.org/linux-watchdog \
linux-watchdog@vger.kernel.org
public-inbox-index linux-watchdog
Example config snippet for mirrors
Newsgroup available over NNTP:
nntp://nntp.lore.kernel.org/org.kernel.vger.linux-watchdog
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git