[SCSI] lpfc 8.3.28: Add Loopback support for SLI4 adapters

- Add Basic support for SLI4 Loopback.
  (CR 124951, 125766, 124951, 125843, 125832, 125843)
- Added missing protection in setting/clearing of phba->link_flag bit
  field (CR 125994)
- Use link type and link number obtained from READ_CONFIG mailbox
  command. (CR 126264)

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, 20 insertions, 8 deletions

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index e27cb44b3ec2..23a27592388c 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -3619,8 +3619,8 @@ lpfc_sli_brdready(struct lpfc_hba *phba, uint32_t mask)
  * lpfc_reset_barrier - Make HBA ready for HBA reset
  * @phba: Pointer to HBA context object.
  *
- * This function is called before resetting an HBA. This
- * function requests HBA to quiesce DMAs before a reset.
+ * This function is called before resetting an HBA. This function is called
+ * with hbalock held and requests HBA to quiesce DMAs before a reset.
  **/
 void lpfc_reset_barrier(struct lpfc_hba *phba)
 {
@@ -6267,9 +6267,12 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)
                         goto out_unset_queue;
                 }
         } else if (phba->cfg_suppress_link_up == LPFC_INITIALIZE_LINK) {
-                rc = phba->lpfc_hba_init_link(phba, MBX_NOWAIT);
-                if (rc)
-                        goto out_unset_queue;
+                /* don't perform init_link on SLI4 FC port loopback test */
+                if (!(phba->link_flag & LS_LOOPBACK_MODE)) {
+                        rc = phba->lpfc_hba_init_link(phba, MBX_NOWAIT);
+                        if (rc)
+                                goto out_unset_queue;
+                }
         }
         mempool_free(mboxq, phba->mbox_mem_pool);
         return rc;
@@ -7540,6 +7543,7 @@ lpfc_sli4_bpl2sgl(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq,
         struct ulp_bde64 *bpl = NULL;
         struct ulp_bde64 bde;
         struct sli4_sge *sgl  = NULL;
+        struct lpfc_dmabuf *dmabuf;
         IOCB_t *icmd;
         int numBdes = 0;
         int i = 0;
@@ -7558,9 +7562,12 @@ lpfc_sli4_bpl2sgl(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq,
                  * have not been byteswapped yet so there is no
                  * need to swap them back.
                  */
-                bpl  = (struct ulp_bde64 *)
-                        ((struct lpfc_dmabuf *)piocbq->context3)->virt;
+                if (piocbq->context3)
+                        dmabuf = (struct lpfc_dmabuf *)piocbq->context3;
+                else
+                        return xritag;
 
+                bpl  = (struct ulp_bde64 *)dmabuf->virt;
                 if (!bpl)
                         return xritag;
 
@@ -7670,6 +7677,7 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
         struct ulp_bde64 bde;
         struct lpfc_nodelist *ndlp;
         uint32_t *pcmd;
+        uint32_t if_type;
 
         fip = phba->hba_flag & HBA_FIP_SUPPORT;
         /* The fcp commands will set command type */
@@ -7743,7 +7751,9 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
                                         >> LPFC_FIP_ELS_ID_SHIFT);
                 pcmd = (uint32_t *) (((struct lpfc_dmabuf *)
                                         iocbq->context2)->virt);
-                if (phba->fc_topology == LPFC_TOPOLOGY_LOOP) {
+                if_type = bf_get(lpfc_sli_intf_if_type,
+                                        &phba->sli4_hba.sli_intf);
+                if (if_type == LPFC_SLI_INTF_IF_TYPE_2) {
                         if (pcmd && (*pcmd == ELS_CMD_FLOGI ||
                                 *pcmd == ELS_CMD_SCR ||
                                 *pcmd == ELS_CMD_PLOGI)) {
@@ -7776,6 +7786,8 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,
                 /* The entire sequence is transmitted for this IOCB */
                 xmit_len = total_len;
                 cmnd = CMD_XMIT_SEQUENCE64_CR;
+                if (phba->link_flag & LS_LOOPBACK_MODE)
+                        bf_set(wqe_xo, &wqe->xmit_sequence.wge_ctl, 1);
         case CMD_XMIT_SEQUENCE64_CR:
                 /* word3 iocb=io_tag32 wqe=reserved */
                 wqe->xmit_sequence.rsvd3 = 0;