Commit 957aa597 authored by Tony Battersby's avatar Tony Battersby Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Use reinit_completion on mbx_intr_comp 



If a mailbox command completes immediately after
wait_for_completion_timeout() times out, ha->mbx_intr_comp could be left
in an inconsistent state, causing the next mailbox command not to wait
for the hardware.  Fix by reinitializing the completion before use.

Signed-off-by: default avatarTony Battersby <tonyb@cybernetics.com>
Link: https://patch.msgid.link/11b6485e-0bfd-4784-8f99-c06a196dad94@cybernetics.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4f6aaade

drivers/scsi/qla2xxx/qla_mbx.c

+2 −0
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) 
	/* Issue set host interrupt command to send cmd out. */

	ha->flags.mbox_int = 0;

	clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);

	reinit_completion(&ha->mbx_intr_comp);



	/* Unlock mbx registers and wait for interrupt */

	ql_dbg(ql_dbg_mbx, vha, 0x100f,
@@ -279,6 +280,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) 
			    "cmd=%x Timeout.\n", command);

			spin_lock_irqsave(&ha->hardware_lock, flags);

			clear_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);

			reinit_completion(&ha->mbx_intr_comp);

			spin_unlock_irqrestore(&ha->hardware_lock, flags);



			if (chip_reset != ha->chip_reset) {