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

Commit 00a537b8 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Correct usage of inconsistent timeout values while issuing ELS commands. 



The original code would incorrectly hardcode ELS timeout values
rather than using the traditional '2 * r_a_tov' value.  In some
cases, the hardcoded values would be larger than the
mailbox-command-timeout and result in a needless BIG_HAMMER (ISP
reset), the typical recovery mechanism employed in such cases.

The second defect in the original code was in the assignment of
the default 'ha->r_a_tov' to twice the traditional value.
Correct this by setting the value to 10 seconds.

Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 3e8ce320

drivers/scsi/qla2xxx/qla_gs.c

+5 −5
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ qla2x00_prep_ms_iocb(scsi_qla_host_t *ha, uint32_t req_size, uint32_t rsp_size) 
	ms_pkt->entry_count = 1;

	SET_TARGET_ID(ha, ms_pkt->loop_id, SIMPLE_NAME_SERVER);

	ms_pkt->control_flags = __constant_cpu_to_le16(CF_READ | CF_HEAD_TAG);

	ms_pkt->timeout = __constant_cpu_to_le16(25);

	ms_pkt->timeout = cpu_to_le16(ha->r_a_tov / 10 * 2);

	ms_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);

	ms_pkt->total_dsd_count = __constant_cpu_to_le16(2);

	ms_pkt->rsp_bytecount = cpu_to_le32(rsp_size);
@@ -75,7 +75,7 @@ qla24xx_prep_ms_iocb(scsi_qla_host_t *ha, uint32_t req_size, uint32_t rsp_size) 
	ct_pkt->entry_type = CT_IOCB_TYPE;

	ct_pkt->entry_count = 1;

	ct_pkt->nport_handle = __constant_cpu_to_le16(NPH_SNS);

	ct_pkt->timeout = __constant_cpu_to_le16(25);

	ct_pkt->timeout = cpu_to_le16(ha->r_a_tov / 10 * 2);

	ct_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);

	ct_pkt->rsp_dsd_count = __constant_cpu_to_le16(1);

	ct_pkt->rsp_byte_count = cpu_to_le32(rsp_size);
@@ -1144,7 +1144,7 @@ qla2x00_prep_ms_fdmi_iocb(scsi_qla_host_t *ha, uint32_t req_size, 
	ms_pkt->entry_count = 1;

	SET_TARGET_ID(ha, ms_pkt->loop_id, ha->mgmt_svr_loop_id);

	ms_pkt->control_flags = __constant_cpu_to_le16(CF_READ | CF_HEAD_TAG);

	ms_pkt->timeout = __constant_cpu_to_le16(59);

	ms_pkt->timeout = cpu_to_le16(ha->r_a_tov / 10 * 2);

	ms_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);

	ms_pkt->total_dsd_count = __constant_cpu_to_le16(2);

	ms_pkt->rsp_bytecount = cpu_to_le32(rsp_size);
@@ -1181,7 +1181,7 @@ qla24xx_prep_ms_fdmi_iocb(scsi_qla_host_t *ha, uint32_t req_size, 
	ct_pkt->entry_type = CT_IOCB_TYPE;

	ct_pkt->entry_count = 1;

	ct_pkt->nport_handle = cpu_to_le16(ha->mgmt_svr_loop_id);

	ct_pkt->timeout = __constant_cpu_to_le16(59);

	ct_pkt->timeout = cpu_to_le16(ha->r_a_tov / 10 * 2);

	ct_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);

	ct_pkt->rsp_dsd_count = __constant_cpu_to_le16(1);

	ct_pkt->rsp_byte_count = cpu_to_le32(rsp_size);
@@ -1761,7 +1761,7 @@ qla24xx_prep_ms_fm_iocb(scsi_qla_host_t *ha, uint32_t req_size, 
	ct_pkt->entry_type = CT_IOCB_TYPE;

	ct_pkt->entry_count = 1;

	ct_pkt->nport_handle = cpu_to_le16(ha->mgmt_svr_loop_id);

	ct_pkt->timeout = __constant_cpu_to_le16(59);

	ct_pkt->timeout = cpu_to_le16(ha->r_a_tov / 10 * 2);

	ct_pkt->cmd_dsd_count = __constant_cpu_to_le16(1);

	ct_pkt->rsp_dsd_count = __constant_cpu_to_le16(1);

	ct_pkt->rsp_byte_count = cpu_to_le32(rsp_size);

drivers/scsi/qla2xxx/qla_init.c

+4 −4
Original line number Diff line number Diff line
@@ -1733,8 +1733,8 @@ qla2x00_nvram_config(scsi_qla_host_t *ha) 
	ha->login_timeout = nv->login_timeout;

	icb->login_timeout = nv->login_timeout;



	/* Set minimum RATOV to 200 tenths of a second. */

	ha->r_a_tov = 200;

	/* Set minimum RATOV to 100 tenths of a second. */

	ha->r_a_tov = 100;



	ha->loop_reset_delay = nv->reset_delay;
@@ -3645,8 +3645,8 @@ qla24xx_nvram_config(scsi_qla_host_t *ha) 
	ha->login_timeout = le16_to_cpu(nv->login_timeout);

	icb->login_timeout = cpu_to_le16(nv->login_timeout);



	/* Set minimum RATOV to 200 tenths of a second. */

	ha->r_a_tov = 200;

	/* Set minimum RATOV to 100 tenths of a second. */

	ha->r_a_tov = 100;



	ha->loop_reset_delay = nv->reset_delay;

drivers/scsi/qla2xxx/qla_mbx.c

+1 −1
Original line number Diff line number Diff line
@@ -2206,7 +2206,7 @@ qla24xx_abort_target(fc_port_t *fcport) 
	tsk->p.tsk.entry_type = TSK_MGMT_IOCB_TYPE;

	tsk->p.tsk.entry_count = 1;

	tsk->p.tsk.nport_handle = cpu_to_le16(fcport->loop_id);

	tsk->p.tsk.timeout = __constant_cpu_to_le16(25);

	tsk->p.tsk.timeout = cpu_to_le16(ha->r_a_tov / 10 * 2);

	tsk->p.tsk.control_flags = __constant_cpu_to_le32(TCF_TARGET_RESET);

	tsk->p.tsk.port_id[0] = fcport->d_id.b.al_pa;

	tsk->p.tsk.port_id[1] = fcport->d_id.b.area;