Commit 47ff4c51 authored by James Smart's avatar James Smart Committed by Martin K. Petersen
Browse files

scsi: lpfc: Enable common send_io interface for SCSI and NVMe 

To set up common use by the SCSI and NVMe I/O paths, create a new routine
that issues FCP I/O commands which can be used by either protocol.  The new
routine addresses SLI-3 vs SLI-4 differences within its implementation.

Replace the (SLI-3 centric) iocb routine in the SCSI path with this new
WQE-centric common routine.

Link: https://lore.kernel.org/r/20201115192646.12977-13-james.smart@broadcom.com


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 <james.smart@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 840a4701

drivers/scsi/lpfc/lpfc.h

+3 −0
Original line number Diff line number Diff line
@@ -669,6 +669,9 @@ struct lpfc_hba { 
	int (*__lpfc_sli_issue_iocb)

		(struct lpfc_hba *, uint32_t,

		 struct lpfc_iocbq *, uint32_t);

	int (*__lpfc_sli_issue_fcp_io)

		(struct lpfc_hba *phba, uint32_t ring_number,

		 struct lpfc_iocbq *piocb, uint32_t flag);

	void (*__lpfc_sli_release_iocbq)(struct lpfc_hba *,

			 struct lpfc_iocbq *);

	int (*lpfc_hba_down_post)(struct lpfc_hba *phba);

drivers/scsi/lpfc/lpfc_crtn.h

+2 −0
Original line number Diff line number Diff line
@@ -320,6 +320,8 @@ void lpfc_sli_def_mbox_cmpl(struct lpfc_hba *, LPFC_MBOXQ_t *); 
void lpfc_sli4_unreg_rpi_cmpl_clr(struct lpfc_hba *, LPFC_MBOXQ_t *);

int lpfc_sli_issue_iocb(struct lpfc_hba *, uint32_t,

			struct lpfc_iocbq *, uint32_t);

int lpfc_sli_issue_fcp_io(struct lpfc_hba *phba, uint32_t ring_number,

			  struct lpfc_iocbq *piocb, uint32_t flag);

int lpfc_sli4_issue_wqe(struct lpfc_hba *phba, struct lpfc_sli4_hdw_queue *qp,

			struct lpfc_iocbq *pwqe);

struct lpfc_sglq *__lpfc_clear_active_sglq(struct lpfc_hba *phba, uint16_t xri);

drivers/scsi/lpfc/lpfc_scsi.c

+4 −2
Original line number Diff line number Diff line
@@ -4642,8 +4642,10 @@ lpfc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *cmnd) 
	if (unlikely(phba->hdwqstat_on & LPFC_CHECK_SCSI_IO))

		this_cpu_inc(phba->sli4_hba.c_stat->xmt_io);

#endif

	err = lpfc_sli_issue_iocb(phba, LPFC_FCP_RING,

				  &lpfc_cmd->cur_iocbq, SLI_IOCB_RET_IOCB);

	/* Issue I/O to adapter */

	err = lpfc_sli_issue_fcp_io(phba, LPFC_FCP_RING,

				    &lpfc_cmd->cur_iocbq,

				    SLI_IOCB_RET_IOCB);

