[SCSI] lpfc 8.3.21: RRQ Implementation fixes

RRQ Implementation fixes

- Added checks to prevent a call to findnode_did in clr_active_rrq
- Added the del_sync_timer call for the rrq_tmr to the stop_hba_timers routine.
- Added a check in __lpfc_set_active_rrq for the driver unloading to prevent
  adding an rrq when the driver is being removed.
- Add code to scsi_iocb_cmpl to check for the remote stop and add the rrq.
- Added the same check to els retry.
- Added code to compare the source did in the els rrq to the vports did and
  chose the right exchange ID.
- Initialize the start_cmd pointer to indicate when we have looped through
  all of the scsi buffers.
- Remove the need for the lock around the clearing of the active bit in the
  rrq.
- Added code to clean the els and fcp xri aborted list and remove the all of
  the RRQs for a deleted vport.

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

1 files changed, 46 insertions, 6 deletions

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 58e1a55d97f..c6d01f63f55 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -2816,9 +2816,17 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 
         switch (irsp->ulpStatus) {
         case IOSTAT_FCP_RSP_ERROR:
+                break;
         case IOSTAT_REMOTE_STOP:
+                if (phba->sli_rev == LPFC_SLI_REV4) {
+                        /* This IO was aborted by the target, we don't
+                         * know the rxid and because we did not send the
+                         * ABTS we cannot generate and RRQ.
+                         */
+                        lpfc_set_rrq_active(phba, ndlp,
+                                         cmdiocb->sli4_xritag, 0, 0);
+                }
                 break;
-
         case IOSTAT_LOCAL_REJECT:
                 switch ((irsp->un.ulpWord[4] & 0xff)) {
                 case IOERR_LOOP_OPEN_FAILURE:
@@ -4014,28 +4022,34 @@ lpfc_els_clear_rrq(struct lpfc_vport *vport,
         uint8_t *pcmd;
         struct RRQ *rrq;
         uint16_t rxid;
+        uint16_t xri;
         struct lpfc_node_rrq *prrq;
 
 
         pcmd = (uint8_t *) (((struct lpfc_dmabuf *) iocb->context2)->virt);
         pcmd += sizeof(uint32_t);
         rrq = (struct RRQ *)pcmd;
-        rxid = bf_get(rrq_oxid, rrq);
+        rrq->rrq_exchg = be32_to_cpu(rrq->rrq_exchg);
+        rxid = be16_to_cpu(bf_get(rrq_rxid, rrq));
 
         lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
                         "2883 Clear RRQ for SID:x%x OXID:x%x RXID:x%x"
                         " x%x x%x\n",
-                        bf_get(rrq_did, rrq),
-                        bf_get(rrq_oxid, rrq),
+                        be32_to_cpu(bf_get(rrq_did, rrq)),
+                        be16_to_cpu(bf_get(rrq_oxid, rrq)),
                         rxid,
                         iocb->iotag, iocb->iocb.ulpContext);
 
         lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_RSP,
                 "Clear RRQ:  did:x%x flg:x%x exchg:x%.08x",
                 ndlp->nlp_DID, ndlp->nlp_flag, rrq->rrq_exchg);
-        prrq = lpfc_get_active_rrq(vport, rxid, ndlp->nlp_DID);
+        if (vport->fc_myDID == be32_to_cpu(bf_get(rrq_did, rrq)))
+                xri = be16_to_cpu(bf_get(rrq_oxid, rrq));
+        else
+                xri = rxid;
+        prrq = lpfc_get_active_rrq(vport, xri, ndlp->nlp_DID);
         if (prrq)
-                lpfc_clr_rrq_active(phba, rxid, prrq);
+                lpfc_clr_rrq_active(phba, xri, prrq);
         return;
 }
 
@@ -7583,6 +7597,32 @@ void lpfc_fabric_abort_hba(struct lpfc_hba *phba)
 }
 
 /**
+ * lpfc_sli4_vport_delete_els_xri_aborted -Remove all ndlp references for vport
+ * @vport: pointer to lpfc vport data structure.
+ *
+ * This routine is invoked by the vport cleanup for deletions and the cleanup
+ * for an ndlp on removal.
+ **/
+void
+lpfc_sli4_vport_delete_els_xri_aborted(struct lpfc_vport *vport)
+{
+        struct lpfc_hba *phba = vport->phba;
+        struct lpfc_sglq *sglq_entry = NULL, *sglq_next = NULL;
+        unsigned long iflag = 0;
+
+        spin_lock_irqsave(&phba->hbalock, iflag);
+        spin_lock(&phba->sli4_hba.abts_sgl_list_lock);
+        list_for_each_entry_safe(sglq_entry, sglq_next,
+                        &phba->sli4_hba.lpfc_abts_els_sgl_list, list) {
+                if (sglq_entry->ndlp && sglq_entry->ndlp->vport == vport)
+                        sglq_entry->ndlp = NULL;
+        }
+        spin_unlock(&phba->sli4_hba.abts_sgl_list_lock);
+        spin_unlock_irqrestore(&phba->hbalock, iflag);
+        return;
+}
+
+/**
  * lpfc_sli4_els_xri_aborted - Slow-path process of els xri abort
  * @phba: pointer to lpfc hba data structure.
  * @axri: pointer to the els xri abort wcqe structure.