Commit e21404dc authored Jan 24, 2014 by Xie XiuQi Committed by Linus Torvalds Jan 25, 2014

ipmi: fix timeout calculation when bmc is disconnected



Loading ipmi_si module while bmc is disconnected, we found the timeout
is longer than 5 secs.  Actually it takes about 3 mins and 20
secs.(HZ=250)

error message as below:
  Dec 12 19:08:59 linux kernel: IPMI BT: timeout in RD_WAIT [ ] 1 retries left
  Dec 12 19:08:59 linux kernel: BT: write 4 bytes seq=0x01 03 18 00 01
  [...]
  Dec 12 19:12:19 linux kernel: IPMI BT: timeout in RD_WAIT [ ]
  Dec 12 19:12:19 linux kernel: failed 2 retries, sending error response
  Dec 12 19:12:19 linux kernel: IPMI: BT reset (takes 5 secs)
  Dec 12 19:12:19 linux kernel: IPMI BT: flag reset [ ]

Function wait_for_msg_done() use schedule_timeout_uninterruptible(1) to
sleep 1 tick, so we should subtract jiffies_to_usecs(1) instead of 100
usecs from timeout.

Reported-by: Hu Shiyuan <hushiyuan@huawei.com>
Signed-off-by: Xie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ccb3368c

drivers/char/ipmi/ipmi_si_intf.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2773,7 +2773,7 @@ static int wait_for_msg_done(struct smi_info *smi_info)
		smi_result == SI_SM_CALL_WITH_TICK_DELAY) {
		schedule_timeout_uninterruptible(1);
		smi_result = smi_info->handlers->event(
		smi_info->si_sm, 100);
		smi_info->si_sm, jiffies_to_usecs(1));
		} else if (smi_result == SI_SM_CALL_WITHOUT_DELAY) {
		smi_result = smi_info->handlers->event(
		smi_info->si_sm, 0);