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>
Subject: [PATCH 07/12] watchdog:ipmi: Add the ability to fetch the current time left
Date: Mon, 19 Aug 2019 15:37:06 -0500 [thread overview]
Message-ID: <20190819203711.32599-8-minyard@acm.org> (raw)
In-Reply-To: <20190819203711.32599-1-minyard@acm.org>
From: Corey Minyard <cminyard@mvista.com>
The new API has the capability, and so do the IPMI interface, so do
it.
Signed-off-by: Corey Minyard <cminyard@mvista.com>
---
drivers/watchdog/ipmi_watchdog.c | 57 ++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/drivers/watchdog/ipmi_watchdog.c b/drivers/watchdog/ipmi_watchdog.c
index c8c11a61ebb9..218c01707c0b 100644
--- a/drivers/watchdog/ipmi_watchdog.c
+++ b/drivers/watchdog/ipmi_watchdog.c
@@ -757,6 +757,62 @@ static int _ipmi_heartbeat(struct ipmi_wdt *iwd)
return rv;
}
+static unsigned int ipmi_wdt_get_timeleft(struct watchdog_device *wdd)
+{
+ struct ipmi_wdt *iwd = wdd_to_ipmi_wdt(wdd);
+ struct kernel_ipmi_msg msg;
+ int rv = 0;
+ struct ipmi_system_interface_addr addr;
+
+ mutex_lock(&iwd->lock);
+ if (iwd->state == WDOG_TIMEOUT_NONE)
+ goto out_unlock;
+
+ addr.addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
+ addr.channel = IPMI_BMC_CHANNEL;
+ addr.lun = 0;
+
+ atomic_set(&iwd->msg_tofree, 2);
+
+ msg.netfn = 0x06;
+ msg.cmd = IPMI_WDOG_GET_TIMER;
+ msg.data = NULL;
+ msg.data_len = 0;
+ rv = ipmi_request_supply_msgs(iwd->user,
+ (struct ipmi_addr *) &addr,
+ 0,
+ &msg,
+ NULL,
+ &iwd->smi_msg,
+ &iwd->recv_msg,
+ 1);
+ if (rv) {
+ pr_warn("get timeout error: %d\n", rv);
+ goto out_unlock;
+ }
+
+ wait_msg_done(iwd, false);
+
+ if (iwd->recv_msg.msg.data[0] != 0) {
+ pr_warn("get timeout IPMI error: %d\n",
+ iwd->recv_msg.msg.data[0]);
+ goto out_unlock;
+ }
+
+ if (iwd->recv_msg.msg.data_len < 9) {
+ pr_warn("get timeout IPMI response too short: %d\n",
+ iwd->recv_msg.msg.data_len);
+ goto out_unlock;
+ }
+
+ rv = iwd->recv_msg.msg.data[8] << 8 | iwd->recv_msg.msg.data[7];
+ rv /= 10; /* IPMI time is in 100s of milliseconds. */
+
+out_unlock:
+ mutex_unlock(&iwd->lock);
+ return rv;
+}
+
static void ipmi_wdog_msg_handler(struct ipmi_recv_msg *msg,
void *handler_data)
{
@@ -880,6 +936,7 @@ static const struct watchdog_ops ipmi_wdt_ops = {
.ping = ipmi_wdt_ping,
.set_timeout = ipmi_wdt_set_timeout,
.set_pretimeout = ipmi_wdt_set_pretimeout,
+ .get_timeleft = ipmi_wdt_get_timeleft,
};
static const struct ipmi_user_hndl ipmi_hndlrs = {
--
2.17.1
next prev parent reply other threads:[~2019-08-19 20:37 UTC|newest]
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 ` minyard [this message]
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 ` [PATCH 12/12] watchdog: Set the preaction fields for drivers supporting pretimeout minyard
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-8-minyard@acm.org \
--to=minyard@acm.org \
--cc="[PATCH 00/12]"@minyard.net \
--cc=Convert@minyard.net \
--cc=IPMI@minyard.net \
--cc=cminyard@mvista.com \
--cc=interface@minyard.net \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=standard@minyard.net \
--cc=the@minyard.net \
--cc=to@minyard.net \
--cc=watchdog@minyard.net \
--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).