From: Tomas Winkler <tomas.winkler@intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Wim Van Sebroeck <wim@iguana.be>,
Guenter Roeck <linux@roeck-us.net>
Cc: Alexander Usyskin <alexander.usyskin@intel.com>,
linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org,
Tomas Winkler <tomas.winkler@intel.com>
Subject: [char-misc-next v4 7/7] watchdog: mei_wdt: re-register device on event
Date: Fri, 8 Jan 2016 00:49:27 +0200 [thread overview]
Message-ID: <1452206967-1144-8-git-send-email-tomas.winkler@intel.com> (raw)
In-Reply-To: <1452206967-1144-1-git-send-email-tomas.winkler@intel.com>
From: Alexander Usyskin <alexander.usyskin@intel.com>
For Intel SKL platform the ME device can inform the host via
asynchronous notification that the watchdog feature was activated
on the device. The activation doesn't require reboot.
In that case the driver registers the watchdog device with the kernel.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
---
V2: rework un/registration in runtime
V3: rebase, runtime unregistration was moved to BDW patch.
V4: Rebase the code over patchset : "watchdog: Replace driver based refcounting"
drivers/watchdog/mei_wdt.c | 28 ++++++++++++++++++++++++++--
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/drivers/watchdog/mei_wdt.c b/drivers/watchdog/mei_wdt.c
index fe683e582566..a49be916ac7f 100644
--- a/drivers/watchdog/mei_wdt.c
+++ b/drivers/watchdog/mei_wdt.c
@@ -477,6 +477,21 @@ out:
complete(&wdt->response);
}
+/*
+ * mei_wdt_notify_event - callback for event notification
+ *
+ * @cldev: bus device
+ */
+static void mei_wdt_notify_event(struct mei_cl_device *cldev)
+{
+ struct mei_wdt *wdt = mei_cldev_get_drvdata(cldev);
+
+ if (wdt->state != MEI_WDT_NOT_REQUIRED)
+ return;
+
+ mei_wdt_register(wdt);
+}
+
/**
* mei_wdt_event - callback for event receive
*
@@ -489,6 +504,9 @@ static void mei_wdt_event(struct mei_cl_device *cldev,
{
if (events & BIT(MEI_CL_EVENT_RX))
mei_wdt_event_rx(cldev);
+
+ if (events & BIT(MEI_CL_EVENT_NOTIF))
+ mei_wdt_notify_event(cldev);
}
#if IS_ENABLED(CONFIG_DEBUG_FS)
@@ -601,9 +619,15 @@ static int mei_wdt_probe(struct mei_cl_device *cldev,
goto err_out;
}
- ret = mei_cldev_register_event_cb(wdt->cldev, BIT(MEI_CL_EVENT_RX),
+ ret = mei_cldev_register_event_cb(wdt->cldev,
+ BIT(MEI_CL_EVENT_RX) |
+ BIT(MEI_CL_EVENT_NOTIF),
mei_wdt_event, NULL);
- if (ret) {
+
+ /* on legacy devices notification is not supported
+ * this doesn't fail the registration for RX event
+ */
+ if (ret && ret != -EOPNOTSUPP) {
dev_err(&cldev->dev, "Could not register event ret=%d\n", ret);
goto err_disable;
}
--
2.4.3
next prev parent reply other threads:[~2016-01-07 22:51 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-07 22:49 [char-misc-next v4 0/7] mei: create proper iAMT watchdog driver Tomas Winkler
2016-01-07 22:49 ` [char-misc-next v4 1/7] mei: wd: drop the watchdog code from the core mei driver Tomas Winkler
2016-01-07 22:49 ` [char-misc-next v4 2/7] watchdog: mei_wdt: implement MEI iAMT watchdog driver Tomas Winkler
2016-01-07 22:49 ` [char-misc-next v4 3/7] watchdog: mei_wdt: add status debugfs entry Tomas Winkler
2016-01-07 22:49 ` [char-misc-next v4 4/7] mei: bus: whitelist the watchdog client Tomas Winkler
2016-01-07 22:49 ` [char-misc-next v4 5/7] watchdog: mei_wdt: register wd device only if required Tomas Winkler
2016-01-17 17:13 ` [char-misc-next, v4, " Guenter Roeck
2016-01-17 20:54 ` Winkler, Tomas
2016-01-17 21:47 ` Guenter Roeck
2016-01-18 13:19 ` Winkler, Tomas
2016-01-18 15:42 ` Guenter Roeck
2016-01-18 19:36 ` Winkler, Tomas
2016-01-18 20:21 ` Guenter Roeck
2016-01-18 21:52 ` Winkler, Tomas
2016-01-07 22:49 ` [char-misc-next v4 6/7] watchdog: mei_wdt: add activation debugfs entry Tomas Winkler
2016-01-07 22:49 ` Tomas Winkler [this message]
2016-02-07 6:11 ` [char-misc-next v4 0/7] mei: create proper iAMT watchdog driver Greg Kroah-Hartman
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=1452206967-1144-8-git-send-email-tomas.winkler@intel.com \
--to=tomas.winkler@intel.com \
--cc=alexander.usyskin@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--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®