[SCSI] bfa: Support vport symbolic name change from sysfs.

- Implemented the FC function template set_vport_symbolic_name entry
  point to modify the vport symbolic name from sysfs.
- Implemented support to send RSPN_ID to switch to register the
  modified vport symbolic name.

Signed-off-by: Krishna Gudipati <kgudipat@brocade.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/bfa/bfa_fcs.h b/drivers/scsi/bfa/bfa_fcs.h
index 51c9e134571986399fe1a6b9d1738ac3c36f876e..050a7e9004347208a82419b3cd8b2e50c46af859 100644 (file)
--- a/drivers/scsi/bfa/bfa_fcs.h
+++ b/drivers/scsi/bfa/bfa_fcs.h
@@ -338,6 +338,8 @@ void            bfa_fcs_lport_ns_init(struct bfa_fcs_lport_s *vport);
 void            bfa_fcs_lport_ns_offline(struct bfa_fcs_lport_s *vport);
 void            bfa_fcs_lport_ns_online(struct bfa_fcs_lport_s *vport);
 void            bfa_fcs_lport_ns_query(struct bfa_fcs_lport_s *port);
+void           bfa_fcs_lport_ns_util_send_rspn_id(void *cbarg,
+                               struct bfa_fcxp_s *fcxp_alloced);
 void            bfa_fcs_lport_scn_init(struct bfa_fcs_lport_s *vport);
 void            bfa_fcs_lport_scn_offline(struct bfa_fcs_lport_s *vport);
 void            bfa_fcs_lport_scn_online(struct bfa_fcs_lport_s *vport);

diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
index bcc4966e8ba484d6f6772e6dbca499336ead788a..f8e801747ea73c5b3a2aac233a9ff99eaa6bb5b5 100644 (file)
--- a/drivers/scsi/bfa/bfa_fcs_lport.c
+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
@@ -4355,6 +4355,69 @@ bfa_fcs_lport_ns_boot_target_disc(bfa_fcs_lport_t *port)
        }
 }
 
+void
+bfa_fcs_lport_ns_util_send_rspn_id(void *cbarg, struct bfa_fcxp_s *fcxp_alloced)
+{
+       struct bfa_fcs_lport_ns_s *ns = cbarg;
+       struct bfa_fcs_lport_s *port = ns->port;
+       struct fchs_s fchs;
+       struct bfa_fcxp_s *fcxp;
+       u8 symbl[256];
+       u8 *psymbl = &symbl[0];
+       int len;
+
+       if (!bfa_sm_cmp_state(port, bfa_fcs_lport_sm_online))
+               return;
+
+       /* Avoid sending RSPN in the following states. */
+       if (bfa_sm_cmp_state(ns, bfa_fcs_lport_ns_sm_offline) ||
+           bfa_sm_cmp_state(ns, bfa_fcs_lport_ns_sm_plogi_sending) ||
+           bfa_sm_cmp_state(ns, bfa_fcs_lport_ns_sm_plogi) ||
+           bfa_sm_cmp_state(ns, bfa_fcs_lport_ns_sm_plogi_retry) ||
+           bfa_sm_cmp_state(ns, bfa_fcs_lport_ns_sm_rspn_id_retry))
+               return;
+
+       memset(symbl, 0, sizeof(symbl));
+       bfa_trc(port->fcs, port->port_cfg.pwwn);
+
+       fcxp = fcxp_alloced ? fcxp_alloced : bfa_fcs_fcxp_alloc(port->fcs);
+       if (!fcxp) {
+               port->stats.ns_rspnid_alloc_wait++;
+               bfa_fcs_fcxp_alloc_wait(port->fcs->bfa, &ns->fcxp_wqe,
+                               bfa_fcs_lport_ns_util_send_rspn_id, ns);
+               return;
+       }
+
+       ns->fcxp = fcxp;
+
+       if (port->vport) {
+               /*
+                * For Vports, we append the vport's port symbolic name
+                * to that of the base port.
+                */
+               strncpy((char *)psymbl, (char *)&(bfa_fcs_lport_get_psym_name
+                       (bfa_fcs_get_base_port(port->fcs))),
+                       strlen((char *)&bfa_fcs_lport_get_psym_name(
+                       bfa_fcs_get_base_port(port->fcs))));
+
+               /* Ensure we have a null terminating string. */
+               ((char *)psymbl)[strlen((char *)&bfa_fcs_lport_get_psym_name(
+                bfa_fcs_get_base_port(port->fcs)))] = 0;
+
+               strncat((char *)psymbl,
+                       (char *)&(bfa_fcs_lport_get_psym_name(port)),
+                       strlen((char *)&bfa_fcs_lport_get_psym_name(port)));
+       }
+
+       len = fc_rspnid_build(&fchs, bfa_fcxp_get_reqbuf(fcxp),
+                             bfa_fcs_lport_get_fcid(port), 0, psymbl);
+
+       bfa_fcxp_send(fcxp, NULL, port->fabric->vf_id, port->lp_tag, BFA_FALSE,
+                     FC_CLASS_3, len, &fchs, NULL, NULL, FC_MAX_PDUSZ, 0);
+
+       port->stats.ns_rspnid_sent++;
+}
+
 /*
  * FCS SCN
  */

