From: James Smart <jsmart2021@gmail.com>

Date: Tue, 31 Jul 2018 17:23:18 -0700

Subject: [PATCH] scsi: lpfc: Fix ELS abort on SLI-3 adapters

References: bsc#1102658

Git-commit: faa832e97a0c0d79838c3a6521a473d870217053

Patch-mainline: v4.19-rc1

For ABORT_XRI_CN command, firmware identifies XRI to abort by IOTAG and RPI

combination. For ELS aborts, driver specifies IOTAG correctly but RPI is

not specified.

Fix by setting RPI in WQE.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>

Signed-off-by: James Smart <james.smart@broadcom.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Signed-off-by: Hannes Reinecke <hare@suse.de>

---

 drivers/scsi/lpfc/lpfc_nportdisc.c |  3 +++

 drivers/scsi/lpfc/lpfc_sli.c       | 16 ++++++++++++++--

 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c

index 1f0a7d7dbc54..843e765db86d 100644

--- a/drivers/scsi/lpfc/lpfc_nportdisc.c

+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c

@@ -1062,6 +1062,9 @@ lpfc_rcv_logo_plogi_issue(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,

 {

 	struct lpfc_iocbq *cmdiocb = (struct lpfc_iocbq *) arg;

+	/* Retrieve RPI from LOGO IOCB. RPI is used for CMD_ABORT_XRI_CN */

+	if (vport->phba->sli_rev == LPFC_SLI_REV3)

+		ndlp->nlp_rpi = cmdiocb->iocb.ulpIoTag;

 				/* software abort outstanding PLOGI */

 	lpfc_els_abort(vport->phba, ndlp);

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c

index 72500dcb13a9..9830bdb6e072 100644

--- a/drivers/scsi/lpfc/lpfc_sli.c

+++ b/drivers/scsi/lpfc/lpfc_sli.c

@@ -10703,6 +10703,12 @@ lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,

 		spin_lock_irq(&phba->hbalock);

 		if (phba->sli_rev < LPFC_SLI_REV4) {

+			if (irsp->ulpCommand == CMD_ABORT_XRI_CX &&

+			    irsp->ulpStatus == IOSTAT_LOCAL_REJECT &&

+			    irsp->un.ulpWord[4] == IOERR_ABORT_REQUESTED) {

+				spin_unlock_irq(&phba->hbalock);

+				goto release_iocb;

+			}

 			if (abort_iotag != 0 &&

 				abort_iotag <= phba->sli.last_iotag)

 				abort_iocb =

@@ -10724,6 +10730,7 @@ lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,

 		spin_unlock_irq(&phba->hbalock);

 	}

+release_iocb:

 	lpfc_sli_release_iocbq(phba, cmdiocb);

 	return;

 }

@@ -10780,6 +10787,7 @@ lpfc_sli_abort_iotag_issue(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,

 	IOCB_t *iabt = NULL;

 	int retval;

 	unsigned long iflags;

+	struct lpfc_nodelist *ndlp;

 	lockdep_assert_held(&phba->hbalock);

@@ -10810,9 +10818,13 @@ lpfc_sli_abort_iotag_issue(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,

 	if (phba->sli_rev == LPFC_SLI_REV4) {

 		iabt->un.acxri.abortIoTag = cmdiocb->sli4_xritag;

 		iabt->un.acxri.abortContextTag = cmdiocb->iotag;

-	}

-	else

+	} else {

 		iabt->un.acxri.abortIoTag = icmd->ulpIoTag;

+		if (pring->ringno == LPFC_ELS_RING) {

+			ndlp = (struct lpfc_nodelist *)(cmdiocb->context1);

+			iabt->un.acxri.abortContextTag = ndlp->nlp_rpi;

+		}

+	}

 	iabt->ulpLe = 1;

 	iabt->ulpClass = icmd->ulpClass;

-- 

2.12.3