Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8937f2f1 authored Nov 18, 2011 by Giridhar Malavali Committed by James Bottomley Dec 12, 2011

[SCSI] qla2xxx: Clear mailbox busy flag during premature mailbox completion for ISP82xx.



Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent c8f6544e

drivers/scsi/qla2xxx/qla_mbx.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -162,6 +162,7 @@ qla2x00_mailbox_command(scsi_qla_host_t vha, mbx_cmd_t mcp)
	HINT_MBX_INT_PENDING) {		HINT_MBX_INT_PENDING) {
	spin_unlock_irqrestore(&ha->hardware_lock,		spin_unlock_irqrestore(&ha->hardware_lock,
	flags);		flags);
			ha->flags.mbox_busy = 0;
	ql_dbg(ql_dbg_mbx, base_vha, 0x1010,		ql_dbg(ql_dbg_mbx, base_vha, 0x1010,
	"Pending mailbox timeout, exiting.\n");		"Pending mailbox timeout, exiting.\n");
	rval = QLA_FUNCTION_TIMEOUT;		rval = QLA_FUNCTION_TIMEOUT;
	@@ -187,6 +188,7 @@ qla2x00_mailbox_command(scsi_qla_host_t vha, mbx_cmd_t mcp)
	HINT_MBX_INT_PENDING) {		HINT_MBX_INT_PENDING) {
	spin_unlock_irqrestore(&ha->hardware_lock,		spin_unlock_irqrestore(&ha->hardware_lock,
	flags);		flags);
			ha->flags.mbox_busy = 0;
	ql_dbg(ql_dbg_mbx, base_vha, 0x1012,		ql_dbg(ql_dbg_mbx, base_vha, 0x1012,
	"Pending mailbox timeout, exiting.\n");		"Pending mailbox timeout, exiting.\n");
	rval = QLA_FUNCTION_TIMEOUT;		rval = QLA_FUNCTION_TIMEOUT;

drivers/scsi/qla2xxx/qla_nx.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3823,6 +3823,7 @@ void qla82xx_clear_pending_mbx(scsi_qla_host_t *vha)

	if (ha->flags.mbox_busy) {		if (ha->flags.mbox_busy) {
	ha->flags.mbox_int = 1;		ha->flags.mbox_int = 1;
			ha->flags.mbox_busy = 0;
	ql_log(ql_log_warn, vha, 0x6010,		ql_log(ql_log_warn, vha, 0x6010,
	"Doing premature completion of mbx command.\n");		"Doing premature completion of mbx command.\n");
	if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags))		if (test_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags))