Skip to contentSkip to conversation

staging: mei: adding watchdog ping

PATCH In review Oren Weil 2 participants 2 messages Sep 1, 2011 – Sep 6, 2011

Subsystems (2)
lore
Share & tools
lore

Oren Weil

author
#0 lore raw

PATCH v2 5/12 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.

Version 2 - Removed two tab indent

---
 drivers/staging/mei/interrupt.c |   27 -------------------
 drivers/staging/mei/wd.c        |   54 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 27 deletions(-)
drivers/staging/mei/interrupt.c +0 -27
index 958a7e2..62b8001 100644
@@ -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

69 lines not on this page · raw message

Signature · 1 line
1.7.4.1
#1 lore raw
Quoted 4 lines · Oren Weil

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

Version 2 - Removed two tab indent

Oh great, now I notice this one.

Sorry, can you resend the whole series with this one included again, I've purged your older series already.

thanks,

greg k-h