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

scsi: lpfc: SLI path split: Refactor LS_ACC paths 

This patch refactors the LS_ACC paths to use SLI-4 as the primary
interface:

 - Conversion away from using SLI-3 iocb structures to set/access fields in
   common routines. Use the new generic get/set routines that were added.
   This move changes code from indirect structure references to using local
   variables with the generic routines.

 - Refactor routines when setting non-generic fields, to have both SLI3 and
   SLI4 specific sections. This replaces the set-as-SLI3 then translate to
   SLI4 behavior of the past.

Link: https://lore.kernel.org/r/20220225022308.16486-8-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 3bea83b6

drivers/scsi/lpfc/lpfc_els.c

+177 −67
Original line number Diff line number Diff line
@@ -5140,12 +5140,14 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
{

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

	struct lpfc_vport *vport = cmdiocb->vport;

	IOCB_t *irsp;

	u32 ulp_status, ulp_word4;



	ulp_status = get_job_ulpstatus(phba, rspiocb);

	ulp_word4 = get_job_word4(phba, rspiocb);



	irsp = &rspiocb->iocb;

	lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_RSP,

		"ACC LOGO cmpl:   status:x%x/x%x did:x%x",

		irsp->ulpStatus, irsp->un.ulpWord[4], ndlp->nlp_DID);

		ulp_status, ulp_word4, ndlp->nlp_DID);

	/* ACC to LOGO completes to NPort <nlp_DID> */

	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,

			 "0109 ACC to LOGO completes to NPort x%x refcnt %d "
