[SCSI] lpfc 8.3.25: Adapter Interface fixes and changes

Adapter Interface fixes and changes

- Modify the macro field from lpfc_init_vpi_vpi to lpfc_init_vfi_vpi
- Add the new CQE_CODE_RECEIVE_V1 CQE Code, add code in the driver to handle
  the new Code the same as the CQE_CODE_RECEIVE code except that there are
  two new checks for this code that will cause the driver to use the new V1
  macros for rq_id and fcf_id.
- Fix a bug in lpfc_prep_seq() where the size out of the first CQE was
  ONLY being used, even though multiple dmabufs make up the sequence,
  each have their own CQE with potentially different sizes.
- Fix bug in lpfc_bsg_ct_unsol_event() where the ulpContext and ulpWord[3]
  fields of the XMIT_SEQUENCE64_CX IOCB were being calculated incorrectly.
- Do physical to logical translation before indexing into the active
  XRI array.
- Populate physical vpi in the iocb data structure.
- Put the current accumulated total in each IOCB in the chain as we are
  walking thru then. The last IOCB in the chain should have the total
  length of the sequence.

Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 8675aa20642a..f46378fb802c 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -960,8 +960,10 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                                                     evt_dat->immed_dat].oxid,
                                                 phba->ct_ctx[
                                                     evt_dat->immed_dat].SID);
+                        phba->ct_ctx[evt_dat->immed_dat].rxid =
+                                piocbq->iocb.ulpContext;
                         phba->ct_ctx[evt_dat->immed_dat].oxid =
-                                                piocbq->iocb.ulpContext;
+                                piocbq->iocb.unsli3.rcvsli3.ox_id;
                         phba->ct_ctx[evt_dat->immed_dat].SID =
                                 piocbq->iocb.un.rcvels.remoteID;
                         phba->ct_ctx[evt_dat->immed_dat].flags = UNSOL_VALID;
@@ -1312,7 +1314,8 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct fc_bsg_job *job, uint32_t tag,
                         rc = IOCB_ERROR;
                         goto issue_ct_rsp_exit;
                 }
-                icmd->ulpContext = phba->ct_ctx[tag].oxid;
+                icmd->ulpContext = phba->ct_ctx[tag].rxid;
+                icmd->unsli3.rcvsli3.ox_id = phba->ct_ctx[tag].oxid;
                 ndlp = lpfc_findnode_did(phba->pport, phba->ct_ctx[tag].SID);
                 if (!ndlp) {
                         lpfc_printf_log(phba, KERN_WARNING, LOG_ELS,
@@ -1337,9 +1340,7 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct fc_bsg_job *job, uint32_t tag,
                         goto issue_ct_rsp_exit;
                 }
 
-                icmd->un.ulpWord[3] = ndlp->nlp_rpi;
-                if (phba->sli_rev == LPFC_SLI_REV4)
-                        icmd->ulpContext =
+                icmd->un.ulpWord[3] =
                                 phba->sli4_hba.rpi_ids[ndlp->nlp_rpi];
 
                 /* The exchange is done, mark the entry as invalid */
@@ -1351,8 +1352,8 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct fc_bsg_job *job, uint32_t tag,
 
         /* Xmit CT response on exchange <xid> */
         lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                        "2722 Xmit CT response on exchange x%x Data: x%x x%x\n",
-                        icmd->ulpContext, icmd->ulpIoTag, phba->link_state);
+                "2722 Xmit CT response on exchange x%x Data: x%x x%x x%x\n",
+                icmd->ulpContext, icmd->ulpIoTag, tag, phba->link_state);
 
         ctiocb->iocb_cmpl = NULL;
         ctiocb->iocb_flag |= LPFC_IO_LIBDFC;