diff options
| author | Giridhar Malavali | 2014-04-11 22:54:16 +0200 |
|---|---|---|
| committer | Christoph Hellwig | 2014-05-19 13:31:01 +0200 |
| commit | 7012532dc8cdbcfb0d13d03ccc2ec18416504f29 (patch) | |
| tree | fceb3d6c323eed741ce5d962a9b34ca6692221b9 /drivers | |
| parent | qla2xxx: Support of new firmware dump opcodes QLA8044_RDDFE(38), QLA8044_RDMD... (diff) | |
| download | kernel-qcow2-linux-7012532dc8cdbcfb0d13d03ccc2ec18416504f29.tar.gz kernel-qcow2-linux-7012532dc8cdbcfb0d13d03ccc2ec18416504f29.tar.xz kernel-qcow2-linux-7012532dc8cdbcfb0d13d03ccc2ec18416504f29.zip | |
qla2xxx: Check for peg alive counter and clear any outstanding mailbox command.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_nx2.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c index 6d73e2e485fa..131a9d5ae734 100644 --- a/drivers/scsi/qla2xxx/qla_nx2.c +++ b/drivers/scsi/qla2xxx/qla_nx2.c @@ -2124,6 +2124,13 @@ qla8044_watchdog(struct scsi_qla_host *vha) test_bit(FCOE_CTX_RESET_NEEDED, &vha->dpc_flags))) { dev_state = qla8044_rd_direct(vha, QLA8044_CRB_DEV_STATE_INDEX); + if (qla8044_check_fw_alive(vha)) { + ha->flags.isp82xx_fw_hung = 1; + ql_log(ql_log_warn, vha, 0xb10a, + "Firmware hung.\n"); + qla82xx_clear_pending_mbx(vha); + } + if (qla8044_check_temp(vha)) { set_bit(ISP_UNRECOVERABLE, &vha->dpc_flags); ha->flags.isp82xx_fw_hung = 1; @@ -2144,7 +2151,7 @@ qla8044_watchdog(struct scsi_qla_host *vha) qla2xxx_wake_dpc(vha); } else { /* Check firmware health */ - if (qla8044_check_fw_alive(vha)) { + if (ha->flags.isp82xx_fw_hung) { halt_status = qla8044_rd_direct(vha, QLA8044_PEG_HALT_STATUS1_INDEX); if (halt_status & @@ -2180,12 +2187,8 @@ qla8044_watchdog(struct scsi_qla_host *vha) __func__); set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags); - qla82xx_clear_pending_mbx(vha); } } - ha->flags.isp82xx_fw_hung = 1; - ql_log(ql_log_warn, vha, 0xb10a, - "Firmware hung.\n"); qla2xxx_wake_dpc(vha); } } |