diff --git a/drivers/scsi/bfa/bfad_attr.c b/drivers/scsi/bfa/bfad_attr.c
index b83927440171810b4d6442c992c2c01a5db4558d..1d18a803cff05c374c9489ed55b8028d6c493c56 100644 (file)
--- a/drivers/scsi/bfa/bfad_attr.c
+++ b/drivers/scsi/bfa/bfad_attr.c
@@ -587,6 +587,37 @@ bfad_im_vport_disable(struct fc_vport *fc_vport, bool disable)
        return 0;
 }
 
+void
+bfad_im_vport_set_symbolic_name(struct fc_vport *fc_vport)
+{
+       struct bfad_vport_s *vport = (struct bfad_vport_s *)fc_vport->dd_data;
+       struct bfad_im_port_s *im_port =
+                       (struct bfad_im_port_s *)vport->drv_port.im_port;
+       struct bfad_s *bfad = im_port->bfad;
+       struct Scsi_Host *vshost = vport->drv_port.im_port->shost;
+       char *sym_name = fc_vport->symbolic_name;
+       struct bfa_fcs_vport_s *fcs_vport;
+       wwn_t   pwwn;
+       unsigned long flags;
+
+       u64_to_wwn(fc_host_port_name(vshost), (u8 *)&pwwn);
+
+       spin_lock_irqsave(&bfad->bfad_lock, flags);
+       fcs_vport = bfa_fcs_vport_lookup(&bfad->bfa_fcs, 0, pwwn);
+       spin_unlock_irqrestore(&bfad->bfad_lock, flags);
+
+       if (fcs_vport == NULL)
+               return;
+
+       spin_lock_irqsave(&bfad->bfad_lock, flags);
+       if (strlen(sym_name) > 0) {
+               strcpy(fcs_vport->lport.port_cfg.sym_name.symname, sym_name);
+               bfa_fcs_lport_ns_util_send_rspn_id(
+                       BFA_FCS_GET_NS_FROM_PORT((&fcs_vport->lport)), NULL);
+       }
+       spin_unlock_irqrestore(&bfad->bfad_lock, flags);
+}
+
 struct fc_function_template bfad_im_fc_function_template = {
 
        /* Target dynamic attributes */
@@ -640,6 +671,7 @@ struct fc_function_template bfad_im_fc_function_template = {
        .vport_create = bfad_im_vport_create,
        .vport_delete = bfad_im_vport_delete,
        .vport_disable = bfad_im_vport_disable,
+       .set_vport_symbolic_name = bfad_im_vport_set_symbolic_name,
        .bsg_request = bfad_im_bsg_request,
        .bsg_timeout = bfad_im_bsg_timeout,
 };