mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
[SCSI] qla2xxx: Always serialize mailbox command execution.
Original code would incorrectly bypass serialization if the DPC thread were performing a big-hammer operation (ISP abort). This short circuit, though rare, would subsequently stomp on a secondary thread's mailbox command execution. Found during ISP81XX testing. Signed-off-by: Andrew Vasquez <[email protected]> Signed-off-by: James Bottomley <[email protected]>
This commit is contained in:
parent
09ff36d30c
commit
8eca3f39c4
1 changed files with 6 additions and 10 deletions
|
|
@ -58,14 +58,11 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
|
|||
* seconds. This is to serialize actual issuing of mailbox cmds during
|
||||
* non ISP abort time.
|
||||
*/
|
||||
if (!abort_active) {
|
||||
if (!wait_for_completion_timeout(&ha->mbx_cmd_comp,
|
||||
mcp->tov * HZ)) {
|
||||
/* Timeout occurred. Return error. */
|
||||
DEBUG2_3_11(printk("%s(%ld): cmd access timeout. "
|
||||
"Exiting.\n", __func__, base_vha->host_no));
|
||||
return QLA_FUNCTION_TIMEOUT;
|
||||
}
|
||||
if (!wait_for_completion_timeout(&ha->mbx_cmd_comp, mcp->tov * HZ)) {
|
||||
/* Timeout occurred. Return error. */
|
||||
DEBUG2_3_11(printk("%s(%ld): cmd access timeout. "
|
||||
"Exiting.\n", __func__, base_vha->host_no));
|
||||
return QLA_FUNCTION_TIMEOUT;
|
||||
}
|
||||
|
||||
ha->flags.mbox_busy = 1;
|
||||
|
|
@ -265,8 +262,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
|
|||
}
|
||||
|
||||
/* Allow next mbx cmd to come in. */
|
||||
if (!abort_active)
|
||||
complete(&ha->mbx_cmd_comp);
|
||||
complete(&ha->mbx_cmd_comp);
|
||||
|
||||
if (rval) {
|
||||
DEBUG2_3_11(printk("%s(%ld): **** FAILED. mbx0=%x, mbx1=%x, "
|
||||
|
|
|
|||
Loading…
Reference in a new issue