#ifdef CONFIG_SCSI_LPFC_DEBUG_FS

	if (start) {

		lpfc_cmd->ts_cmd_start = start;

drivers/scsi/lpfc/lpfc_sli.c

+87 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ lpfc_sli4_wq_put(struct lpfc_queue *q, union lpfc_wqe128 *wqe) 
	/* sanity check on queue memory */

	if (unlikely(!q))

		return -ENOMEM;









	temp_wqe = lpfc_sli4_qe(q, q->host_index);

















	/* If the host has not yet processed the next entry then we are done */








@@ -10228,6 +10229,71 @@ lpfc_sli4_iocb2wqe(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq,







	return 0;









}

















/**









 * __lpfc_sli_issue_fcp_io_s3 - SLI3 device for sending fcp io iocb









 * @phba: Pointer to HBA context object.









 * @ring_number: SLI ring number to issue wqe on.









 * @piocb: Pointer to command iocb.









 * @flag: Flag indicating if this command can be put into txq.









 *









 * __lpfc_sli_issue_fcp_io_s3 is wrapper function to invoke lockless func to









 * send  an iocb command to an HBA with SLI-4 interface spec.









 *









 * This function takes the hbalock before invoking the lockless version.









 * The function will return success after it successfully submit the wqe to









 * firmware or after adding to the txq.









 **/









static int









__lpfc_sli_issue_fcp_io_s3(struct lpfc_hba *phba, uint32_t ring_number,









			   struct lpfc_iocbq *piocb, uint32_t flag)









{









	unsigned long iflags;









	int rc;

















	spin_lock_irqsave(&phba->hbalock, iflags);









	rc = __lpfc_sli_issue_iocb(phba, ring_number, piocb, flag);









	spin_unlock_irqrestore(&phba->hbalock, iflags);

















	return rc;









}

















/**









 * __lpfc_sli_issue_fcp_io_s4 - SLI4 device for sending fcp io wqe









 * @phba: Pointer to HBA context object.









 * @ring_number: SLI ring number to issue wqe on.









 * @piocb: Pointer to command iocb.









 * @flag: Flag indicating if this command can be put into txq.









 *









 * __lpfc_sli_issue_fcp_io_s4 is used by other functions in the driver to issue









 * an wqe command to an HBA with SLI-4 interface spec.









 *









 * This function is a lockless version. The function will return success









 * after it successfully submit the wqe to firmware or after adding to the









 * txq.









 **/









static int









__lpfc_sli_issue_fcp_io_s4(struct lpfc_hba *phba, uint32_t ring_number,









			   struct lpfc_iocbq *piocb, uint32_t flag)









{









	struct lpfc_sli_ring *pring;









	struct lpfc_queue *eq;









	unsigned long iflags;









	int rc;

















	eq = phba->sli4_hba.hdwq[piocb->hba_wqidx].hba_eq;

















	pring = lpfc_sli4_calc_ring(phba, piocb);









	if (unlikely(pring == NULL))









		return IOCB_ERROR;

















	spin_lock_irqsave(&pring->ring_lock, iflags);









	rc = __lpfc_sli_issue_iocb(phba, ring_number, piocb, flag);









	spin_unlock_irqrestore(&pring->ring_lock, iflags);

















	lpfc_sli4_poll_eq(eq, LPFC_POLL_FASTPATH);









	return rc;









}

















/**









 * __lpfc_sli_issue_iocb_s4 - SLI4 device lockless ver of lpfc_sli_issue_iocb









 * @phba: Pointer to HBA context object.








@@ -10324,6 +10390,25 @@ __lpfc_sli_issue_iocb_s4(struct lpfc_hba *phba, uint32_t ring_number,







	return 0;









}

















/**









 * lpfc_sli_issue_fcp_io - Wrapper func for issuing fcp i/o









 *









 * This routine wraps the actual fcp i/o function for issusing WQE for sli-4









 * or IOCB for sli-3  function.









 * pointer from the lpfc_hba struct.









 *









 * Return codes:









 * IOCB_ERROR - Error









 * IOCB_SUCCESS - Success









 * IOCB_BUSY - Busy









 **/









int









lpfc_sli_issue_fcp_io(struct lpfc_hba *phba, uint32_t ring_number,









		      struct lpfc_iocbq *piocb, uint32_t flag)









{









	return phba->__lpfc_sli_issue_fcp_io(phba, ring_number, piocb, flag);









}

















/*









 * __lpfc_sli_issue_iocb - Wrapper func of lockless version for issuing iocb









 *








@@ -10359,10 +10444,12 @@ lpfc_sli_api_table_setup(struct lpfc_hba *phba, uint8_t dev_grp)







	case LPFC_PCI_DEV_LP:









		phba->__lpfc_sli_issue_iocb = __lpfc_sli_issue_iocb_s3;









		phba->__lpfc_sli_release_iocbq = __lpfc_sli_release_iocbq_s3;









		phba->__lpfc_sli_issue_fcp_io = __lpfc_sli_issue_fcp_io_s3;









		break;









	case LPFC_PCI_DEV_OC:









		phba->__lpfc_sli_issue_iocb = __lpfc_sli_issue_iocb_s4;









		phba->__lpfc_sli_release_iocbq = __lpfc_sli_release_iocbq_s4;









		phba->__lpfc_sli_issue_fcp_io = __lpfc_sli_issue_fcp_io_s4;









		break;









	default:









		lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,