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

Commit 143beaa8 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[SCSI] lpfc: do not reset dev_loss_tmo in slave callout 



This fixes a bug where the driver was resetting the
rport dev_loss_tmo when devices were added by adding
support for the get_host_def_dev_loss_tmo callout.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent a74bdf46

drivers/scsi/lpfc/lpfc_attr.c

+10 −0
Original line number Diff line number Diff line
@@ -4370,6 +4370,14 @@ lpfc_get_starget_port_name(struct scsi_target *starget) 
		ndlp ? wwn_to_u64(ndlp->nlp_portname.u.wwn) : 0;

}



static void

lpfc_get_host_def_loss_tmo(struct Scsi_Host *shost)

{

        struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;



	fc_host_def_dev_loss_tmo(shost) = vport->cfg_devloss_tmo;

}



/**

 * lpfc_set_rport_loss_tmo - Set the rport dev loss tmo

 * @rport: fc rport address.
@@ -4478,6 +4486,7 @@ struct fc_function_template lpfc_transport_functions = { 
	.get_host_fabric_name = lpfc_get_host_fabric_name,

	.show_host_fabric_name = 1,



	.get_host_def_dev_loss_tmo = lpfc_get_host_def_loss_tmo,

	/*

	 * The LPFC driver treats linkdown handling as target loss events

	 * so there are no sysfs handlers for link_down_tmo.
@@ -4545,6 +4554,7 @@ struct fc_function_template lpfc_vport_transport_functions = { 
	.get_host_fabric_name = lpfc_get_host_fabric_name,

	.show_host_fabric_name = 1,



	.get_host_def_dev_loss_tmo = lpfc_get_host_def_loss_tmo,

	/*

	 * The LPFC driver treats linkdown handling as target loss events

	 * so there are no sysfs handlers for link_down_tmo.

drivers/scsi/lpfc/lpfc_scsi.c

+0 −10
Original line number Diff line number Diff line
@@ -3656,7 +3656,6 @@ lpfc_slave_alloc(struct scsi_device *sdev) 
 *

 * This routine configures following items

 *   - Tag command queuing support for @sdev if supported.

 *   - Dev loss time out value of fc_rport.

 *   - Enable SLI polling for fcp ring if ENABLE_FCP_RING_POLLING flag is set.

 *

 * Return codes:
@@ -3667,21 +3666,12 @@ lpfc_slave_configure(struct scsi_device *sdev) 
{

	struct lpfc_vport *vport = (struct lpfc_vport *) sdev->host->hostdata;

	struct lpfc_hba   *phba = vport->phba;

	struct fc_rport   *rport = starget_to_rport(sdev->sdev_target);



	if (sdev->tagged_supported)

		scsi_activate_tcq(sdev, vport->cfg_lun_queue_depth);

	else

		scsi_deactivate_tcq(sdev, vport->cfg_lun_queue_depth);



	/*

	 * Initialize the fc transport attributes for the target

	 * containing this scsi device.  Also note that the driver's

	 * target pointer is stored in the starget_data for the

	 * driver's sysfs entry point functions.

	 */

	rport->dev_loss_tmo = vport->cfg_devloss_tmo;



	if (phba->cfg_poll & ENABLE_FCP_RING_POLLING) {

		lpfc_sli_handle_fast_ring_event(phba,

			&phba->sli.ring[LPFC_FCP_RING], HA_R0RE_REQ);