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

scsi: lpfc: SLI path split: Refactor lpfc_iocbq 

Currently, SLI3 and SLI4 data paths use the same lpfc_iocbq structure.
This is a "common" structure but many of the components refer to sli-rev
specific entities which can lead the developer astray as to what they
actually mean, should be set to, or when they should be used.

This first patch prepares the lpfc_iocbq structure so that elements common
to both SLI3 and SLI4 data paths are more appropriately named, making it
clear they apply generically.

Fieldnames based on 'iocb' (sli3) or 'wqe' (sli4) which are actually
generic to the paths are renamed to 'cmd':

 - iocb_flag is renamed to cmd_flag

 - lpfc_vmid_iocb_tag is renamed to lpfc_vmid_tag

 - fabric_iocb_cmpl is renamed to fabric_cmd_cmpl

 - wait_iocb_cmpl is renamed to wait_cmd_cmpl

 - iocb_cmpl and wqe_cmpl are combined and renamed to cmd_cmpl

 - rsvd2 member is renamed to num_bdes due to pre-existing usage

The structure name itself will retain the iocb reference as changing to a
more relevant "job" or "cmd" title induces many hundreds of line changes
for only a name change.

lpfc_post_buffer is also renamed to lpfc_sli3_post_buffer to indicate use
in the SLI3 path only.

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


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 dc264641

drivers/scsi/lpfc/lpfc_bsg.c

