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

Commit 0c411222 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.42: Fixed issue of task management commands having a fixed timeout 



Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 164cecd1

drivers/scsi/lpfc/lpfc.h

+1 −0
Original line number Diff line number Diff line
@@ -708,6 +708,7 @@ struct lpfc_hba { 
	uint32_t cfg_multi_ring_type;

	uint32_t cfg_poll;

	uint32_t cfg_poll_tmo;

	uint32_t cfg_task_mgmt_tmo;

	uint32_t cfg_use_msi;

	uint32_t cfg_fcp_imax;

	uint32_t cfg_fcp_cpu_map;

drivers/scsi/lpfc/lpfc_attr.c

+8 −0
Original line number Diff line number Diff line
@@ -4115,6 +4115,12 @@ LPFC_ATTR_RW(poll_tmo, 10, 1, 255, 
	     "Milliseconds driver will wait between polling FCP ring");



/*

# lpfc_task_mgmt_tmo: Maximum time to wait for task management commands

# to complete in seconds. Value range is [5,180], default value is 60.

*/

LPFC_ATTR_RW(task_mgmt_tmo, 60, 5, 180,

	     "Maximum time to wait for task management commands to complete");

/*

# lpfc_use_msi: Use MSI (Message Signaled Interrupts) in systems that

#		support this feature

#       0  = MSI disabled
@@ -4300,6 +4306,7 @@ struct device_attribute *lpfc_hba_attrs[] = { 
	&dev_attr_issue_reset,

	&dev_attr_lpfc_poll,

	&dev_attr_lpfc_poll_tmo,

	&dev_attr_lpfc_task_mgmt_tmo,

	&dev_attr_lpfc_use_msi,

	&dev_attr_lpfc_fcp_imax,

	&dev_attr_lpfc_fcp_cpu_map,
@@ -5279,6 +5286,7 @@ lpfc_get_cfgparam(struct lpfc_hba *phba) 
	lpfc_topology_init(phba, lpfc_topology);

	lpfc_link_speed_init(phba, lpfc_link_speed);

	lpfc_poll_tmo_init(phba, lpfc_poll_tmo);

	lpfc_task_mgmt_tmo_init(phba, lpfc_task_mgmt_tmo);

	lpfc_enable_npiv_init(phba, lpfc_enable_npiv);

	lpfc_fcf_failover_policy_init(phba, lpfc_fcf_failover_policy);

	lpfc_enable_rrq_init(phba, lpfc_enable_rrq);

drivers/scsi/lpfc/lpfc_scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -5015,7 +5015,7 @@ lpfc_send_taskmgmt(struct lpfc_vport *vport, struct lpfc_rport_data *rdata, 
	lpfc_cmd = lpfc_get_scsi_buf(phba, rdata->pnode);

	if (lpfc_cmd == NULL)

		return FAILED;

	lpfc_cmd->timeout = 60;

	lpfc_cmd->timeout = phba->cfg_task_mgmt_tmo;

	lpfc_cmd->rdata = rdata;



	status = lpfc_scsi_prep_task_mgmt_cmd(vport, lpfc_cmd, lun_id,