@@ -5163,7 +5165,6 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
		goto out;



	if (ndlp->nlp_state == NLP_STE_NPR_NODE) {



		/* If PLOGI is being retried, PLOGI completion will cleanup the

		 * node. The NLP_NPR_2B_DISC flag needs to be retained to make

		 * progress on nodes discovered from last RSCN.
@@ -5270,8 +5271,7 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
	IOCB_t  *irsp;

	LPFC_MBOXQ_t *mbox = NULL;

	struct lpfc_dmabuf *mp = NULL;



	irsp = &rspiocb->iocb;

	u32 ulp_status, ulp_word4, tmo, did, iotag;



	if (!vport) {

		lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
@@ -5281,6 +5281,19 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
	if (cmdiocb->context_un.mbox)

		mbox = cmdiocb->context_un.mbox;



	ulp_status = get_job_ulpstatus(phba, rspiocb);

	ulp_word4 = get_job_word4(phba, rspiocb);

	did = get_job_els_rsp64_did(phba, cmdiocb);



	if (phba->sli_rev == LPFC_SLI_REV4) {

		tmo = get_wqe_tmo(cmdiocb);

		iotag = get_wqe_reqtag(cmdiocb);

	} else {

		irsp = &rspiocb->iocb;

		tmo = irsp->ulpTimeout;

		iotag = irsp->ulpIoTag;

	}



	/* Check to see if link went down during discovery */

	if (!ndlp || lpfc_els_chk_latt(vport)) {

		if (mbox) {
@@ -5296,19 +5309,17 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 


	lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_RSP,

		"ELS rsp cmpl:    status:x%x/x%x did:x%x",

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

		cmdiocb->iocb.un.elsreq64.remoteID);

		ulp_status, ulp_word4, did);

	/* ELS response tag <ulpIoTag> completes */

	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,

			 "0110 ELS response tag x%x completes "

			 "Data: x%x x%x x%x x%x x%x x%x x%x x%x x%px\n",

			 cmdiocb->iocb.ulpIoTag, rspiocb->iocb.ulpStatus,

			 rspiocb->iocb.un.ulpWord[4], rspiocb->iocb.ulpTimeout,

			 "Data: x%x x%x x%x x%x x%x x%x x%x x%x %p %p\n",

			 iotag, ulp_status, ulp_word4, tmo,

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

			 ndlp->nlp_rpi, kref_read(&ndlp->kref), mbox);

			 ndlp->nlp_rpi, kref_read(&ndlp->kref), mbox, ndlp);

	if (mbox) {

		if ((rspiocb->iocb.ulpStatus == 0) &&

		    (ndlp->nlp_flag & NLP_ACC_REGLOGIN)) {

		if (ulp_status == 0

		    && (ndlp->nlp_flag & NLP_ACC_REGLOGIN)) {

			if (!lpfc_unreg_rpi(vport, ndlp) &&

			    (!(vport->fc_flag & FC_PT2PT))) {

				if (ndlp->nlp_state == NLP_STE_REG_LOGIN_ISSUE) {
@@ -5801,6 +5812,7 @@ lpfc_issue_els_edc_rsp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
	struct lpfc_els_edc_rsp *edc_rsp;

	struct lpfc_iocbq *elsiocb;

	IOCB_t *icmd, *cmd;

	union lpfc_wqe128 *wqe;

	uint8_t *pcmd;

	int cmdsize, rc;
@@ -5810,11 +5822,21 @@ lpfc_issue_els_edc_rsp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
	if (!elsiocb)

		return 1;



	if (phba->sli_rev == LPFC_SLI_REV4) {

		wqe = &elsiocb->wqe;

		bf_set(wqe_ctxt_tag, &wqe->generic.wqe_com,

		       get_job_ulpcontext(phba, cmdiocb)); /* Xri / rx_id */

		bf_set(wqe_rcvoxid, &wqe->xmit_els_rsp.wqe_com,

		       get_job_rcvoxid(phba, cmdiocb));

	} else {

		icmd = &elsiocb->iocb;

		cmd = &cmdiocb->iocb;

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

		icmd->unsli3.rcvsli3.ox_id = cmd->unsli3.rcvsli3.ox_id;

	}



	pcmd = (((struct lpfc_dmabuf *)elsiocb->context2)->virt);



	memset(pcmd, 0, cmdsize);



	edc_rsp = (struct lpfc_els_edc_rsp *)pcmd;
@@ -6161,10 +6183,12 @@ lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format, 
	struct lpfc_hba  *phba = vport->phba;

	RNID *rn;

	IOCB_t *icmd, *oldcmd;

	union lpfc_wqe128 *wqe;

	struct lpfc_iocbq *elsiocb;

	uint8_t *pcmd;

	uint16_t cmdsize;

	int rc;

	u32 ulp_context;



	cmdsize = sizeof(uint32_t) + sizeof(uint32_t)

					+ (2 * sizeof(struct lpfc_name));
@@ -6176,15 +6200,26 @@ lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format, 
	if (!elsiocb)

		return 1;



	if (phba->sli_rev == LPFC_SLI_REV4) {

		wqe = &elsiocb->wqe;

		bf_set(wqe_ctxt_tag, &wqe->generic.wqe_com,

		       get_job_ulpcontext(phba, oldiocb)); /* Xri / rx_id */

		ulp_context = get_job_ulpcontext(phba, elsiocb);

		bf_set(wqe_rcvoxid, &wqe->xmit_els_rsp.wqe_com,

		       get_job_rcvoxid(phba, oldiocb));

	} else {

		icmd = &elsiocb->iocb;

		oldcmd = &oldiocb->iocb;

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

	icmd->unsli3.rcvsli3.ox_id = oldcmd->unsli3.rcvsli3.ox_id;

		ulp_context = elsiocb->iocb.ulpContext;

		icmd->unsli3.rcvsli3.ox_id =

			oldcmd->unsli3.rcvsli3.ox_id;

	}



	/* Xmit RNID ACC response tag <ulpIoTag> */

	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,

			 "0132 Xmit RNID ACC response tag x%x xri x%x\n",

			 elsiocb->iotag, elsiocb->iocb.ulpContext);

			 elsiocb->iotag, ulp_context);

	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);

	*((uint32_t *) (pcmd)) = ELS_CMD_ACC;

	pcmd += sizeof(uint32_t);
@@ -6267,7 +6302,8 @@ lpfc_els_clear_rrq(struct lpfc_vport *vport, 
			be32_to_cpu(bf_get(rrq_did, rrq)),

			bf_get(rrq_oxid, rrq),

			rxid,

			iocb->iotag, iocb->iocb.ulpContext);

			get_wqe_reqtag(iocb),

			get_job_ulpcontext(phba, iocb));



	lpfc_debugfs_disc_trc(vport, LPFC_DISC_TRC_ELS_RSP,

		"Clear RRQ:  did:x%x flg:x%x exchg:x%.08x",
@@ -6936,12 +6972,14 @@ lpfc_els_rdp_cmpl(struct lpfc_hba *phba, struct lpfc_rdp_context *rdp_context, 
	struct lpfc_iocbq *elsiocb;

	struct ulp_bde64 *bpl;

	IOCB_t *icmd;

	union lpfc_wqe128 *wqe;

	uint8_t *pcmd;

	struct ls_rjt *stat;

	struct fc_rdp_res_frame *rdp_res;

	uint32_t cmdsize, len;

	uint16_t *flag_ptr;

	int rc;

	u32 ulp_context;



	if (status != SUCCESS)

		goto error;
@@ -6955,14 +6993,24 @@ lpfc_els_rdp_cmpl(struct lpfc_hba *phba, struct lpfc_rdp_context *rdp_context, 
	if (!elsiocb)

		goto free_rdp_context;



	ulp_context = get_job_ulpcontext(phba, elsiocb);

	if (phba->sli_rev == LPFC_SLI_REV4) {

		wqe = &elsiocb->wqe;

		/* ox-id of the frame */

		bf_set(wqe_rcvoxid, &wqe->xmit_els_rsp.wqe_com,

		       rdp_context->ox_id);

		bf_set(wqe_ctxt_tag, &wqe->xmit_els_rsp.wqe_com,

		       rdp_context->rx_id);

	} else {

		icmd = &elsiocb->iocb;

		icmd->ulpContext = rdp_context->rx_id;

		icmd->unsli3.rcvsli3.ox_id = rdp_context->ox_id;

	}



	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,

			"2171 Xmit RDP response tag x%x xri x%x, "

			"did x%x, nlp_flag x%x, nlp_state x%x, rpi x%x",

			elsiocb->iotag, elsiocb->iocb.ulpContext,

			elsiocb->iotag, ulp_context,

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

			ndlp->nlp_rpi);

	rdp_res = (struct fc_rdp_res_frame *)
@@ -7046,9 +7094,20 @@ lpfc_els_rdp_cmpl(struct lpfc_hba *phba, struct lpfc_rdp_context *rdp_context, 
	if (!elsiocb)

		goto free_rdp_context;



	if (phba->sli_rev == LPFC_SLI_REV4) {

		wqe = &elsiocb->wqe;

		/* ox-id of the frame */

		bf_set(wqe_rcvoxid, &wqe->xmit_els_rsp.wqe_com,

		       rdp_context->ox_id);

		bf_set(wqe_ctxt_tag,

		       &wqe->xmit_els_rsp.wqe_com,

		       rdp_context->rx_id);

	} else {

		icmd = &elsiocb->iocb;

		icmd->ulpContext = rdp_context->rx_id;

		icmd->unsli3.rcvsli3.ox_id = rdp_context->ox_id;

	}



	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);



	*((uint32_t *) (pcmd)) = ELS_CMD_LS_RJT;
@@ -7071,7 +7130,7 @@ lpfc_els_rdp_cmpl(struct lpfc_hba *phba, struct lpfc_rdp_context *rdp_context, 


free_rdp_context:

	/* This reference put is for the original unsolicited RDP. If the

	 * iocb prep failed, there is no reference to remove.

	 * prep failed, there is no reference to remove.

	 */

	lpfc_nlp_put(ndlp);

	kfree(rdp_context);
@@ -7137,7 +7196,7 @@ lpfc_els_rcv_rdp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
	uint8_t rjt_err, rjt_expl = LSEXP_NOTHING_MORE;

	struct fc_rdp_req_frame *rdp_req;

	struct lpfc_rdp_context *rdp_context;

	IOCB_t *cmd = NULL;

	union lpfc_wqe128 *cmd = NULL;

	struct ls_rjt stat;



	if (phba->sli_rev < LPFC_SLI_REV4 ||
@@ -7179,15 +7238,17 @@ lpfc_els_rcv_rdp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
		goto error;

	}



	cmd = &cmdiocb->iocb;

	cmd = &cmdiocb->wqe;

	rdp_context->ndlp = lpfc_nlp_get(ndlp);

	if (!rdp_context->ndlp) {

		kfree(rdp_context);

		rjt_err = LSRJT_UNABLE_TPC;

		goto error;

	}

	rdp_context->ox_id = cmd->unsli3.rcvsli3.ox_id;

	rdp_context->rx_id = cmd->ulpContext;

	rdp_context->ox_id = bf_get(wqe_rcvoxid,

				    &cmd->xmit_els_rsp.wqe_com);

	rdp_context->rx_id = bf_get(wqe_ctxt_tag,

				    &cmd->xmit_els_rsp.wqe_com);

	rdp_context->cmpl = lpfc_els_rdp_cmpl;

	if (lpfc_get_rdp_info(phba, rdp_context)) {

		lpfc_printf_vlog(ndlp->vport, KERN_WARNING, LOG_ELS,
@@ -7217,6 +7278,7 @@ lpfc_els_lcb_rsp(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
{

	MAILBOX_t *mb;

	IOCB_t *icmd;

	union lpfc_wqe128 *wqe;

	uint8_t *pcmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_nodelist *ndlp;
@@ -7267,9 +7329,17 @@ lpfc_els_lcb_rsp(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
		(((struct lpfc_dmabuf *)elsiocb->context2)->virt);



	memset(lcb_res, 0, sizeof(struct fc_lcb_res_frame));



	if (phba->sli_rev == LPFC_SLI_REV4) {

		wqe = &elsiocb->wqe;

		bf_set(wqe_ctxt_tag, &wqe->generic.wqe_com, lcb_context->rx_id);

		bf_set(wqe_rcvoxid, &wqe->xmit_els_rsp.wqe_com,

		       lcb_context->ox_id);

	} else {

		icmd = &elsiocb->iocb;

		icmd->ulpContext = lcb_context->rx_id;

		icmd->unsli3.rcvsli3.ox_id = lcb_context->ox_id;

	}



	pcmd = (uint8_t *)(((struct lpfc_dmabuf *)elsiocb->context2)->virt);

	*((uint32_t *)(pcmd)) = ELS_CMD_ACC;
@@ -7305,9 +7375,17 @@ lpfc_els_lcb_rsp(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	if (!elsiocb)

		goto free_lcb_context;



	if (phba->sli_rev == LPFC_SLI_REV4) {

		wqe = &elsiocb->wqe;

		bf_set(wqe_ctxt_tag, &wqe->generic.wqe_com, lcb_context->rx_id);

		bf_set(wqe_rcvoxid, &wqe->xmit_els_rsp.wqe_com,

		       lcb_context->ox_id);

	} else {

		icmd = &elsiocb->iocb;

		icmd->ulpContext = lcb_context->rx_id;

		icmd->unsli3.rcvsli3.ox_id = lcb_context->ox_id;

	}



	pcmd = (uint8_t *)(((struct lpfc_dmabuf *)elsiocb->context2)->virt);



	*((uint32_t *)(pcmd)) = ELS_CMD_LS_RJT;
@@ -7472,8 +7550,8 @@ lpfc_els_rcv_lcb(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
	lcb_context->type = beacon->lcb_type;

	lcb_context->frequency = beacon->lcb_frequency;

	lcb_context->duration = beacon->lcb_duration;

	lcb_context->ox_id = cmdiocb->iocb.unsli3.rcvsli3.ox_id;

	lcb_context->rx_id = cmdiocb->iocb.ulpContext;

	lcb_context->ox_id = get_job_rcvoxid(phba, cmdiocb);

	lcb_context->rx_id = get_job_ulpcontext(phba, cmdiocb);

	lcb_context->ndlp = lpfc_nlp_get(ndlp);

	if (!lcb_context->ndlp) {

		rjt_err = LSRJT_UNABLE_TPC;
@@ -8328,6 +8406,7 @@ lpfc_els_rsp_rls_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	int rc = 0;

	MAILBOX_t *mb;

	IOCB_t *icmd;

	union lpfc_wqe128 *wqe;

	struct RLS_RSP *rls_rsp;

	uint8_t *pcmd;

	struct lpfc_iocbq *elsiocb;
@@ -8335,6 +8414,7 @@ lpfc_els_rsp_rls_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	uint16_t oxid;

	uint16_t rxid;

	uint32_t cmdsize;

	u32 ulp_context;



	mb = &pmb->u.mb;
@@ -8362,9 +8442,17 @@ lpfc_els_rsp_rls_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
		return;

	}



	ulp_context = get_job_ulpcontext(phba, elsiocb);

	if (phba->sli_rev == LPFC_SLI_REV4) {

		wqe = &elsiocb->wqe;

		/* Xri / rx_id */

		bf_set(wqe_ctxt_tag, &wqe->generic.wqe_com, rxid);

		bf_set(wqe_rcvoxid, &wqe->xmit_els_rsp.wqe_com, oxid);

	} else {

		icmd = &elsiocb->iocb;

		icmd->ulpContext = rxid;

		icmd->unsli3.rcvsli3.ox_id = oxid;

	}



	pcmd = (uint8_t *) (((struct lpfc_dmabuf *) elsiocb->context2)->virt);

	*((uint32_t *) (pcmd)) = ELS_CMD_ACC;
@@ -8382,7 +8470,7 @@ lpfc_els_rsp_rls_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	lpfc_printf_vlog(ndlp->vport, KERN_INFO, LOG_ELS,

			 "2874 Xmit ELS RLS ACC response tag x%x xri x%x, "

			 "did x%x, nlp_flag x%x, nlp_state x%x, rpi x%x\n",

			 elsiocb->iotag, elsiocb->iocb.ulpContext,

			 elsiocb->iotag, ulp_context,

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

			 ndlp->nlp_rpi);

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;
@@ -8426,6 +8514,8 @@ lpfc_els_rcv_rls(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
	struct lpfc_hba *phba = vport->phba;

	LPFC_MBOXQ_t *mbox;

	struct ls_rjt stat;

	u32 ctx = get_job_ulpcontext(phba, cmdiocb);

	u32 ox_id = get_job_rcvoxid(phba, cmdiocb);



	if ((ndlp->nlp_state != NLP_STE_UNMAPPED_NODE) &&

	    (ndlp->nlp_state != NLP_STE_MAPPED_NODE))
@@ -8436,8 +8526,7 @@ lpfc_els_rcv_rls(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
	if (mbox) {

		lpfc_read_lnk_stat(phba, mbox);

		mbox->ctx_buf = (void *)((unsigned long)

			((cmdiocb->iocb.unsli3.rcvsli3.ox_id << 16) |

			cmdiocb->iocb.ulpContext)); /* rx_id */

					 (ox_id << 16 | ctx));

		mbox->ctx_ndlp = lpfc_nlp_get(ndlp);

		if (!mbox->ctx_ndlp)

			goto node_err;
@@ -8490,13 +8579,15 @@ lpfc_els_rcv_rtv(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
		 struct lpfc_nodelist *ndlp)

{

	int rc = 0;

	IOCB_t *icmd;

	union lpfc_wqe128 *wqe;

	struct lpfc_hba *phba = vport->phba;

	struct ls_rjt stat;

	struct RTV_RSP *rtv_rsp;

	uint8_t *pcmd;

	struct lpfc_iocbq *elsiocb;

	uint32_t cmdsize;



	u32 ulp_context;



	if ((ndlp->nlp_state != NLP_STE_UNMAPPED_NODE) &&

	    (ndlp->nlp_state != NLP_STE_MAPPED_NODE))
@@ -8515,9 +8606,19 @@ lpfc_els_rcv_rtv(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
	*((uint32_t *) (pcmd)) = ELS_CMD_ACC;

	pcmd += sizeof(uint32_t); /* Skip past command */



	ulp_context = get_job_ulpcontext(phba, elsiocb);

	/* use the command's xri in the response */

	elsiocb->iocb.ulpContext = cmdiocb->iocb.ulpContext;  /* Xri / rx_id */

	elsiocb->iocb.unsli3.rcvsli3.ox_id = cmdiocb->iocb.unsli3.rcvsli3.ox_id;

	if (phba->sli_rev == LPFC_SLI_REV4) {

		wqe = &elsiocb->wqe;

		bf_set(wqe_ctxt_tag, &wqe->generic.wqe_com,

		       get_job_ulpcontext(phba, cmdiocb));

		bf_set(wqe_rcvoxid, &wqe->xmit_els_rsp.wqe_com,

		       get_job_rcvoxid(phba, cmdiocb));

	} else {

		icmd = &elsiocb->iocb;

		icmd->ulpContext = get_job_ulpcontext(phba, cmdiocb);

		icmd->unsli3.rcvsli3.ox_id = get_job_rcvoxid(phba, cmdiocb);

	}



	rtv_rsp = (struct RTV_RSP *)pcmd;
@@ -8533,7 +8634,7 @@ lpfc_els_rcv_rtv(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
			 "2875 Xmit ELS RTV ACC response tag x%x xri x%x, "

			 "did x%x, nlp_flag x%x, nlp_state x%x, rpi x%x, "

			 "Data: x%x x%x x%x\n",

			 elsiocb->iotag, elsiocb->iocb.ulpContext,

			 elsiocb->iotag, ulp_context,

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

			 ndlp->nlp_rpi,

			rtv_rsp->ratov, rtv_rsp->edtov, rtv_rsp->qtov);
@@ -8682,10 +8783,12 @@ lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize, 
{

	int rc = 0;

	struct lpfc_hba *phba = vport->phba;

	IOCB_t *icmd, *oldcmd;

	IOCB_t *icmd;

	union lpfc_wqe128 *wqe;

	RPL_RSP rpl_rsp;

	struct lpfc_iocbq *elsiocb;

	uint8_t *pcmd;

	u32 ulp_context;



	elsiocb = lpfc_prep_els_iocb(vport, 0, cmdsize, oldiocb->retry, ndlp,

				     ndlp->nlp_DID, ELS_CMD_ACC);
@@ -8693,10 +8796,19 @@ lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize, 
	if (!elsiocb)

		return 1;



	ulp_context = get_job_ulpcontext(phba, elsiocb);

	if (phba->sli_rev == LPFC_SLI_REV4) {

		wqe = &elsiocb->wqe;

		/* Xri / rx_id */

		bf_set(wqe_ctxt_tag, &wqe->generic.wqe_com,

		       get_job_ulpcontext(phba, oldiocb));

		bf_set(wqe_rcvoxid, &wqe->xmit_els_rsp.wqe_com,

		       get_job_rcvoxid(phba, oldiocb));

	} else {

		icmd = &elsiocb->iocb;

	oldcmd = &oldiocb->iocb;

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

	icmd->unsli3.rcvsli3.ox_id = oldcmd->unsli3.rcvsli3.ox_id;

		icmd->ulpContext = get_job_ulpcontext(phba, oldiocb);

		icmd->unsli3.rcvsli3.ox_id = get_job_rcvoxid(phba, oldiocb);

	}



	pcmd = (((struct lpfc_dmabuf *) elsiocb->context2)->virt);

	*((uint32_t *) (pcmd)) = ELS_CMD_ACC;
@@ -8717,7 +8829,7 @@ lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize, 
			 "0120 Xmit ELS RPL ACC response tag x%x "

			 "xri x%x, did x%x, nlp_flag x%x, nlp_state x%x, "

			 "rpi x%x\n",

			 elsiocb->iotag, elsiocb->iocb.ulpContext,

			 elsiocb->iotag, ulp_context,

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

			 ndlp->nlp_rpi);

	elsiocb->cmd_cmpl = lpfc_cmpl_els_rsp;
@@ -8826,12 +8938,10 @@ lpfc_els_rcv_farp(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
{

	struct lpfc_dmabuf *pcmd;

	uint32_t *lp;

	IOCB_t *icmd;

	FARP *fp;

	uint32_t cnt, did;



	icmd = &cmdiocb->iocb;

	did = icmd->un.elsreq64.remoteID;

	did = get_job_els_rsp64_did(vport->phba, cmdiocb);

	pcmd = (struct lpfc_dmabuf *) cmdiocb->context2;

	lp = (uint32_t *) pcmd->virt;