scsi: ibmvfc: Add support for target_wwpn field in v2 MADs and vfcFrame

Several version 2 MADs and the version 2 vfcFrame structures introduced a
new targetWWPN field for better identification of a target over the
scsi_id.

Set this field and MAD versioning fields when the VIOS advertises the
IBMVFC_HANDLE_VF_WWPN capability.

Link: https://lore.kernel.org/r/20201118011104.296999-6-tyreld@linux.ibm.com
Acked-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 3427c686fb10802da8a72d0b6c1764de90783311..83627e11e85eb76138047ef0ad6514de33cb0284 100644 (file)
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -1685,9 +1685,10 @@ static struct ibmvfc_cmd *ibmvfc_init_vfc_cmd(struct ibmvfc_event *evt, struct s
        size_t offset;
 
        memset(vfc_cmd, 0, sizeof(*vfc_cmd));
-       if (ibmvfc_check_caps(vhost, IBMVFC_HANDLE_VF_WWPN))
+       if (ibmvfc_check_caps(vhost, IBMVFC_HANDLE_VF_WWPN)) {
                offset = offsetof(struct ibmvfc_cmd, v2.rsp);
-       else
+               vfc_cmd->target_wwpn = cpu_to_be64(rport->port_name);
+       } else
                offset = offsetof(struct ibmvfc_cmd, v1.rsp);
        vfc_cmd->resp.va = cpu_to_be64(be64_to_cpu(evt->crq.ioba) + offset);
        vfc_cmd->resp.len = cpu_to_be32(sizeof(*rsp));
@@ -2064,6 +2065,7 @@ out:
 static int ibmvfc_reset_device(struct scsi_device *sdev, int type, char *desc)
 {
        struct ibmvfc_host *vhost = shost_priv(sdev->host);
+       struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
        struct ibmvfc_cmd *tmf;
        struct ibmvfc_event *evt = NULL;
        union ibmvfc_iu rsp_iu;
@@ -2081,6 +2083,8 @@ static int ibmvfc_reset_device(struct scsi_device *sdev, int type, char *desc)
                iu = ibmvfc_get_fcp_iu(vhost, tmf);
 
                tmf->flags = cpu_to_be16((IBMVFC_NO_MEM_DESC | IBMVFC_TMF));
+               if (ibmvfc_check_caps(vhost, IBMVFC_HANDLE_VF_WWPN))
+                       tmf->target_wwpn = cpu_to_be64(rport->port_name);
                iu->tmf_flags = type;
                evt->sync_iu = &rsp_iu;
 
@@ -2271,7 +2275,12 @@ static int ibmvfc_cancel_all(struct scsi_device *sdev, int type)
 
                tmf = &evt->iu.tmf;
                memset(tmf, 0, sizeof(*tmf));
-               tmf->common.version = cpu_to_be32(1);
+               if (ibmvfc_check_caps(vhost, IBMVFC_HANDLE_VF_WWPN)) {
+                       tmf->common.version = cpu_to_be32(2);
+                       tmf->target_wwpn = cpu_to_be64(rport->port_name);
+               } else {
+                       tmf->common.version = cpu_to_be32(1);
+               }
                tmf->common.opcode = cpu_to_be32(IBMVFC_TMF_MAD);
                tmf->common.length = cpu_to_be16(sizeof(*tmf));
                tmf->scsi_id = cpu_to_be64(rport->port_id);
@@ -2371,6 +2380,7 @@ static int ibmvfc_match_evt(struct ibmvfc_event *evt, void *match)
 static int ibmvfc_abort_task_set(struct scsi_device *sdev)
 {
        struct ibmvfc_host *vhost = shost_priv(sdev->host);
+       struct fc_rport *rport = starget_to_rport(scsi_target(sdev));
        struct ibmvfc_cmd *tmf;
        struct ibmvfc_event *evt, *found_evt;
        union ibmvfc_iu rsp_iu;
@@ -2402,6 +2412,8 @@ static int ibmvfc_abort_task_set(struct scsi_device *sdev)
                tmf = ibmvfc_init_vfc_cmd(evt, sdev);
                iu = ibmvfc_get_fcp_iu(vhost, tmf);
 
+               if (ibmvfc_check_caps(vhost, IBMVFC_HANDLE_VF_WWPN))
+                       tmf->target_wwpn = cpu_to_be64(rport->port_name);
                iu->tmf_flags = IBMVFC_ABORT_TASK_SET;
                tmf->flags = cpu_to_be16((IBMVFC_NO_MEM_DESC | IBMVFC_TMF));
                evt->sync_iu = &rsp_iu;
@@ -3483,7 +3495,12 @@ static void ibmvfc_tgt_send_prli(struct ibmvfc_target *tgt)
        evt->tgt = tgt;
        prli = &evt->iu.prli;
        memset(prli, 0, sizeof(*prli));
-       prli->common.version = cpu_to_be32(1);
+       if (ibmvfc_check_caps(vhost, IBMVFC_HANDLE_VF_WWPN)) {
+               prli->common.version = cpu_to_be32(2);
+               prli->target_wwpn = cpu_to_be64(tgt->wwpn);
+       } else {
+               prli->common.version = cpu_to_be32(1);
+       }
        prli->common.opcode = cpu_to_be32(IBMVFC_PROCESS_LOGIN);
        prli->common.length = cpu_to_be16(sizeof(*prli));
        prli->scsi_id = cpu_to_be64(tgt->scsi_id);
@@ -3586,7 +3603,12 @@ static void ibmvfc_tgt_send_plogi(struct ibmvfc_target *tgt)
        evt->tgt = tgt;
        plogi = &evt->iu.plogi;
        memset(plogi, 0, sizeof(*plogi));
-       plogi->common.version = cpu_to_be32(1);
+       if (ibmvfc_check_caps(vhost, IBMVFC_HANDLE_VF_WWPN)) {
+               plogi->common.version = cpu_to_be32(2);
+               plogi->target_wwpn = cpu_to_be64(tgt->wwpn);
+       } else {
+               plogi->common.version = cpu_to_be32(1);
+       }
        plogi->common.opcode = cpu_to_be32(IBMVFC_PORT_LOGIN);
        plogi->common.length = cpu_to_be16(sizeof(*plogi));
        plogi->scsi_id = cpu_to_be64(tgt->scsi_id);
@@ -3986,7 +4008,12 @@ static void ibmvfc_adisc_timeout(struct timer_list *t)
        evt->tgt = tgt;
        tmf = &evt->iu.tmf;
        memset(tmf, 0, sizeof(*tmf));
-       tmf->common.version = cpu_to_be32(1);
+       if (ibmvfc_check_caps(vhost, IBMVFC_HANDLE_VF_WWPN)) {
+               tmf->common.version = cpu_to_be32(2);
+               tmf->target_wwpn = cpu_to_be64(tgt->wwpn);
+       } else {
+               tmf->common.version = cpu_to_be32(1);
+       }
        tmf->common.opcode = cpu_to_be32(IBMVFC_TMF_MAD);
        tmf->common.length = cpu_to_be16(sizeof(*tmf));
        tmf->scsi_id = cpu_to_be64(tgt->scsi_id);