Commit 8c4a59a7 authored by Oren Weil's avatar Oren Weil Committed by Greg Kroah-Hartman
Browse files

staging: mei: adding watchdog ping 



adding watchdog ping to send ping/heartbeat to the the AMT watchdog client.
in addition removing the heartbeat sending from the driver timers function.

Signed-off-by: default avatarOren Weil <oren.jer.weil@intel.com>
Acked-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4a3cafd5

drivers/staging/mei/interrupt.c

+0 −27
Original line number Diff line number Diff line
@@ -1430,33 +1430,6 @@ void mei_wd_timer(struct work_struct *work) 
		}

	}



	if (dev->wd_cl.state != MEI_FILE_CONNECTED)

		goto out;



	/* Watchdog */

	if (dev->wd_due_counter && !dev->wd_bypass) {

		if (--dev->wd_due_counter == 0) {

			if (dev->mei_host_buffer_is_empty &&

			    mei_flow_ctrl_creds(dev, &dev->wd_cl) > 0) {

				dev->mei_host_buffer_is_empty = false;

				dev_dbg(&dev->pdev->dev, "send watchdog.\n");



				if (mei_wd_send(dev))

					dev_dbg(&dev->pdev->dev, "wd send failed.\n");

				else

					if (mei_flow_ctrl_reduce(dev, &dev->wd_cl))

						goto out;



				if (dev->wd_timeout)

					dev->wd_due_counter = 2;

				else

					dev->wd_due_counter = 0;



			} else

				dev->wd_pending = true;



		}

	}

	if (dev->iamthif_stall_timer) {

		if (--dev->iamthif_stall_timer == 0) {

			dev_dbg(&dev->pdev->dev, "reseting because of hang to amthi.\n");

drivers/staging/mei/wd.c

+54 −0
Original line number Diff line number Diff line
@@ -254,6 +254,58 @@ static int mei_wd_ops_stop(struct watchdog_device *wd_dev) 
	return 0;

}



/*

 * mei_wd_ops_ping - wd ping command from the watchdog core.

 *

 * @wd_dev - watchdog device struct

 *

 * returns 0 if success, negative errno code for failure

 */

static int mei_wd_ops_ping(struct watchdog_device *wd_dev)

{

	int ret = 0;

	struct mei_device *dev;

	dev = pci_get_drvdata(mei_device);



	if (!dev)

		return -ENODEV;



	mutex_lock(&dev->device_lock);



	if (dev->wd_cl.state != MEI_FILE_CONNECTED) {

		dev_dbg(&dev->pdev->dev, "wd is not connected.\n");

		ret = -ENODEV;

		goto end;

	}



	/* Check if we can send the ping to HW*/

	if (dev->mei_host_buffer_is_empty &&

		mei_flow_ctrl_creds(dev, &dev->wd_cl) > 0) {



		dev->mei_host_buffer_is_empty = false;

		dev_dbg(&dev->pdev->dev, "sending watchdog ping\n");



		if (mei_wd_send(dev)) {

			dev_dbg(&dev->pdev->dev, "wd send failed.\n");

			ret = -EIO;

			goto end;

		}



		if (mei_flow_ctrl_reduce(dev, &dev->wd_cl)) {

			dev_dbg(&dev->pdev->dev, "mei_flow_ctrl_reduce() failed.\n");

			ret = -EIO;

			goto end;

		}



	} else {

		dev->wd_pending = true;

	}



end:

	mutex_unlock(&dev->device_lock);

	return ret;

}



/*

 * Watchdog Device structs

 */
@@ -261,9 +313,11 @@ const struct watchdog_ops wd_ops = { 
		.owner = THIS_MODULE,

		.start = mei_wd_ops_start,

		.stop = mei_wd_ops_stop,

		.ping = mei_wd_ops_ping,

};

const struct watchdog_info wd_info = {

		.identity = INTEL_AMT_WATCHDOG_ID,

		.options = WDIOF_KEEPALIVEPING,

};



struct watchdog_device amt_wd_dev = {