[3.11.y.z extended stable] Patch "ipmi: Reset the KCS timeout when starting error recovery" has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    ipmi: Reset the KCS timeout when starting error recovery

to the linux-3.11.y-queue branch of the 3.11.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.11.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.11.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From 942926e24d9b80b3f2500dde295ed4ec1a386c57 Mon Sep 17 00:00:00 2001
From: Corey Minyard <cminyard at mvista.com>
Date: Mon, 14 Apr 2014 09:46:52 -0500
Subject: ipmi: Reset the KCS timeout when starting error recovery

commit eb6d78ec213e6938559b801421d64714dafcf4b2 upstream.

The OBF timer in KCS was not reset in one situation when error recovery
was started, resulting in an immediate timeout.

Reported-by: Bodo Stroesser <bstroesser at ts.fujitsu.com>
Signed-off-by: Corey Minyard <cminyard at mvista.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
Cc: minyard at acm.org
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/char/ipmi/ipmi_kcs_sm.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/char/ipmi/ipmi_kcs_sm.c b/drivers/char/ipmi/ipmi_kcs_sm.c
index e53fc24..e1ddcf9 100644
--- a/drivers/char/ipmi/ipmi_kcs_sm.c
+++ b/drivers/char/ipmi/ipmi_kcs_sm.c
@@ -251,8 +251,9 @@ static inline int check_obf(struct si_sm_data *kcs, unsigned char status,
 	if (!GET_STATUS_OBF(status)) {
 		kcs->obf_timeout -= time;
 		if (kcs->obf_timeout < 0) {
-		    start_error_recovery(kcs, "OBF not ready in time");
-		    return 1;
+			kcs->obf_timeout = OBF_RETRY_TIMEOUT;
+			start_error_recovery(kcs, "OBF not ready in time");
+			return 1;
 		}
 		return 0;
 	}
--
1.9.1