+25 −25
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ lpfc_bsg_send_mgmt_cmd_cmp(struct lpfc_hba *phba, 


	/* Close the timeout handler abort window */

	spin_lock_irqsave(&phba->hbalock, flags);

	cmdiocbq->iocb_flag &= ~LPFC_IO_CMD_OUTSTANDING;

	cmdiocbq->cmd_flag &= ~LPFC_IO_CMD_OUTSTANDING;

	spin_unlock_irqrestore(&phba->hbalock, flags);



	iocb = &dd_data->context_un.iocb;
@@ -481,11 +481,11 @@ lpfc_bsg_send_mgmt_cmd(struct bsg_job *job) 
	cmd->ulpOwner = OWN_CHIP;

	cmdiocbq->vport = phba->pport;

	cmdiocbq->context3 = bmp;

	cmdiocbq->iocb_flag |= LPFC_IO_LIBDFC;

	cmdiocbq->cmd_flag |= LPFC_IO_LIBDFC;

	timeout = phba->fc_ratov * 2;

	cmd->ulpTimeout = timeout;



	cmdiocbq->iocb_cmpl = lpfc_bsg_send_mgmt_cmd_cmp;

	cmdiocbq->cmd_cmpl = lpfc_bsg_send_mgmt_cmd_cmp;

	cmdiocbq->context1 = dd_data;

	cmdiocbq->context2 = cmp;

	cmdiocbq->context3 = bmp;
@@ -516,9 +516,9 @@ lpfc_bsg_send_mgmt_cmd(struct bsg_job *job) 
	if (iocb_stat == IOCB_SUCCESS) {

		spin_lock_irqsave(&phba->hbalock, flags);

		/* make sure the I/O had not been completed yet */

		if (cmdiocbq->iocb_flag & LPFC_IO_LIBDFC) {

		if (cmdiocbq->cmd_flag & LPFC_IO_LIBDFC) {

			/* open up abort window to timeout handler */

			cmdiocbq->iocb_flag |= LPFC_IO_CMD_OUTSTANDING;

			cmdiocbq->cmd_flag |= LPFC_IO_CMD_OUTSTANDING;

		}

		spin_unlock_irqrestore(&phba->hbalock, flags);

		return 0; /* done for now */
@@ -600,7 +600,7 @@ lpfc_bsg_rport_els_cmp(struct lpfc_hba *phba, 


	/* Close the timeout handler abort window */

	spin_lock_irqsave(&phba->hbalock, flags);

	cmdiocbq->iocb_flag &= ~LPFC_IO_CMD_OUTSTANDING;

	cmdiocbq->cmd_flag &= ~LPFC_IO_CMD_OUTSTANDING;

	spin_unlock_irqrestore(&phba->hbalock, flags);



	rsp = &rspiocbq->iocb;
@@ -726,10 +726,10 @@ lpfc_bsg_rport_els(struct bsg_job *job) 
		cmdiocbq->iocb.ulpContext = phba->sli4_hba.rpi_ids[rpi];

	else

		cmdiocbq->iocb.ulpContext = rpi;

	cmdiocbq->iocb_flag |= LPFC_IO_LIBDFC;

	cmdiocbq->cmd_flag |= LPFC_IO_LIBDFC;

	cmdiocbq->context1 = dd_data;

	cmdiocbq->context_un.ndlp = ndlp;

	cmdiocbq->iocb_cmpl = lpfc_bsg_rport_els_cmp;

	cmdiocbq->cmd_cmpl = lpfc_bsg_rport_els_cmp;

	dd_data->type = TYPE_IOCB;

	dd_data->set_job = job;

	dd_data->context_un.iocb.cmdiocbq = cmdiocbq;
@@ -757,9 +757,9 @@ lpfc_bsg_rport_els(struct bsg_job *job) 
	if (rc == IOCB_SUCCESS) {

		spin_lock_irqsave(&phba->hbalock, flags);

		/* make sure the I/O had not been completed/released */

		if (cmdiocbq->iocb_flag & LPFC_IO_LIBDFC) {

		if (cmdiocbq->cmd_flag & LPFC_IO_LIBDFC) {

			/* open up abort window to timeout handler */

			cmdiocbq->iocb_flag |= LPFC_IO_CMD_OUTSTANDING;

			cmdiocbq->cmd_flag |= LPFC_IO_CMD_OUTSTANDING;

		}

		spin_unlock_irqrestore(&phba->hbalock, flags);

		return 0; /* done for now */
@@ -1053,7 +1053,7 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
							lpfc_in_buf_free(phba,

									dmabuf);

						} else {

							lpfc_post_buffer(phba,

							lpfc_sli3_post_buffer(phba,

									 pring,

									 1);

						}
@@ -1061,7 +1061,7 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
					default:

						if (!(phba->sli3_options &

						      LPFC_SLI3_HBQ_ENABLED))

							lpfc_post_buffer(phba,

							lpfc_sli3_post_buffer(phba,

									 pring,

									 1);

						break;
@@ -1395,7 +1395,7 @@ lpfc_issue_ct_rsp_cmp(struct lpfc_hba *phba, 


	/* Close the timeout handler abort window */

	spin_lock_irqsave(&phba->hbalock, flags);

	cmdiocbq->iocb_flag &= ~LPFC_IO_CMD_OUTSTANDING;

	cmdiocbq->cmd_flag &= ~LPFC_IO_CMD_OUTSTANDING;

	spin_unlock_irqrestore(&phba->hbalock, flags);



	ndlp = dd_data->context_un.iocb.ndlp;
@@ -1549,13 +1549,13 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct bsg_job *job, uint32_t tag, 
		"2722 Xmit CT response on exchange x%x Data: x%x x%x x%x\n",

		icmd->ulpContext, icmd->ulpIoTag, tag, phba->link_state);



	ctiocb->iocb_flag |= LPFC_IO_LIBDFC;

	ctiocb->cmd_flag |= LPFC_IO_LIBDFC;

	ctiocb->vport = phba->pport;

	ctiocb->context1 = dd_data;

	ctiocb->context2 = cmp;

	ctiocb->context3 = bmp;

	ctiocb->context_un.ndlp = ndlp;

	ctiocb->iocb_cmpl = lpfc_issue_ct_rsp_cmp;

	ctiocb->cmd_cmpl = lpfc_issue_ct_rsp_cmp;



	dd_data->type = TYPE_IOCB;

	dd_data->set_job = job;
@@ -1582,9 +1582,9 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct bsg_job *job, uint32_t tag, 
	if (rc == IOCB_SUCCESS) {

		spin_lock_irqsave(&phba->hbalock, flags);

		/* make sure the I/O had not been completed/released */

		if (ctiocb->iocb_flag & LPFC_IO_LIBDFC) {

		if (ctiocb->cmd_flag & LPFC_IO_LIBDFC) {

			/* open up abort window to timeout handler */

			ctiocb->iocb_flag |= LPFC_IO_CMD_OUTSTANDING;

			ctiocb->cmd_flag |= LPFC_IO_CMD_OUTSTANDING;

		}

		spin_unlock_irqrestore(&phba->hbalock, flags);

		return 0; /* done for now */
@@ -2713,9 +2713,9 @@ static int lpfcdiag_loop_get_xri(struct lpfc_hba *phba, uint16_t rpi, 
	cmd->ulpClass = CLASS3;

	cmd->ulpContext = rpi;



	cmdiocbq->iocb_flag |= LPFC_IO_LIBDFC;

	cmdiocbq->cmd_flag |= LPFC_IO_LIBDFC;

	cmdiocbq->vport = phba->pport;

	cmdiocbq->iocb_cmpl = NULL;

	cmdiocbq->cmd_cmpl = NULL;



	iocb_stat = lpfc_sli_issue_iocb_wait(phba, LPFC_ELS_RING, cmdiocbq,

				rspiocbq,
@@ -3286,10 +3286,10 @@ lpfc_bsg_diag_loopback_run(struct bsg_job *job) 
		cmdiocbq->sli4_xritag = NO_XRI;

		cmd->unsli3.rcvsli3.ox_id = 0xffff;

	}

	cmdiocbq->iocb_flag |= LPFC_IO_LIBDFC;

	cmdiocbq->iocb_flag |= LPFC_IO_LOOPBACK;

	cmdiocbq->cmd_flag |= LPFC_IO_LIBDFC;

	cmdiocbq->cmd_flag |= LPFC_IO_LOOPBACK;

	cmdiocbq->vport = phba->pport;

	cmdiocbq->iocb_cmpl = NULL;

	cmdiocbq->cmd_cmpl = NULL;

	iocb_stat = lpfc_sli_issue_iocb_wait(phba, LPFC_ELS_RING, cmdiocbq,

					     rspiocbq, (phba->fc_ratov * 2) +

					     LPFC_DRVR_TIMEOUT);
@@ -5273,11 +5273,11 @@ lpfc_menlo_cmd(struct bsg_job *job) 
	cmd->ulpClass = CLASS3;

	cmd->ulpOwner = OWN_CHIP;

	cmd->ulpLe = 1; /* Limited Edition */

	cmdiocbq->iocb_flag |= LPFC_IO_LIBDFC;

	cmdiocbq->cmd_flag |= LPFC_IO_LIBDFC;

	cmdiocbq->vport = phba->pport;

	/* We want the firmware to timeout before we do */

	cmd->ulpTimeout = MENLO_TIMEOUT - 5;

	cmdiocbq->iocb_cmpl = lpfc_bsg_menlo_cmd_cmp;

	cmdiocbq->cmd_cmpl = lpfc_bsg_menlo_cmd_cmp;

	cmdiocbq->context1 = dd_data;

	cmdiocbq->context2 = cmp;

	cmdiocbq->context3 = bmp;
@@ -6001,7 +6001,7 @@ lpfc_bsg_timeout(struct bsg_job *job) 


		spin_lock_irqsave(&phba->hbalock, flags);

		/* make sure the I/O abort window is still open */

		if (!(cmdiocb->iocb_flag & LPFC_IO_CMD_OUTSTANDING)) {

		if (!(cmdiocb->cmd_flag & LPFC_IO_CMD_OUTSTANDING)) {

			spin_unlock_irqrestore(&phba->hbalock, flags);

			return -EAGAIN;

		}

drivers/scsi/lpfc/lpfc_crtn.h

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ int lpfc_sli4_refresh_params(struct lpfc_hba *phba); 
int lpfc_hba_down_prep(struct lpfc_hba *);

int lpfc_hba_down_post(struct lpfc_hba *);

void lpfc_hba_init(struct lpfc_hba *, uint32_t *);

int lpfc_post_buffer(struct lpfc_hba *, struct lpfc_sli_ring *, int);

int lpfc_sli3_post_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, int cnt);

void lpfc_decode_firmware_rev(struct lpfc_hba *, char *, int);

int lpfc_online(struct lpfc_hba *);

void lpfc_unblock_mgmt_io(struct lpfc_hba *);

drivers/scsi/lpfc/lpfc_ct.c

+4 −4
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ lpfc_ct_reject_event(struct lpfc_nodelist *ndlp, 
	cmdiocbq->context1 = lpfc_nlp_get(ndlp);

	cmdiocbq->context2 = (uint8_t *)mp;

	cmdiocbq->context3 = (uint8_t *)bmp;

	cmdiocbq->iocb_cmpl = lpfc_ct_unsol_cmpl;

	cmdiocbq->cmd_cmpl = lpfc_ct_unsol_cmpl;

	icmd->ulpContext = rx_id;  /* Xri / rx_id */

	icmd->unsli3.rcvsli3.ox_id = ox_id;

	icmd->un.ulpWord[3] =
@@ -370,7 +370,7 @@ lpfc_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
		/* Not enough posted buffers; Try posting more buffers */

		phba->fc_stat.NoRcvBuf++;

		if (!(phba->sli3_options & LPFC_SLI3_HBQ_ENABLED))

			lpfc_post_buffer(phba, pring, 2);

			lpfc_sli3_post_buffer(phba, pring, 2);

		return;

	}
@@ -447,7 +447,7 @@ lpfc_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
				lpfc_ct_unsol_buffer(phba, iocbq, mp, size);

				lpfc_in_buf_free(phba, mp);

			}

			lpfc_post_buffer(phba, pring, i);

			lpfc_sli3_post_buffer(phba, pring, i);

		}

		list_del(&head);

	}
@@ -652,7 +652,7 @@ lpfc_gen_req(struct lpfc_vport *vport, struct lpfc_dmabuf *bmp, 
			 "Data: x%x x%x\n",

			 ndlp->nlp_DID, icmd->ulpIoTag,

			 vport->port_state);

	geniocb->iocb_cmpl = cmpl;

	geniocb->cmd_cmpl = cmpl;

	geniocb->drvrTimeout = icmd->ulpTimeout + LPFC_DRVR_TIMEOUT;

	geniocb->vport = vport;

	geniocb->retry = retry;

drivers/scsi/lpfc/lpfc_els.c

+69 −70
Original line number Diff line number Diff line
@@ -192,23 +192,23 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp, 
		 (elscmd == ELS_CMD_LOGO)))

		switch (elscmd) {

		case ELS_CMD_FLOGI:

		elsiocb->iocb_flag |=

		elsiocb->cmd_flag |=

			((LPFC_ELS_ID_FLOGI << LPFC_FIP_ELS_ID_SHIFT)

					& LPFC_FIP_ELS_ID_MASK);

		break;

		case ELS_CMD_FDISC:

		elsiocb->iocb_flag |=

		elsiocb->cmd_flag |=

			((LPFC_ELS_ID_FDISC << LPFC_FIP_ELS_ID_SHIFT)

					& LPFC_FIP_ELS_ID_MASK);

		break;

		case ELS_CMD_LOGO:

		elsiocb->iocb_flag |=

		elsiocb->cmd_flag |=

			((LPFC_ELS_ID_LOGO << LPFC_FIP_ELS_ID_SHIFT)

					& LPFC_FIP_ELS_ID_MASK);

		break;

		}

	else

		elsiocb->iocb_flag &= ~LPFC_FIP_ELS_ID_MASK;

		elsiocb->cmd_flag &= ~LPFC_FIP_ELS_ID_MASK;



	icmd = &elsiocb->iocb;
@@ -1251,10 +1251,10 @@ lpfc_cmpl_els_link_down(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
			"6445 ELS completes after LINK_DOWN: "

			" Status %x/%x cmd x%x flg x%x\n",

			irsp->ulpStatus, irsp->un.ulpWord[4], cmd,

			cmdiocb->iocb_flag);

			cmdiocb->cmd_flag);



	if (cmdiocb->iocb_flag & LPFC_IO_FABRIC) {

		cmdiocb->iocb_flag &= ~LPFC_IO_FABRIC;

	if (cmdiocb->cmd_flag & LPFC_IO_FABRIC) {

		cmdiocb->cmd_flag &= ~LPFC_IO_FABRIC;

		atomic_dec(&phba->fabric_iocb_count);

	}

	lpfc_els_free_iocb(phba, cmdiocb);
@@ -1369,7 +1369,7 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	phba->fc_ratov = tmo;



	phba->fc_stat.elsXmitFLOGI++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_flogi;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_flogi;



	lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_CMD,

		"Issue FLOGI:     opt:x%x",
@@ -1462,7 +1462,7 @@ lpfc_els_abort_flogi(struct lpfc_hba *phba) 
			if (ndlp && ndlp->nlp_DID == Fabric_DID) {

				if ((phba->pport->fc_flag & FC_PT2PT) &&

				    !(phba->pport->fc_flag & FC_PT2PT_PLOGI))

					iocb->fabric_iocb_cmpl =

					iocb->fabric_cmd_cmpl =

						lpfc_ignore_els_cmpl;

				lpfc_sli_issue_abort_iotag(phba, pring, iocb,

							   NULL);
@@ -2225,7 +2225,7 @@ lpfc_issue_els_plogi(struct lpfc_vport *vport, uint32_t did, uint8_t retry) 
	}



	phba->fc_stat.elsXmitPLOGI++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_plogi;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_plogi;



	lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_CMD,

			      "Issue PLOGI:     did:x%x refcnt %d",
@@ -2484,7 +2484,7 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
		/* For FCP support */

		npr->prliType = PRLI_FCP_TYPE;

		npr->initiatorFunc = 1;

		elsiocb->iocb_flag |= LPFC_PRLI_FCP_REQ;

		elsiocb->cmd_flag |= LPFC_PRLI_FCP_REQ;



		/* Remove FCP type - processed. */

		local_nlp_type &= ~NLP_FC4_FCP;
@@ -2518,14 +2518,14 @@ lpfc_issue_els_prli(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 


		npr_nvme->word1 = cpu_to_be32(npr_nvme->word1);

		npr_nvme->word4 = cpu_to_be32(npr_nvme->word4);

		elsiocb->iocb_flag |= LPFC_PRLI_NVME_REQ;

		elsiocb->cmd_flag |= LPFC_PRLI_NVME_REQ;



		/* Remove NVME type - processed. */

		local_nlp_type &= ~NLP_FC4_NVME;

	}



	phba->fc_stat.elsXmitPRLI++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_prli;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_prli;

	spin_lock_irq(&ndlp->lock);

	ndlp->nlp_flag |= NLP_PRLI_SND;
@@ -2848,7 +2848,7 @@ lpfc_issue_els_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	ap->DID = be32_to_cpu(vport->fc_myDID);



	phba->fc_stat.elsXmitADISC++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_adisc;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_adisc;

	spin_lock_irq(&ndlp->lock);

	ndlp->nlp_flag |= NLP_ADISC_SND;

	spin_unlock_irq(&ndlp->lock);
@@ -3071,7 +3071,7 @@ lpfc_issue_els_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	memcpy(pcmd, &vport->fc_portname, sizeof(struct lpfc_name));



	phba->fc_stat.elsXmitLOGO++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_logo;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_logo;

	spin_lock_irq(&ndlp->lock);

	ndlp->nlp_flag |= NLP_LOGO_SND;

	ndlp->nlp_flag &= ~NLP_ISSUE_LOGO;
@@ -3423,7 +3423,7 @@ lpfc_issue_els_scr(struct lpfc_vport *vport, uint8_t retry) 
		ndlp->nlp_DID, 0, 0);



	phba->fc_stat.elsXmitSCR++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_disc_cmd;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_disc_cmd;

	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {

		lpfc_els_free_iocb(phba, elsiocb);
@@ -3520,7 +3520,7 @@ lpfc_issue_els_rscn(struct lpfc_vport *vport, uint8_t retry) 
	event->portid.rscn_fid[2] = nportid & 0x000000FF;



	phba->fc_stat.elsXmitRSCN++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_cmd;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_cmd;

	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {

		lpfc_els_free_iocb(phba, elsiocb);
@@ -3619,7 +3619,7 @@ lpfc_issue_els_farpr(struct lpfc_vport *vport, uint32_t nportid, uint8_t retry) 
		ndlp->nlp_DID, 0, 0);



	phba->fc_stat.elsXmitFARPR++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_cmd;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_cmd;

	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {

		lpfc_els_free_iocb(phba, elsiocb);
@@ -3710,7 +3710,7 @@ lpfc_issue_els_rdf(struct lpfc_vport *vport, uint8_t retry) 
			 phba->cgn_reg_fpin);



	phba->cgn_fpin_frequency = LPFC_FPIN_INIT_FREQ;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_disc_cmd;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_disc_cmd;

	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {

		lpfc_els_free_iocb(phba, elsiocb);
@@ -4181,7 +4181,7 @@ lpfc_issue_els_edc(struct lpfc_vport *vport, uint8_t retry) 
			 ndlp->nlp_DID, phba->cgn_reg_signal,

			 phba->cgn_reg_fpin);



	elsiocb->iocb_cmpl = lpfc_cmpl_els_disc_cmd;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_disc_cmd;

	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {

		lpfc_els_free_iocb(phba, elsiocb);
@@ -4991,12 +4991,12 @@ lpfc_els_free_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *elsiocb) 


	/* context2  = cmd,  context2->next = rsp, context3 = bpl */

	if (elsiocb->context2) {

		if (elsiocb->iocb_flag & LPFC_DELAY_MEM_FREE) {

		if (elsiocb->cmd_flag & LPFC_DELAY_MEM_FREE) {

			/* Firmware could still be in progress of DMAing

			 * payload, so don't free data buffer till after

			 * a hbeat.

			 */

			elsiocb->iocb_flag &= ~LPFC_DELAY_MEM_FREE;

			elsiocb->cmd_flag &= ~LPFC_DELAY_MEM_FREE;

			buf_ptr = elsiocb->context2;

			elsiocb->context2 = NULL;

			if (buf_ptr) {
@@ -5504,9 +5504,9 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag, 
			ndlp->nlp_flag & NLP_REG_LOGIN_SEND))

			ndlp->nlp_flag &= ~NLP_LOGO_ACC;

		spin_unlock_irq(&ndlp->lock);

		elsiocb->iocb_cmpl = lpfc_cmpl_els_logo_acc;

		elsiocb->cmd_cmpl = lpfc_cmpl_els_logo_acc;

	} else {

		elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

		elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;

	}



	phba->fc_stat.elsXmitACC++;
@@ -5601,7 +5601,7 @@ lpfc_els_rsp_reject(struct lpfc_vport *vport, uint32_t rejectError, 
		ndlp->nlp_DID, ndlp->nlp_flag, rejectError);



	phba->fc_stat.elsXmitLSRJT++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {

		lpfc_els_free_iocb(phba, elsiocb);
@@ -5682,7 +5682,7 @@ lpfc_issue_els_edc_rsp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
			      "Issue EDC ACC:      did:x%x flg:x%x refcnt %d",

			      ndlp->nlp_DID, ndlp->nlp_flag,

			      kref_read(&ndlp->kref));

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;



	phba->fc_stat.elsXmitACC++;

	elsiocb->context1 = lpfc_nlp_get(ndlp);
@@ -5775,7 +5775,7 @@ lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb, 
		      ndlp->nlp_DID, ndlp->nlp_flag, kref_read(&ndlp->kref));



	phba->fc_stat.elsXmitACC++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {

		lpfc_els_free_iocb(phba, elsiocb);
@@ -5949,7 +5949,7 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb, 
		      ndlp->nlp_DID, ndlp->nlp_flag, kref_read(&ndlp->kref));



	phba->fc_stat.elsXmitACC++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->context1 =  lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {

		lpfc_els_free_iocb(phba, elsiocb);
@@ -6050,7 +6050,7 @@ lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format, 
		      ndlp->nlp_DID, ndlp->nlp_flag, kref_read(&ndlp->kref));



	phba->fc_stat.elsXmitACC++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {

		lpfc_els_free_iocb(phba, elsiocb);
@@ -6164,7 +6164,7 @@ lpfc_els_rsp_echo_acc(struct lpfc_vport *vport, uint8_t *data, 
		      ndlp->nlp_DID, ndlp->nlp_flag, kref_read(&ndlp->kref));



	phba->fc_stat.elsXmitACC++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->context1 =  lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {

		lpfc_els_free_iocb(phba, elsiocb);
@@ -6828,7 +6828,7 @@ lpfc_els_rdp_cmpl(struct lpfc_hba *phba, struct lpfc_rdp_context *rdp_context, 
				     rdp_context->page_a0, vport);



	rdp_res->length = cpu_to_be32(len - 8);

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;



	/* Now that we know the true size of the payload, update the BPL */

	bpl = (struct ulp_bde64 *)
@@ -6869,7 +6869,7 @@ lpfc_els_rdp_cmpl(struct lpfc_hba *phba, struct lpfc_rdp_context *rdp_context, 
	stat->un.b.lsRjtRsnCode = LSRJT_UNABLE_TPC;



	phba->fc_stat.elsXmitLSRJT++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {

		lpfc_els_free_iocb(phba, elsiocb);
@@ -7091,7 +7091,7 @@ lpfc_els_lcb_rsp(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	lcb_res->capability = lcb_context->capability;

	lcb_res->lcb_frequency = lcb_context->frequency;

	lcb_res->lcb_duration = lcb_context->duration;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;

	phba->fc_stat.elsXmitACC++;



	elsiocb->context1 = lpfc_nlp_get(ndlp);
@@ -7130,7 +7130,7 @@ lpfc_els_lcb_rsp(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	if (shdr_add_status == ADD_STATUS_OPERATION_ALREADY_ACTIVE)

		stat->un.b.lsRjtRsnCodeExp = LSEXP_CMD_IN_PROGRESS;



	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;

	phba->fc_stat.elsXmitLSRJT++;

	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {
@@ -8197,7 +8197,7 @@ lpfc_els_rsp_rls_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
			 elsiocb->iotag, elsiocb->iocb.ulpContext,

			 ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_state,

			 ndlp->nlp_rpi);

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;

	phba->fc_stat.elsXmitACC++;

	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {
@@ -8349,7 +8349,7 @@ lpfc_els_rcv_rtv(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
			 ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_state,

			 ndlp->nlp_rpi,

			rtv_rsp->ratov, rtv_rsp->edtov, rtv_rsp->qtov);

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;

	phba->fc_stat.elsXmitACC++;

	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {
@@ -8426,7 +8426,7 @@ lpfc_issue_els_rrq(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
		"Issue RRQ:     did:x%x",

		did, rrq->xritag, rrq->rxid);

	elsiocb->context_un.rrq = rrq;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rrq;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rrq;



	lpfc_nlp_get(ndlp);

	elsiocb->context1 = ndlp;
@@ -8532,7 +8532,7 @@ lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize, 
			 elsiocb->iotag, elsiocb->iocb.ulpContext,

			 ndlp->nlp_DID, ndlp->nlp_flag, ndlp->nlp_state,

			 ndlp->nlp_rpi);

	elsiocb->iocb_cmpl = lpfc_cmpl_els_rsp;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;

	phba->fc_stat.elsXmitACC++;

	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {
@@ -8972,7 +8972,7 @@ lpfc_els_timeout_handler(struct lpfc_vport *vport) 
	list_for_each_entry_safe(piocb, tmp_iocb, &pring->txcmplq, list) {

		cmd = &piocb->iocb;



		if ((piocb->iocb_flag & LPFC_IO_LIBDFC) != 0 ||

		if ((piocb->cmd_flag & LPFC_IO_LIBDFC) != 0 ||

		    piocb->iocb.ulpCommand == CMD_ABORT_XRI_CN ||

		    piocb->iocb.ulpCommand == CMD_CLOSE_XRI_CN)

			continue;
@@ -9085,13 +9085,13 @@ lpfc_els_flush_cmd(struct lpfc_vport *vport) 


	/* First we need to issue aborts to outstanding cmds on txcmpl */

	list_for_each_entry_safe(piocb, tmp_iocb, &pring->txcmplq, list) {

		if (piocb->iocb_flag & LPFC_IO_LIBDFC)

		if (piocb->cmd_flag & LPFC_IO_LIBDFC)

			continue;



		if (piocb->vport != vport)

			continue;



		if (piocb->iocb_flag & LPFC_DRIVER_ABORTED)

		if (piocb->cmd_flag & LPFC_DRIVER_ABORTED)

			continue;



		/* On the ELS ring we can have ELS_REQUESTs or
@@ -9109,7 +9109,7 @@ lpfc_els_flush_cmd(struct lpfc_vport *vport) 
			 * and avoid any retry logic.

			 */

			if (phba->link_state == LPFC_LINK_DOWN)

				piocb->iocb_cmpl = lpfc_cmpl_els_link_down;

				piocb->cmd_cmpl = lpfc_cmpl_els_link_down;

		}

		if (cmd->ulpCommand == CMD_GEN_REQUEST64_CR)

			list_add_tail(&piocb->dlist, &abort_list);
@@ -9144,9 +9144,8 @@ lpfc_els_flush_cmd(struct lpfc_vport *vport) 
	list_for_each_entry_safe(piocb, tmp_iocb, &pring->txq, list) {

		cmd = &piocb->iocb;



		if (piocb->iocb_flag & LPFC_IO_LIBDFC) {

		if (piocb->cmd_flag & LPFC_IO_LIBDFC)

			continue;

		}



		/* Do not flush out the QUE_RING and ABORT/CLOSE iocbs */

		if (cmd->ulpCommand == CMD_QUE_RING_BUF_CN ||
@@ -9789,7 +9788,7 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
	payload_len = elsiocb->iocb.unsli3.rcvsli3.acc_len;

	cmd = *payload;

	if ((phba->sli3_options & LPFC_SLI3_HBQ_ENABLED) == 0)

		lpfc_post_buffer(phba, pring, 1);

		lpfc_sli3_post_buffer(phba, pring, 1);



	did = icmd->un.rcvels.remoteID;

	if (icmd->ulpStatus) {
@@ -10262,7 +10261,7 @@ lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
		phba->fc_stat.NoRcvBuf++;

		/* Not enough posted buffers; Try posting more buffers */

		if (!(phba->sli3_options & LPFC_SLI3_HBQ_ENABLED))

			lpfc_post_buffer(phba, pring, 0);

			lpfc_sli3_post_buffer(phba, pring, 0);

		return;

	}
@@ -10898,7 +10897,7 @@ lpfc_issue_els_fdisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	lpfc_set_disctmo(vport);



	phba->fc_stat.elsXmitFDISC++;

	elsiocb->iocb_cmpl = lpfc_cmpl_els_fdisc;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_fdisc;



	lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_CMD,

		"Issue FDISC:     did:x%x",
@@ -11031,7 +11030,7 @@ lpfc_issue_els_npiv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
		"Issue LOGO npiv  did:x%x flg:x%x",

		ndlp->nlp_DID, ndlp->nlp_flag, 0);



	elsiocb->iocb_cmpl = lpfc_cmpl_els_npiv_logo;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_npiv_logo;

	spin_lock_irq(&ndlp->lock);

	ndlp->nlp_flag |= NLP_LOGO_SND;

	spin_unlock_irq(&ndlp->lock);
@@ -11116,9 +11115,9 @@ lpfc_resume_fabric_iocbs(struct lpfc_hba *phba) 
	}

	spin_unlock_irqrestore(&phba->hbalock, iflags);

	if (iocb) {

		iocb->fabric_iocb_cmpl = iocb->iocb_cmpl;

		iocb->iocb_cmpl = lpfc_cmpl_fabric_iocb;

		iocb->iocb_flag |= LPFC_IO_FABRIC;

		iocb->fabric_cmd_cmpl = iocb->cmd_cmpl;

		iocb->cmd_cmpl = lpfc_cmpl_fabric_iocb;

		iocb->cmd_flag |= LPFC_IO_FABRIC;



		lpfc_debugfs_disc_trc(iocb->vport, LPFC_DISC_TRC_ELS_CMD,

			"Fabric sched1:   ste:x%x",
@@ -11127,13 +11126,13 @@ lpfc_resume_fabric_iocbs(struct lpfc_hba *phba) 
		ret = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, iocb, 0);



		if (ret == IOCB_ERROR) {

			iocb->iocb_cmpl = iocb->fabric_iocb_cmpl;

			iocb->fabric_iocb_cmpl = NULL;

			iocb->iocb_flag &= ~LPFC_IO_FABRIC;

			iocb->cmd_cmpl = iocb->fabric_cmd_cmpl;

			iocb->fabric_cmd_cmpl = NULL;

			iocb->cmd_flag &= ~LPFC_IO_FABRIC;

			cmd = &iocb->iocb;

			cmd->ulpStatus = IOSTAT_LOCAL_REJECT;

			cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;

			iocb->iocb_cmpl(phba, iocb, iocb);

			iocb->cmd_cmpl(phba, iocb, iocb);



			atomic_dec(&phba->fabric_iocb_count);

			goto repeat;
@@ -11189,8 +11188,8 @@ lpfc_block_fabric_iocbs(struct lpfc_hba *phba) 
 * @rspiocb: pointer to lpfc response iocb data structure.

 *

 * This routine is the callback function that is put to the fabric iocb's

 * callback function pointer (iocb->iocb_cmpl). The original iocb's callback

 * function pointer has been stored in iocb->fabric_iocb_cmpl. This callback

 * callback function pointer (iocb->cmd_cmpl). The original iocb's callback

 * function pointer has been stored in iocb->fabric_cmd_cmpl. This callback

 * function first restores and invokes the original iocb's callback function

 * and then invokes the lpfc_resume_fabric_iocbs() routine to issue the next

 * fabric bound iocb from the driver internal fabric iocb list onto the wire.
@@ -11201,7 +11200,7 @@ lpfc_cmpl_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
{

	struct ls_rjt stat;



	BUG_ON((cmdiocb->iocb_flag & LPFC_IO_FABRIC) != LPFC_IO_FABRIC);

	WARN_ON((cmdiocb->cmd_flag & LPFC_IO_FABRIC) != LPFC_IO_FABRIC);



	switch (rspiocb->iocb.ulpStatus) {

		case IOSTAT_NPORT_RJT:
@@ -11227,10 +11226,10 @@ lpfc_cmpl_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 


	BUG_ON(atomic_read(&phba->fabric_iocb_count) == 0);



	cmdiocb->iocb_cmpl = cmdiocb->fabric_iocb_cmpl;

	cmdiocb->fabric_iocb_cmpl = NULL;

	cmdiocb->iocb_flag &= ~LPFC_IO_FABRIC;

	cmdiocb->iocb_cmpl(phba, cmdiocb, rspiocb);

	cmdiocb->cmd_cmpl = cmdiocb->fabric_cmd_cmpl;

	cmdiocb->fabric_cmd_cmpl = NULL;

	cmdiocb->cmd_flag &= ~LPFC_IO_FABRIC;

	cmdiocb->cmd_cmpl(phba, cmdiocb, rspiocb);



	atomic_dec(&phba->fabric_iocb_count);

	if (!test_bit(FABRIC_COMANDS_BLOCKED, &phba->bit_flags)) {
@@ -11281,9 +11280,9 @@ lpfc_issue_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *iocb) 
		atomic_inc(&phba->fabric_iocb_count);

	spin_unlock_irqrestore(&phba->hbalock, iflags);

	if (ready) {

		iocb->fabric_iocb_cmpl = iocb->iocb_cmpl;

		iocb->iocb_cmpl = lpfc_cmpl_fabric_iocb;

		iocb->iocb_flag |= LPFC_IO_FABRIC;

		iocb->fabric_cmd_cmpl = iocb->cmd_cmpl;

		iocb->cmd_cmpl = lpfc_cmpl_fabric_iocb;

		iocb->cmd_flag |= LPFC_IO_FABRIC;



		lpfc_debugfs_disc_trc(iocb->vport, LPFC_DISC_TRC_ELS_CMD,

			"Fabric sched2:   ste:x%x",
@@ -11292,9 +11291,9 @@ lpfc_issue_fabric_iocb(struct lpfc_hba *phba, struct lpfc_iocbq *iocb) 
		ret = lpfc_sli_issue_iocb(phba, LPFC_ELS_RING, iocb, 0);



		if (ret == IOCB_ERROR) {

			iocb->iocb_cmpl = iocb->fabric_iocb_cmpl;

			iocb->fabric_iocb_cmpl = NULL;

			iocb->iocb_flag &= ~LPFC_IO_FABRIC;

			iocb->cmd_cmpl = iocb->fabric_cmd_cmpl;

			iocb->fabric_cmd_cmpl = NULL;

			iocb->cmd_flag &= ~LPFC_IO_FABRIC;

			atomic_dec(&phba->fabric_iocb_count);

		}

	} else {
@@ -11701,7 +11700,7 @@ int lpfc_issue_els_qfpa(struct lpfc_vport *vport) 
	*((u32 *)(pcmd)) = ELS_CMD_QFPA;

	pcmd += 4;



	elsiocb->iocb_cmpl = lpfc_cmpl_els_qfpa;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_qfpa;



	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {
@@ -11784,7 +11783,7 @@ lpfc_vmid_uvem(struct lpfc_vport *vport, 
	}

	inst_desc->word6 = cpu_to_be32(inst_desc->word6);



	elsiocb->iocb_cmpl = lpfc_cmpl_els_uvem;

	elsiocb->cmd_cmpl = lpfc_cmpl_els_uvem;



	elsiocb->context1 = lpfc_nlp_get(ndlp);

	if (!elsiocb->context1) {

drivers/scsi/lpfc/lpfc_init.c

+5 −6
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ lpfc_hba_clean_txcmplq(struct lpfc_hba *phba) 
		spin_lock_irq(&pring->ring_lock);

		list_for_each_entry_safe(piocb, next_iocb,

					 &pring->txcmplq, list)

			piocb->iocb_flag &= ~LPFC_IO_ON_TXCMPLQ;

			piocb->cmd_flag &= ~LPFC_IO_ON_TXCMPLQ;

		list_splice_init(&pring->txcmplq, &completions);

		pring->txcmplq_cnt = 0;

		spin_unlock_irq(&pring->ring_lock);
@@ -2678,7 +2678,7 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp) 
}



/**

 * lpfc_post_buffer - Post IOCB(s) with DMA buffer descriptor(s) to a IOCB ring

 * lpfc_sli3_post_buffer - Post IOCB(s) with DMA buffer descriptor(s) to a IOCB ring

 * @phba: pointer to lpfc hba data structure.

 * @pring: pointer to a IOCB ring.

 * @cnt: the number of IOCBs to be posted to the IOCB ring.
@@ -2690,7 +2690,7 @@ lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp) 
 *   The number of IOCBs NOT able to be posted to the IOCB ring.

 **/

int

lpfc_post_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, int cnt)

lpfc_sli3_post_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, int cnt)

{

	IOCB_t *icmd;

	struct lpfc_iocbq *iocb;
@@ -2796,7 +2796,7 @@ lpfc_post_rcv_buf(struct lpfc_hba *phba) 
	struct lpfc_sli *psli = &phba->sli;



	/* Ring 0, ELS / CT buffers */

	lpfc_post_buffer(phba, &psli->sli3_ring[LPFC_ELS_RING], LPFC_BUF_RING0);

	lpfc_sli3_post_buffer(phba, &psli->sli3_ring[LPFC_ELS_RING], LPFC_BUF_RING0);

	/* Ring 2 - FCP no buffers needed */



	return 0;
@@ -4250,8 +4250,7 @@ lpfc_io_buf_replenish(struct lpfc_hba *phba, struct list_head *cbuf) 
			qp = &phba->sli4_hba.hdwq[idx];

			lpfc_cmd->hdwq_no = idx;

			lpfc_cmd->hdwq = qp;

			lpfc_cmd->cur_iocbq.wqe_cmpl = NULL;

			lpfc_cmd->cur_iocbq.iocb_cmpl = NULL;

			lpfc_cmd->cur_iocbq.cmd_cmpl = NULL;

			spin_lock(&qp->io_buf_list_put_lock);

			list_add_tail(&lpfc_cmd->list,

				      &qp->lpfc_io_buf_list_put);