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

This project is archived. Its data is read-only.

Commit 2bd1e2be authored Oct 06, 2010 by Nilesh Javali Committed by James Bottomley Oct 25, 2010

[SCSI] qla4xxx: On firmware hang do not wait for the outstanding commands to complete



Signed-off-by: Nilesh Javali <nilesh.javali@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Ravi Anand <ravi.anand@qlogic.com>
Reviewed-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

parent 3710c60c

drivers/scsi/qla4xxx/ql4_os.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1102,6 +1102,7 @@ static int qla4xxx_recover_adapter(struct scsi_qla_host *ha)
		ha->host_no, __func__));
		status = ha->isp_ops->reset_firmware(ha);
		if (status == QLA_SUCCESS) {
		if (!test_bit(AF_FW_RECOVERY, &ha->flags))
		qla4xxx_cmd_wait(ha);
		ha->isp_ops->disable_intrs(ha);
		qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);
		@@ -1119,6 +1120,7 @@ static int qla4xxx_recover_adapter(struct scsi_qla_host *ha)
		* or if stop_firmware fails for ISP-82xx.
		* This is the default case for ISP-4xxx */
		if (!is_qla8022(ha) \|\| reset_chip) {
		if (!test_bit(AF_FW_RECOVERY, &ha->flags))
		qla4xxx_cmd_wait(ha);
		qla4xxx_process_aen(ha, FLUSH_DDB_CHANGED_AENS);
		qla4xxx_abort_active_cmds(ha, DID_RESET << 16);