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

Commit 7e84766c authored by Quinn Tran's avatar Quinn Tran Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Add longer window for chip reset 



qla2x00_reset_active only covers the window of turning the chip off. Add
check to cover turning chip on.

Signed-off-by: default avatarQuinn Tran <quinn.tran@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 23dd98a6

drivers/scsi/qla2xxx/qla_dbg.c

+3 −0
Original line number Diff line number Diff line
@@ -1130,6 +1130,7 @@ qla24xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
		    ha->fw_dump);

		goto qla24xx_fw_dump_failed;

	}

	QLA_FW_STOPPED(ha);

	fw = &ha->fw_dump->isp.isp24;

	qla2xxx_prep_dump(ha, ha->fw_dump);
@@ -1384,6 +1385,7 @@ qla25xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
		    ha->fw_dump);

		goto qla25xx_fw_dump_failed;

	}

	QLA_FW_STOPPED(ha);

	fw = &ha->fw_dump->isp.isp25;

	qla2xxx_prep_dump(ha, ha->fw_dump);

	ha->fw_dump->version = htonl(2);
@@ -2036,6 +2038,7 @@ qla83xx_fw_dump(scsi_qla_host_t *vha, int hardware_locked) 
		    "request...\n", ha->fw_dump);

		goto qla83xx_fw_dump_failed;

	}

	QLA_FW_STOPPED(ha);

	fw = &ha->fw_dump->isp.isp83;

	qla2xxx_prep_dump(ha, ha->fw_dump);

drivers/scsi/qla2xxx/qla_tmpl.c

+3 −1
Original line number Diff line number Diff line
@@ -1028,8 +1028,10 @@ qla27xx_fwdump(scsi_qla_host_t *vha, int hardware_locked) 
		ql_log(ql_log_warn, vha, 0xd300,

		    "Firmware has been previously dumped (%p),"

		    " -- ignoring request\n", vha->hw->fw_dump);

	else

	else {

		QLA_FW_STOPPED(vha->hw);

		qla27xx_execute_fwdt_template(vha);

	}



#ifndef __CHECKER__

	if (!hardware_locked)