Commit fcef0893 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen

scsi: qla2xxx: Complain if waiting for pending commands times out

Such a timeout is a severe issue. Hence complain if waiting for pending
commands times out. This patch fixes a small bug: it modifies
qla82xx_chip_reset_cleanup() such that the "Done waiting" message is
reported if qla82xx_chip_reset_cleanup() succeeded instead of if that
function failed.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Tested-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Reviewed-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent bc97c948
...@@ -6634,7 +6634,8 @@ qla2x00_quiesce_io(scsi_qla_host_t *vha) ...@@ -6634,7 +6634,8 @@ qla2x00_quiesce_io(scsi_qla_host_t *vha)
LOOP_DOWN_TIME); LOOP_DOWN_TIME);
} }
/* Wait for pending cmds to complete */ /* Wait for pending cmds to complete */
qla2x00_eh_wait_for_pending_commands(vha, 0, 0, WAIT_HOST); WARN_ON_ONCE(qla2x00_eh_wait_for_pending_commands(vha, 0, 0, WAIT_HOST)
!= QLA_SUCCESS);
} }
void void
......
...@@ -3710,10 +3710,12 @@ qla82xx_chip_reset_cleanup(scsi_qla_host_t *vha) ...@@ -3710,10 +3710,12 @@ qla82xx_chip_reset_cleanup(scsi_qla_host_t *vha)
/* Wait for pending cmds (physical and virtual) to complete */ /* Wait for pending cmds (physical and virtual) to complete */
if (qla2x00_eh_wait_for_pending_commands(vha, 0, 0, if (qla2x00_eh_wait_for_pending_commands(vha, 0, 0,
WAIT_HOST)) { WAIT_HOST) == QLA_SUCCESS) {
ql_dbg(ql_dbg_init, vha, 0x00b3, ql_dbg(ql_dbg_init, vha, 0x00b3,
"Done wait for " "Done wait for "
"pending commands.\n"); "pending commands.\n");
} else {
WARN_ON_ONCE(true);
} }
} }
} }
......
...@@ -1059,8 +1059,8 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd, ...@@ -1059,8 +1059,8 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd,
* cmd = Scsi Command to wait on. * cmd = Scsi Command to wait on.
* *
* Return: * Return:
* Not Found : 0 * Completed in time : QLA_SUCCESS
* Found : 1 * Did not complete in time : QLA_FUNCTION_FAILED
*/ */
static int static int
qla2x00_eh_wait_on_command(struct scsi_cmnd *cmd) qla2x00_eh_wait_on_command(struct scsi_cmnd *cmd)
...@@ -1372,6 +1372,9 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd) ...@@ -1372,6 +1372,9 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
return ret; return ret;
} }
/*
* Returns: QLA_SUCCESS or QLA_FUNCTION_FAILED.
*/
int int
qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *vha, unsigned int t, qla2x00_eh_wait_for_pending_commands(scsi_qla_host_t *vha, unsigned int t,
uint64_t l, enum nexus_wait_type type) uint64_t l, enum nexus_wait_type type)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment