Commit f895e5df authored by Corey Minyard's avatar Corey Minyard
Browse files

ipmi:si: Don't block module unload if the BMC is messed up 



If the BMC is in a bad state, don't bother waiting for queues messages
since there can't be any.  Otherwise the unload is blocked until the
BMC is back in a good state.

Reported-by: default avatarRafael J. Wysocki <rafael@kernel.org>
Fixes: bc3a9d21 ("ipmi:si: Gracefully handle if the BMC is non-functional")
Cc: stable@vger.kernel.org # 4.18
Signed-off-by: default avatarCorey Minyard <corey@minyard.net>
Reviewed-by: default avatarRafael J. Wysocki (Intel) <rafael@kernel.org>
parent c3bb3295

drivers/char/ipmi/ipmi_si_intf.c

+2 −1
Original line number Diff line number Diff line
@@ -2234,7 +2234,8 @@ static void wait_msg_processed(struct smi_info *smi_info) 
	unsigned long jiffies_now;

	long time_diff;



	while (smi_info->curr_msg || (smi_info->si_state != SI_NORMAL)) {

	while (smi_info->si_state != SI_HOSED &&

		    (smi_info->curr_msg || (smi_info->si_state != SI_NORMAL))) {

		jiffies_now = jiffies;

		time_diff = (((long)jiffies_now - (long)smi_info->last_timeout_jiffies)

		     * SI_USEC_PER_JIFFY);