Commit 5877255d authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: wd: fix stop completion failure 



While running Documentation/watchdog/src/watchdog-simple.c
and quiting by Ctrl-C, fallowing error is displayed:
mei_me 0000:00:16.0: wd: stop failed to complete ret=-512.

The whatchdog core framework is not able to propagate
-ESYSRESTART or -EINTR. Also There is no much sense in
restarting the close system call so instead of using
wait_event_interruptible_timeout we can use wait_event_timeout
with reasonable 10 msecs timeout.

Reported-by: default avatarPrarit Bhargava <prarit@redhat.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b6d81fd6

drivers/misc/mei/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ int mei_irq_write_handler(struct mei_device *dev, struct mei_cl_cb *cmpl_list) 


	if (dev->wd_state == MEI_WD_STOPPING) {

		dev->wd_state = MEI_WD_IDLE;

		wake_up_interruptible(&dev->wait_stop_wd);

		wake_up(&dev->wait_stop_wd);

	}



	if (mei_cl_is_connected(&dev->wd_cl)) {

drivers/misc/mei/wd.c

+17 −15
Original line number Diff line number Diff line
@@ -155,9 +155,11 @@ int mei_wd_send(struct mei_device *dev) 
 * @dev: the device structure

 * @preserve: indicate if to keep the timeout value

 *

 * returns 0 if success,

 * returns 0 if success

 * on error:

 *	-EIO    when message send fails

 *	-EINVAL when invalid message is to be sent

 *	-ETIME  on message timeout

 */

int mei_wd_stop(struct mei_device *dev)

{
@@ -173,12 +175,12 @@ int mei_wd_stop(struct mei_device *dev) 


	ret = mei_cl_flow_ctrl_creds(&dev->wd_cl);

	if (ret < 0)

		goto out;

		goto err;



	if (ret && mei_hbuf_acquire(dev)) {

		ret = mei_wd_send(dev);

		if (ret)

			goto out;

			goto err;

		dev->wd_pending = false;

	} else {

		dev->wd_pending = true;
@@ -186,21 +188,21 @@ int mei_wd_stop(struct mei_device *dev) 


	mutex_unlock(&dev->device_lock);



	ret = wait_event_interruptible_timeout(dev->wait_stop_wd,

	ret = wait_event_timeout(dev->wait_stop_wd,

				dev->wd_state == MEI_WD_IDLE,

				msecs_to_jiffies(MEI_WD_STOP_TIMEOUT));

	mutex_lock(&dev->device_lock);

	if (dev->wd_state == MEI_WD_IDLE) {

		dev_dbg(&dev->pdev->dev, "wd: stop completed ret=%d.\n", ret);

		ret = 0;

	} else {

		if (!ret)

	if (dev->wd_state != MEI_WD_IDLE) {

		/* timeout */

		ret = -ETIME;

		dev_warn(&dev->pdev->dev,

			"wd: stop failed to complete ret=%d.\n", ret);

		goto err;

	}



out:

	dev_dbg(&dev->pdev->dev, "wd: stop completed after %u msec\n",

			MEI_WD_STOP_TIMEOUT - jiffies_to_msecs(ret));

	return 0;

err:

	return ret;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE