From: Jerry Hoemann <jerry.hoemann@hpe.com>
To: linux@roeck-us.net, wim@linux-watchdog.org,
linux-watchdog@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, mironov.ivan@gmail.com,
rasmus.villemoes@prevas.dk, jerry.hoemann@hpe.com
Subject: [PATCH 3/6] watchdog/hpwdt: Have core ping watchdog.
Date: Fri, 17 May 2019 14:59:40 -0600 [thread overview]
Message-ID: <1558126783-4877-4-git-send-email-jerry.hoemann@hpe.com> (raw)
In-Reply-To: <1558126783-4877-1-git-send-email-jerry.hoemann@hpe.com>
Instead of stopping the hw timer during probe, have the core update
the timer if the timer is already running.
Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com>
---
drivers/watchdog/hpwdt.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index 9f7a370..aa4101c 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -59,6 +59,11 @@
/*
* Watchdog operations
*/
+static int hpwdt_hw_is_running(void)
+{
+ return ioread8(hpwdt_timer_con) & 0x01;
+}
+
static int hpwdt_start(struct watchdog_device *wdd)
{
int control = 0x81 | (pretimeout ? 0x4 : 0);
@@ -302,8 +307,11 @@ static int hpwdt_init_one(struct pci_dev *dev,
hpwdt_timer_reg = pci_mem_addr + 0x70;
hpwdt_timer_con = pci_mem_addr + 0x72;
- /* Make sure that timer is disabled until /dev/watchdog is opened */
- hpwdt_stop();
+ /* Have the core update running timer until user space is ready */
+ if (hpwdt_hw_is_running()) {
+ dev_info(&dev->dev, "timer is running\n");
+ set_bit(WDOG_HW_RUNNING, &hpwdt_dev.status);
+ }
/* Initialize NMI Decoding functionality */
retval = hpwdt_init_nmi_decoding(dev);
--
1.8.3.1
next prev parent reply other threads:[~2019-05-17 21:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-17 20:59 [PATCH 0/6] watchdog/hpwdt: cleanups and kdump accommodations Jerry Hoemann
2019-05-17 20:59 ` [PATCH 1/6] watchdog/hpwdt: Stop hpwdt on unregister Jerry Hoemann
2019-06-06 21:14 ` Guenter Roeck
2019-05-17 20:59 ` [PATCH 2/6] watchdog/hpwdt: Advertize max_hw_heartbeat_ms Jerry Hoemann
2019-06-06 21:17 ` Guenter Roeck
2019-05-17 20:59 ` Jerry Hoemann [this message]
2019-06-06 21:18 ` [PATCH 3/6] watchdog/hpwdt: Have core ping watchdog Guenter Roeck
2019-05-17 20:59 ` [PATCH 4/6] watchdog/hpwdt: Add module parameter kdumptimeout Jerry Hoemann
2019-06-06 21:19 ` Guenter Roeck
2019-05-17 20:59 ` [PATCH 5/6] watchdog/hpwdt: Update documentation Jerry Hoemann
2019-06-06 21:19 ` Guenter Roeck
2019-05-17 20:59 ` [PATCH 6/6] watchdog/hpwdt: Reflect changes Jerry Hoemann
2019-06-06 21:20 ` Guenter Roeck
2019-06-05 22:31 ` [PATCH 0/6] watchdog/hpwdt: cleanups and kdump accommodations Jerry Hoemann
2019-06-05 22:51 ` 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=1558126783-4877-4-git-send-email-jerry.hoemann@hpe.com \
--to=jerry.hoemann@hpe.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=mironov.ivan@gmail.com \
--cc=rasmus.villemoes@prevas.dk \
--cc=wim@linux-watchdog.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).