Commit 7294a9bc authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Fix broken SLI4 abort path 

There was a merge error in ther 14.2.0.0 patches that resulted in the SLI4
path using the SLI3 issue_abort_iotag() routine. This resulted in txcmplq
corruption.

Fix to use the SLI4 routine when SLI4.

Link: https://lore.kernel.org/r/20220323205545.81814-2-jsmart2021@gmail.com


Fixes: 31a59f75 ("scsi: lpfc: SLI path split: Refactor Abort paths")
Cc: <stable@vger.kernel.org> # v5.2+
Co-developed-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4f3beb36

drivers/scsi/lpfc/lpfc_scsi.c

+7 −5
Original line number Diff line number Diff line
@@ -5929,13 +5929,15 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd) 
	}



	lpfc_cmd->waitq = &waitq;

	if (phba->sli_rev == LPFC_SLI_REV4)

	if (phba->sli_rev == LPFC_SLI_REV4) {

		spin_unlock(&pring_s4->ring_lock);

	else

		ret_val = lpfc_sli4_issue_abort_iotag(phba, iocb,

						      lpfc_sli_abort_fcp_cmpl);

	} else {

		pring = &phba->sli.sli3_ring[LPFC_FCP_RING];



		ret_val = lpfc_sli_issue_abort_iotag(phba, pring, iocb,

						     lpfc_sli_abort_fcp_cmpl);

	}



	/* Make sure HBA is alive */

	lpfc_issue_hb_tmo(phba);