Commit 0af5d708 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley

[SCSI] lpfc: prep for fc host dev loss tmo support

This removes the driver's get_host_def_dev_loss_tmo
callback and just has the driver set the dev loss
using the fc class fc_host_dev_loss_tmo macro like is
done for other fc params.

It also adds compat support for the driver's existing
dev loss and nodev sysfs and modparams.
Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent d2b5f10e
...@@ -2159,6 +2159,11 @@ lpfc_nodev_tmo_set(struct lpfc_vport *vport, int val) ...@@ -2159,6 +2159,11 @@ lpfc_nodev_tmo_set(struct lpfc_vport *vport, int val)
if (val >= LPFC_MIN_DEVLOSS_TMO && val <= LPFC_MAX_DEVLOSS_TMO) { if (val >= LPFC_MIN_DEVLOSS_TMO && val <= LPFC_MAX_DEVLOSS_TMO) {
vport->cfg_nodev_tmo = val; vport->cfg_nodev_tmo = val;
vport->cfg_devloss_tmo = val; vport->cfg_devloss_tmo = val;
/*
* For compat: set the fc_host dev loss so new rports
* will get the value.
*/
fc_host_dev_loss_tmo(lpfc_shost_from_vport(vport)) = val;
lpfc_update_rport_devloss_tmo(vport); lpfc_update_rport_devloss_tmo(vport);
return 0; return 0;
} }
...@@ -2208,6 +2213,7 @@ lpfc_devloss_tmo_set(struct lpfc_vport *vport, int val) ...@@ -2208,6 +2213,7 @@ lpfc_devloss_tmo_set(struct lpfc_vport *vport, int val)
vport->cfg_nodev_tmo = val; vport->cfg_nodev_tmo = val;
vport->cfg_devloss_tmo = val; vport->cfg_devloss_tmo = val;
vport->dev_loss_tmo_changed = 1; vport->dev_loss_tmo_changed = 1;
fc_host_dev_loss_tmo(lpfc_shost_from_vport(vport)) = val;
lpfc_update_rport_devloss_tmo(vport); lpfc_update_rport_devloss_tmo(vport);
return 0; return 0;
} }
...@@ -4370,14 +4376,6 @@ lpfc_get_starget_port_name(struct scsi_target *starget) ...@@ -4370,14 +4376,6 @@ lpfc_get_starget_port_name(struct scsi_target *starget)
ndlp ? wwn_to_u64(ndlp->nlp_portname.u.wwn) : 0; 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 * lpfc_set_rport_loss_tmo - Set the rport dev loss tmo
* @rport: fc rport address. * @rport: fc rport address.
...@@ -4486,7 +4484,6 @@ struct fc_function_template lpfc_transport_functions = { ...@@ -4486,7 +4484,6 @@ struct fc_function_template lpfc_transport_functions = {
.get_host_fabric_name = lpfc_get_host_fabric_name, .get_host_fabric_name = lpfc_get_host_fabric_name,
.show_host_fabric_name = 1, .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 * The LPFC driver treats linkdown handling as target loss events
* so there are no sysfs handlers for link_down_tmo. * so there are no sysfs handlers for link_down_tmo.
...@@ -4554,7 +4551,6 @@ struct fc_function_template lpfc_vport_transport_functions = { ...@@ -4554,7 +4551,6 @@ struct fc_function_template lpfc_vport_transport_functions = {
.get_host_fabric_name = lpfc_get_host_fabric_name, .get_host_fabric_name = lpfc_get_host_fabric_name,
.show_host_fabric_name = 1, .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 * The LPFC driver treats linkdown handling as target loss events
* so there are no sysfs handlers for link_down_tmo. * so there are no sysfs handlers for link_down_tmo.
......
...@@ -2817,6 +2817,8 @@ void lpfc_host_attrib_init(struct Scsi_Host *shost) ...@@ -2817,6 +2817,8 @@ void lpfc_host_attrib_init(struct Scsi_Host *shost)
(((uint32_t) vport->fc_sparam.cmn.bbRcvSizeMsb & 0x0F) << 8) | (((uint32_t) vport->fc_sparam.cmn.bbRcvSizeMsb & 0x0F) << 8) |
(uint32_t) vport->fc_sparam.cmn.bbRcvSizeLsb; (uint32_t) vport->fc_sparam.cmn.bbRcvSizeLsb;
fc_host_dev_loss_tmo(shost) = vport->cfg_devloss_tmo;
/* This value is also unchanging */ /* This value is also unchanging */
memset(fc_host_active_fc4s(shost), 0, memset(fc_host_active_fc4s(shost), 0,
sizeof(fc_host_active_fc4s(shost))); sizeof(fc_host_active_fc4s(shost)));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment