Commit 754d1243 authored by Giridhar Malavali's avatar Giridhar Malavali Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Clear the MBX_INTR_WAIT flag when the mailbox time-out happens. 



Signed-off-by: default avatarGiridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: default avatarSaurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent bb6a4df6

drivers/scsi/qla2xxx/qla_dbg.c

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
 * |             Level            |   Last Value Used  |     Holes	|

 * ----------------------------------------------------------------------

 * | Module Init and Probe        |       0x014f       | 0x4b,0xba,0xfa |

 * | Mailbox commands             |       0x1179       | 0x111a-0x111b  |

 * | Mailbox commands             |       0x117a       | 0x111a-0x111b  |

 * |                              |                    | 0x1155-0x1158  |

 * | Device Discovery             |       0x2095       | 0x2020-0x2022, |

 * |                              |                    | 0x2016         |

drivers/scsi/qla2xxx/qla_mbx.c

+8 −2
Original line number Diff line number Diff line
@@ -177,8 +177,14 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) 
			WRT_REG_WORD(&reg->isp.hccr, HCCR_SET_HOST_INT);

		spin_unlock_irqrestore(&ha->hardware_lock, flags);



		wait_for_completion_timeout(&ha->mbx_intr_comp, mcp->tov * HZ);



		if (!wait_for_completion_timeout(&ha->mbx_intr_comp,

		    mcp->tov * HZ)) {

			ql_dbg(ql_dbg_mbx, vha, 0x117a,

			    "cmd=%x Timeout.\n", command);

			spin_lock_irqsave(&ha->hardware_lock, flags);

			clear_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);

			spin_unlock_irqrestore(&ha->hardware_lock, flags);

		}

	} else {

		ql_dbg(ql_dbg_mbx, vha, 0x1011,

		    "Cmd=%x Polling Mode.\n", command);

CRA Git | Maintained and supported by SUSTech CRA and CCSE