Commit 24e1f056 authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Resolve some cleanup issues following abort path refactoring 

Refactoring and consolidation of abort paths:

 - lpfc_sli4_abort_fcp_cmpl() and lpfc_sli_abort_fcp_cmpl() are combined
  into a single generic lpfc_sli_abort_fcp_cmpl() routine.  Thus, remove
  extraneous lpfc_sli4_abort_fcp_cmpl() prototype declaration.

 - lpfc_nvme_abort_fcreq_cmpl() abort completion routine is called with a
  mismatched argument type.  This may result in misleading log message
  content.  Update to the correct argument type of lpfc_iocbq instead of
  lpfc_wcqe_complete.  The lpfc_wcqe_complete should be derived from the
  lpfc_iocbq structure.

Link: https://lore.kernel.org/r/20220603174329.63777-3-jsmart2021@gmail.com


Fixes: 31a59f75 ("scsi: lpfc: SLI path split: Refactor Abort paths")
Cc: <stable@vger.kernel.org> # v5.18
Co-developed-by: default avatarJustin Tee <justin.tee@broadcom.com>
Signed-off-by: default avatarJustin Tee <justin.tee@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 44ba9786

drivers/scsi/lpfc/lpfc_crtn.h

+1 −3
Original line number Diff line number Diff line
@@ -420,8 +420,6 @@ int lpfc_sli_issue_iocb_wait(struct lpfc_hba *, uint32_t, 
			     uint32_t);

void lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *, struct lpfc_iocbq *,

			     struct lpfc_iocbq *);

void lpfc_sli4_abort_fcp_cmpl(struct lpfc_hba *h, struct lpfc_iocbq *i,

			      struct lpfc_wcqe_complete *w);



void lpfc_sli_free_hbq(struct lpfc_hba *, struct hbq_dmabuf *);
@@ -630,7 +628,7 @@ void lpfc_nvmet_invalidate_host(struct lpfc_hba *phba, 
			struct lpfc_nodelist *ndlp);

void lpfc_nvme_abort_fcreq_cmpl(struct lpfc_hba *phba,

				struct lpfc_iocbq *cmdiocb,

				struct lpfc_wcqe_complete *abts_cmpl);

				struct lpfc_iocbq *rspiocb);

void lpfc_create_multixri_pools(struct lpfc_hba *phba);

void lpfc_create_destroy_pools(struct lpfc_hba *phba);

void lpfc_move_xri_pvt_to_pbl(struct lpfc_hba *phba, u32 hwqid);

drivers/scsi/lpfc/lpfc_nvme.c

+4 −2
Original line number Diff line number Diff line
@@ -1787,7 +1787,7 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport, 
 * lpfc_nvme_abort_fcreq_cmpl - Complete an NVME FCP abort request.

 * @phba: Pointer to HBA context object

 * @cmdiocb: Pointer to command iocb object.

 * @abts_cmpl: Pointer to wcqe complete object.

 * @rspiocb: Pointer to response iocb object.

 *

 * This is the callback function for any NVME FCP IO that was aborted.

 *
@@ -1796,8 +1796,10 @@ lpfc_nvme_fcp_io_submit(struct nvme_fc_local_port *pnvme_lport, 
 **/

void

lpfc_nvme_abort_fcreq_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,

			   struct lpfc_wcqe_complete *abts_cmpl)

			   struct lpfc_iocbq *rspiocb)

{

	struct lpfc_wcqe_complete *abts_cmpl = &rspiocb->wcqe_cmpl;



	lpfc_printf_log(phba, KERN_INFO, LOG_NVME,

			"6145 ABORT_XRI_CN completing on rpi x%x "

			"original iotag x%x, abort cmd iotag x%x "