From: James Smart <jsmart2021@gmail.com>

Date: Thu, 29 Nov 2018 16:09:29 -0800

Subject: [PATCH] scsi: lpfc: refactor mailbox structure context fields

Git-commit: 3e1f0718921cd13384ff29d7468c4b328d8980ad

Patch-mainline: v5.0-rc1

References: bsc#1118215

The driver data structure for managing a mailbox command contained two

context fields. Unfortunately, the context were considered "generic" to be

used at the whim of the command code.  Of course, one section of code used

fields this way, while another did it that way, and eventually there were

mixups.

Refactored the structure so that the generic contexts become a node context

and a buffer context and all code standardizes on their use.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>

Signed-off-by: James Smart <jsmart2021@gmail.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Acked-by: Hannes Reinecke <hare@suse.com>

---

 drivers/scsi/lpfc/lpfc_attr.c      | 10 ++---

 drivers/scsi/lpfc/lpfc_bsg.c       | 20 +++++-----

 drivers/scsi/lpfc/lpfc_els.c       | 64 +++++++++++++++----------------

 drivers/scsi/lpfc/lpfc_hbadisc.c   | 76 ++++++++++++++++++-------------------

 drivers/scsi/lpfc/lpfc_init.c      |  6 +--

 drivers/scsi/lpfc/lpfc_mbox.c      | 38 +++++++++----------

 drivers/scsi/lpfc/lpfc_mem.c       |  6 +--

 drivers/scsi/lpfc/lpfc_nportdisc.c | 18 ++++-----

 drivers/scsi/lpfc/lpfc_sli.c       | 78 ++++++++++++++++++++------------------

 drivers/scsi/lpfc/lpfc_sli.h       |  6 +--

 drivers/scsi/lpfc/lpfc_vport.c     |  4 +-

 11 files changed, 165 insertions(+), 161 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c

index fdc706fc0209..5f30e40bcc0a 100644

--- a/drivers/scsi/lpfc/lpfc_attr.c

+++ b/drivers/scsi/lpfc/lpfc_attr.c

@@ -1688,7 +1688,7 @@ lpfc_get_hba_info(struct lpfc_hba *phba,

 	pmb = &pmboxq->u.mb;

 	pmb->mbxCommand = MBX_READ_CONFIG;

 	pmb->mbxOwner = OWN_HOST;

-	pmboxq->context1 = NULL;

+	pmboxq->ctx_buf = NULL;

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

 		rc = MBX_NOT_FINISHED;

@@ -6219,7 +6219,7 @@ lpfc_get_stats(struct Scsi_Host *shost)

 	pmb = &pmboxq->u.mb;

 	pmb->mbxCommand = MBX_READ_STATUS;

 	pmb->mbxOwner = OWN_HOST;

-	pmboxq->context1 = NULL;

+	pmboxq->ctx_buf = NULL;

 	pmboxq->vport = vport;

 	if (vport->fc_flag & FC_OFFLINE_MODE)

@@ -6251,7 +6251,7 @@ lpfc_get_stats(struct Scsi_Host *shost)

 	memset(pmboxq, 0, sizeof (LPFC_MBOXQ_t));

 	pmb->mbxCommand = MBX_READ_LNK_STAT;

 	pmb->mbxOwner = OWN_HOST;

-	pmboxq->context1 = NULL;

+	pmboxq->ctx_buf = NULL;

 	pmboxq->vport = vport;

 	if (vport->fc_flag & FC_OFFLINE_MODE)

@@ -6331,7 +6331,7 @@ lpfc_reset_stats(struct Scsi_Host *shost)

 	pmb->mbxCommand = MBX_READ_STATUS;

 	pmb->mbxOwner = OWN_HOST;

 	pmb->un.varWords[0] = 0x1; /* reset request */

-	pmboxq->context1 = NULL;

+	pmboxq->ctx_buf = NULL;

 	pmboxq->vport = vport;

 	if ((vport->fc_flag & FC_OFFLINE_MODE) ||

@@ -6349,7 +6349,7 @@ lpfc_reset_stats(struct Scsi_Host *shost)

 	memset(pmboxq, 0, sizeof(LPFC_MBOXQ_t));

 	pmb->mbxCommand = MBX_READ_LNK_STAT;

 	pmb->mbxOwner = OWN_HOST;

-	pmboxq->context1 = NULL;

+	pmboxq->ctx_buf = NULL;

 	pmboxq->vport = vport;

 	if ((vport->fc_flag & FC_OFFLINE_MODE) ||

diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c

index 9b8edfb06cb0..b573fd00e650 100644

--- a/drivers/scsi/lpfc/lpfc_bsg.c

+++ b/drivers/scsi/lpfc/lpfc_bsg.c

@@ -2501,9 +2501,9 @@ static int lpfcdiag_loop_self_reg(struct lpfc_hba *phba, uint16_t *rpi)

 		return -ENOMEM;

 	}

-	dmabuff = (struct lpfc_dmabuf *) mbox->context1;

-	mbox->context1 = NULL;

-	mbox->context2 = NULL;

+	dmabuff = (struct lpfc_dmabuf *)mbox->ctx_buf;

+	mbox->ctx_buf = NULL;

+	mbox->ctx_ndlp = NULL;

 	status = lpfc_sli_issue_mbox_wait(phba, mbox, LPFC_MBOX_TMO);

 	if ((status != MBX_SUCCESS) || (mbox->u.mb.mbxStatus)) {

@@ -3388,7 +3388,7 @@ lpfc_bsg_issue_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)

 	unsigned long flags;

 	uint8_t *pmb, *pmb_buf;

-	dd_data = pmboxq->context1;

+	dd_data = pmboxq->ctx_ndlp;

 	/*

 	 * The outgoing buffer is readily referred from the dma buffer,

@@ -3573,7 +3573,7 @@ lpfc_bsg_issue_mbox_ext_handle_job(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)

 	struct lpfc_sli_config_mbox *sli_cfg_mbx;

 	uint8_t *pmbx;

-	dd_data = pmboxq->context1;

+	dd_data = pmboxq->ctx_buf;

 	/* Determine if job has been aborted */

 	spin_lock_irqsave(&phba->ct_ev_lock, flags);

@@ -3960,7 +3960,7 @@ lpfc_bsg_sli_cfg_read_cmd_ext(struct lpfc_hba *phba, struct bsg_job *job,

 	pmboxq->mbox_cmpl = lpfc_bsg_issue_read_mbox_ext_cmpl;

 	/* context fields to callback function */

-	pmboxq->context1 = dd_data;

+	pmboxq->ctx_buf = dd_data;

 	dd_data->type = TYPE_MBOX;

 	dd_data->set_job = job;

 	dd_data->context_un.mbox.pmboxq = pmboxq;

@@ -4131,7 +4131,7 @@ lpfc_bsg_sli_cfg_write_cmd_ext(struct lpfc_hba *phba, struct bsg_job *job,

 		pmboxq->mbox_cmpl = lpfc_bsg_issue_write_mbox_ext_cmpl;

 		/* context fields to callback function */

-		pmboxq->context1 = dd_data;

+		pmboxq->ctx_buf = dd_data;

 		dd_data->type = TYPE_MBOX;

 		dd_data->set_job = job;

 		dd_data->context_un.mbox.pmboxq = pmboxq;

@@ -4476,7 +4476,7 @@ lpfc_bsg_write_ebuf_set(struct lpfc_hba *phba, struct bsg_job *job,

 		pmboxq->mbox_cmpl = lpfc_bsg_issue_write_mbox_ext_cmpl;

 		/* context fields to callback function */

-		pmboxq->context1 = dd_data;

+		pmboxq->ctx_buf = dd_data;

 		dd_data->type = TYPE_MBOX;

 		dd_data->set_job = job;

 		dd_data->context_un.mbox.pmboxq = pmboxq;

@@ -4761,7 +4761,7 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct bsg_job *job,

 	if (mbox_req->inExtWLen || mbox_req->outExtWLen) {

 		from = pmbx;

 		ext = from + sizeof(MAILBOX_t);

-		pmboxq->context2 = ext;

+		pmboxq->ctx_buf = ext;

 		pmboxq->in_ext_byte_len =

 			mbox_req->inExtWLen * sizeof(uint32_t);

 		pmboxq->out_ext_byte_len =

@@ -4889,7 +4889,7 @@ lpfc_bsg_issue_mbox(struct lpfc_hba *phba, struct bsg_job *job,

 	pmboxq->mbox_cmpl = lpfc_bsg_issue_mbox_cmpl;

 	/* setup context field to pass wait_queue pointer to wake function */

-	pmboxq->context1 = dd_data;

+	pmboxq->ctx_ndlp = dd_data;

 	dd_data->type = TYPE_MBOX;

 	dd_data->set_job = job;

 	dd_data->context_un.mbox.pmboxq = pmboxq;

diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c

index 5c34bfa624ef..a2caa9e67890 100644

--- a/drivers/scsi/lpfc/lpfc_els.c

+++ b/drivers/scsi/lpfc/lpfc_els.c

@@ -415,7 +415,7 @@ lpfc_issue_fabric_reglogin(struct lpfc_vport *vport)

 	/* increment the reference count on ndlp to hold reference

 	 * for the callback routine.

 	 */

-	mbox->context2 = lpfc_nlp_get(ndlp);

+	mbox->ctx_ndlp = lpfc_nlp_get(ndlp);

 	rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);

 	if (rc == MBX_NOT_FINISHED) {

@@ -430,7 +430,7 @@ lpfc_issue_fabric_reglogin(struct lpfc_vport *vport)

 	 * for the failed mbox command.

 	 */

 	lpfc_nlp_put(ndlp);

-	mp = (struct lpfc_dmabuf *) mbox->context1;

+	mp = (struct lpfc_dmabuf *)mbox->ctx_buf;

 	lpfc_mbuf_free(phba, mp->virt, mp->phys);

 	kfree(mp);

 fail_free_mbox:

@@ -504,7 +504,7 @@ lpfc_issue_reg_vfi(struct lpfc_vport *vport)

 	mboxq->mbox_cmpl = lpfc_mbx_cmpl_reg_vfi;

 	mboxq->vport = vport;

-	mboxq->context1 = dmabuf;

+	mboxq->ctx_buf = dmabuf;

 	rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_NOWAIT);

 	if (rc == MBX_NOT_FINISHED) {

 		rc = -ENXIO;

@@ -3990,11 +3990,11 @@ lpfc_cmpl_els_logo_acc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,

 void

 lpfc_mbx_cmpl_dflt_rpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 {

-	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) (pmb->context1);

-	struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) pmb->context2;

+	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *)(pmb->ctx_buf);

+	struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *)pmb->ctx_ndlp;

-	pmb->context1 = NULL;

-	pmb->context2 = NULL;

+	pmb->ctx_buf = NULL;

+	pmb->ctx_ndlp = NULL;

 	lpfc_mbuf_free(phba, mp->virt, mp->phys);

 	kfree(mp);

@@ -4070,7 +4070,7 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,

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

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

 		if (mbox) {

-			mp = (struct lpfc_dmabuf *) mbox->context1;

+			mp = (struct lpfc_dmabuf *)mbox->ctx_buf;

 			if (mp) {

 				lpfc_mbuf_free(phba, mp->virt, mp->phys);

 				kfree(mp);

@@ -4114,7 +4114,7 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,

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

 					ndlp->nlp_DID, ndlp->nlp_state,

 					ndlp->nlp_rpi, ndlp->nlp_flag);

-				mp = mbox->context1;

+				mp = mbox->ctx_buf;

 				if (mp) {

 					lpfc_mbuf_free(phba, mp->virt,

 						       mp->phys);

@@ -4127,7 +4127,7 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,

 			/* Increment reference count to ndlp to hold the

 			 * reference to ndlp for the callback function.

 			 */

-			mbox->context2 = lpfc_nlp_get(ndlp);

+			mbox->ctx_ndlp = lpfc_nlp_get(ndlp);

 			mbox->vport = vport;

 			if (ndlp->nlp_flag & NLP_RM_DFLT_RPI) {

 				mbox->mbox_flag |= LPFC_MBX_IMED_UNREG;

@@ -4181,7 +4181,7 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,

 				}

 			}

 		}

-		mp = (struct lpfc_dmabuf *) mbox->context1;

+		mp = (struct lpfc_dmabuf *)mbox->ctx_buf;

 		if (mp) {

 			lpfc_mbuf_free(phba, mp->virt, mp->phys);

 			kfree(mp);

@@ -5597,7 +5597,7 @@ lpfc_get_rdp_info(struct lpfc_hba *phba, struct lpfc_rdp_context *rdp_context)

 		goto prep_mbox_fail;

 	mbox->vport = rdp_context->ndlp->vport;

 	mbox->mbox_cmpl = lpfc_mbx_cmpl_rdp_page_a0;

-	mbox->context2 = (struct lpfc_rdp_context *) rdp_context;

+	mbox->ctx_ndlp = (struct lpfc_rdp_context *)rdp_context;

 	rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);

 	if (rc == MBX_NOT_FINISHED)

 		goto issue_mbox_fail;

@@ -5722,10 +5722,10 @@ lpfc_els_lcb_rsp(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 	int rc;

 	mb = &pmb->u.mb;

-	lcb_context = (struct lpfc_lcb_context *)pmb->context1;

+	lcb_context = (struct lpfc_lcb_context *)pmb->ctx_ndlp;

 	ndlp = lcb_context->ndlp;

-	pmb->context1 = NULL;

-	pmb->context2 = NULL;

+	pmb->ctx_ndlp = NULL;

+	pmb->ctx_buf = NULL;

 	shdr = (union lpfc_sli4_cfg_shdr *)

 			&pmb->u.mqe.un.beacon_config.header.cfg_shdr;

@@ -5832,7 +5832,7 @@ lpfc_sli4_set_beacon(struct lpfc_vport *vport,

 	lpfc_sli4_config(phba, mbox, LPFC_MBOX_SUBSYSTEM_COMMON,

 			 LPFC_MBOX_OPCODE_SET_BEACON_CONFIG, len,

 			 LPFC_SLI4_MBX_EMBED);

-	mbox->context1 = (void *)lcb_context;

+	mbox->ctx_ndlp = (void *)lcb_context;

 	mbox->vport = phba->pport;

 	mbox->mbox_cmpl = lpfc_els_lcb_rsp;

 	bf_set(lpfc_mbx_set_beacon_port_num, &mbox->u.mqe.un.beacon_config,

@@ -6758,11 +6758,11 @@ lpfc_els_rsp_rls_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 	mb = &pmb->u.mb;

-	ndlp = (struct lpfc_nodelist *) pmb->context2;

-	rxid = (uint16_t) ((unsigned long)(pmb->context1) & 0xffff);

-	oxid = (uint16_t) (((unsigned long)(pmb->context1) >> 16) & 0xffff);

-	pmb->context1 = NULL;

-	pmb->context2 = NULL;

+	ndlp = (struct lpfc_nodelist *)pmb->ctx_ndlp;

+	rxid = (uint16_t)((unsigned long)(pmb->ctx_buf) & 0xffff);

+	oxid = (uint16_t)(((unsigned long)(pmb->ctx_buf) >> 16) & 0xffff);

+	pmb->ctx_buf = NULL;

+	pmb->ctx_ndlp = NULL;

 	if (mb->mbxStatus) {

 		mempool_free(pmb, phba->mbox_mem_pool);

@@ -6846,11 +6846,11 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 	mb = &pmb->u.mb;

-	ndlp = (struct lpfc_nodelist *) pmb->context2;

-	rxid = (uint16_t) ((unsigned long)(pmb->context1) & 0xffff);

-	oxid = (uint16_t) (((unsigned long)(pmb->context1) >> 16) & 0xffff);

-	pmb->context1 = NULL;

-	pmb->context2 = NULL;

+	ndlp = (struct lpfc_nodelist *)pmb->ctx_ndlp;

+	rxid = (uint16_t)((unsigned long)(pmb->ctx_buf) & 0xffff);

+	oxid = (uint16_t)(((unsigned long)(pmb->ctx_buf) >> 16) & 0xffff);

+	pmb->ctx_ndlp = NULL;

+	pmb->ctx_buf = NULL;

 	if (mb->mbxStatus) {

 		mempool_free(pmb, phba->mbox_mem_pool);

@@ -6941,10 +6941,10 @@ lpfc_els_rcv_rls(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,

 	mbox = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC);

 	if (mbox) {

 		lpfc_read_lnk_stat(phba, mbox);

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

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

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

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

-		mbox->context2 = lpfc_nlp_get(ndlp);

+		mbox->ctx_ndlp = lpfc_nlp_get(ndlp);

 		mbox->vport = vport;

 		mbox->mbox_cmpl = lpfc_els_rsp_rls_acc;

 		if (lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT)

@@ -7104,10 +7104,10 @@ lpfc_els_rcv_rps(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb,

 		mbox = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC);

 		if (mbox) {

 			lpfc_read_lnk_stat(phba, mbox);

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

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

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

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

-			mbox->context2 = lpfc_nlp_get(ndlp);

+			mbox->ctx_ndlp = lpfc_nlp_get(ndlp);

 			mbox->vport = vport;

 			mbox->mbox_cmpl = lpfc_els_rsp_rps_acc;

 			if (lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT)

@@ -8602,7 +8602,7 @@ lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 {

 	struct lpfc_vport *vport = pmb->vport;

 	struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);

-	struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) pmb->context2;

+	struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *)pmb->ctx_ndlp;

 	MAILBOX_t *mb = &pmb->u.mb;

 	int rc;

@@ -8720,7 +8720,7 @@ lpfc_register_new_vport(struct lpfc_hba *phba, struct lpfc_vport *vport,

 	if (mbox) {

 		lpfc_reg_vpi(vport, mbox);

 		mbox->vport = vport;

-		mbox->context2 = lpfc_nlp_get(ndlp);

+		mbox->ctx_ndlp = lpfc_nlp_get(ndlp);

 		mbox->mbox_cmpl = lpfc_cmpl_reg_new_vport;

 		if (lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT)

 		    == MBX_NOT_FINISHED) {

diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c

index 6c2fb55d739b..6fe29150de27 100644

--- a/drivers/scsi/lpfc/lpfc_hbadisc.c

+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c

@@ -2944,7 +2944,7 @@ lpfc_start_fdiscs(struct lpfc_hba *phba)

 void

 lpfc_mbx_cmpl_reg_vfi(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)

 {

-	struct lpfc_dmabuf *dmabuf = mboxq->context1;

+	struct lpfc_dmabuf *dmabuf = mboxq->ctx_buf;

 	struct lpfc_vport *vport = mboxq->vport;

 	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);

@@ -3037,7 +3037,7 @@ static void

 lpfc_mbx_cmpl_read_sparam(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 {

 	MAILBOX_t *mb = &pmb->u.mb;

-	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) pmb->context1;

+	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *)pmb->ctx_buf;

 	struct lpfc_vport  *vport = pmb->vport;

 	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);

 	struct serv_parm *sp = &vport->fc_sparam;

@@ -3081,7 +3081,7 @@ lpfc_mbx_cmpl_read_sparam(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 	return;

 out:

-	pmb->context1 = NULL;

+	pmb->ctx_buf = NULL;

 	lpfc_mbuf_free(phba, mp->virt, mp->phys);

 	kfree(mp);

 	lpfc_issue_clear_la(phba, vport);

@@ -3220,7 +3220,7 @@ lpfc_mbx_process_link_up(struct lpfc_hba *phba, struct lpfc_mbx_read_top *la)

 	sparam_mbox->mbox_cmpl = lpfc_mbx_cmpl_read_sparam;

 	rc = lpfc_sli_issue_mbox(phba, sparam_mbox, MBX_NOWAIT);

 	if (rc == MBX_NOT_FINISHED) {

-		mp = (struct lpfc_dmabuf *) sparam_mbox->context1;

+		mp = (struct lpfc_dmabuf *)sparam_mbox->ctx_buf;

 		lpfc_mbuf_free(phba, mp->virt, mp->phys);

 		kfree(mp);

 		mempool_free(sparam_mbox, phba->mbox_mem_pool);

@@ -3349,7 +3349,7 @@ lpfc_mbx_cmpl_read_topology(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 	struct lpfc_mbx_read_top *la;

 	struct lpfc_sli_ring *pring;

 	MAILBOX_t *mb = &pmb->u.mb;

-	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) (pmb->context1);

+	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *)(pmb->ctx_buf);

 	uint8_t attn_type;

 	/* Unblock ELS traffic */

@@ -3506,12 +3506,12 @@ void

 lpfc_mbx_cmpl_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 {

 	struct lpfc_vport  *vport = pmb->vport;

-	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) (pmb->context1);

-	struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) pmb->context2;

+	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *)(pmb->ctx_buf);

+	struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *)pmb->ctx_ndlp;

 	struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);

-	pmb->context1 = NULL;

-	pmb->context2 = NULL;

+	pmb->ctx_buf = NULL;

+	pmb->ctx_ndlp = NULL;

 	lpfc_printf_vlog(vport, KERN_INFO, LOG_SLI,

 			 "0002 rpi:%x DID:%x flg:%x %d map:%x %p\n",

@@ -3719,8 +3719,8 @@ lpfc_create_static_vport(struct lpfc_hba *phba)

 	vport_buff = (uint8_t *) vport_info;

 	do {

 		/* free dma buffer from previous round */

-		if (pmb->context1) {

-			mp = (struct lpfc_dmabuf *)pmb->context1;

+		if (pmb->ctx_buf) {

+			mp = (struct lpfc_dmabuf *)pmb->ctx_buf;

 			lpfc_mbuf_free(phba, mp->virt, mp->phys);

 			kfree(mp);

 		}

@@ -3742,7 +3742,7 @@ lpfc_create_static_vport(struct lpfc_hba *phba)

 		if (phba->sli_rev == LPFC_SLI_REV4) {

 			byte_count = pmb->u.mqe.un.mb_words[5];

-			mp = (struct lpfc_dmabuf *)pmb->context1;

+			mp = (struct lpfc_dmabuf *)pmb->ctx_buf;

 			if (byte_count > sizeof(struct static_vport_info) -

 					offset)

 				byte_count = sizeof(struct static_vport_info)

@@ -3807,8 +3807,8 @@ lpfc_create_static_vport(struct lpfc_hba *phba)

 out:

 	kfree(vport_info);

 	if (mbx_wait_rc != MBX_TIMEOUT) {

-		if (pmb->context1) {

-			mp = (struct lpfc_dmabuf *)pmb->context1;

+		if (pmb->ctx_buf) {

+			mp = (struct lpfc_dmabuf *)pmb->ctx_buf;

 			lpfc_mbuf_free(phba, mp->virt, mp->phys);

 			kfree(mp);

 		}

@@ -3829,13 +3829,13 @@ lpfc_mbx_cmpl_fabric_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 {

 	struct lpfc_vport *vport = pmb->vport;

 	MAILBOX_t *mb = &pmb->u.mb;

-	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) (pmb->context1);

+	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *)(pmb->ctx_buf);

 	struct lpfc_nodelist *ndlp;

 	struct Scsi_Host *shost;

-	ndlp = (struct lpfc_nodelist *) pmb->context2;

-	pmb->context1 = NULL;

-	pmb->context2 = NULL;

+	ndlp = (struct lpfc_nodelist *)pmb->ctx_ndlp;

+	pmb->ctx_ndlp = NULL;

+	pmb->ctx_buf = NULL;

 	if (mb->mbxStatus) {

 		lpfc_printf_vlog(vport, KERN_ERR, LOG_MBOX,

@@ -3982,12 +3982,12 @@ void

 lpfc_mbx_cmpl_ns_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 {

 	MAILBOX_t *mb = &pmb->u.mb;

-	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) (pmb->context1);

-	struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) pmb->context2;

+	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *)(pmb->ctx_buf);

+	struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *)pmb->ctx_ndlp;

 	struct lpfc_vport *vport = pmb->vport;

-	pmb->context1 = NULL;

-	pmb->context2 = NULL;

+	pmb->ctx_buf = NULL;

+	pmb->ctx_ndlp = NULL;

 	vport->gidft_inp = 0;

 	if (mb->mbxStatus) {

@@ -4756,7 +4756,7 @@ lpfc_nlp_logo_unreg(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 	struct lpfc_vport  *vport = pmb->vport;

 	struct lpfc_nodelist *ndlp;

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

+	ndlp = (struct lpfc_nodelist *)(pmb->ctx_ndlp);

 	if (!ndlp)

 		return;

 	lpfc_issue_els_logo(vport, ndlp, 0);

@@ -4799,7 +4799,7 @@ lpfc_unreg_rpi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)

 			lpfc_unreg_login(phba, vport->vpi, rpi, mbox);

 			mbox->vport = vport;

 			if (ndlp->nlp_flag & NLP_ISSUE_LOGO) {

-				mbox->context1 = ndlp;

+				mbox->ctx_ndlp = ndlp;

 				mbox->mbox_cmpl = lpfc_nlp_logo_unreg;

 			} else {

 				if (phba->sli_rev == LPFC_SLI_REV4 &&

@@ -4808,7 +4808,7 @@ lpfc_unreg_rpi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)

 				     &phba->sli4_hba.sli_intf) ==

 				      LPFC_SLI_INTF_IF_TYPE_2) &&

 				    (kref_read(&ndlp->kref) > 0)) {

-					mbox->context1 = lpfc_nlp_get(ndlp);

+					mbox->ctx_ndlp = lpfc_nlp_get(ndlp);

 					mbox->mbox_cmpl =

 						lpfc_sli4_unreg_rpi_cmpl_clr;

 					/*

@@ -4895,7 +4895,7 @@ lpfc_unreg_all_rpis(struct lpfc_vport *vport)

 				 mbox);

 		mbox->vport = vport;

 		mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

-		mbox->context1 = NULL;

+		mbox->ctx_ndlp = NULL;

 		rc = lpfc_sli_issue_mbox_wait(phba, mbox, LPFC_MBOX_TMO);

 		if (rc != MBX_TIMEOUT)

 			mempool_free(mbox, phba->mbox_mem_pool);

@@ -4920,7 +4920,7 @@ lpfc_unreg_default_rpis(struct lpfc_vport *vport)

 			       mbox);

 		mbox->vport = vport;

 		mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

-		mbox->context1 = NULL;

+		mbox->ctx_ndlp = NULL;

 		rc = lpfc_sli_issue_mbox_wait(phba, mbox, LPFC_MBOX_TMO);

 		if (rc != MBX_TIMEOUT)

 			mempool_free(mbox, phba->mbox_mem_pool);

@@ -4974,8 +4974,8 @@ lpfc_cleanup_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)

 	if ((mb = phba->sli.mbox_active)) {

 		if ((mb->u.mb.mbxCommand == MBX_REG_LOGIN64) &&

 		   !(mb->mbox_flag & LPFC_MBX_IMED_UNREG) &&

-		   (ndlp == (struct lpfc_nodelist *) mb->context2)) {

-			mb->context2 = NULL;

+		   (ndlp == (struct lpfc_nodelist *)mb->ctx_ndlp)) {

+			mb->ctx_ndlp = NULL;

 			mb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

 		}

 	}

@@ -4985,18 +4985,18 @@ lpfc_cleanup_node(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)

 	list_for_each_entry(mb, &phba->sli.mboxq_cmpl, list) {

 		if ((mb->u.mb.mbxCommand != MBX_REG_LOGIN64) ||

 			(mb->mbox_flag & LPFC_MBX_IMED_UNREG) ||

-			(ndlp != (struct lpfc_nodelist *) mb->context2))

+			(ndlp != (struct lpfc_nodelist *)mb->ctx_ndlp))

 			continue;

-		mb->context2 = NULL;

+		mb->ctx_ndlp = NULL;

 		mb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

 	}

 	list_for_each_entry_safe(mb, nextmb, &phba->sli.mboxq, list) {

 		if ((mb->u.mb.mbxCommand == MBX_REG_LOGIN64) &&

 		   !(mb->mbox_flag & LPFC_MBX_IMED_UNREG) &&

-		    (ndlp == (struct lpfc_nodelist *) mb->context2)) {

-			mp = (struct lpfc_dmabuf *) (mb->context1);

+		    (ndlp == (struct lpfc_nodelist *)mb->ctx_ndlp)) {

+			mp = (struct lpfc_dmabuf *)(mb->ctx_buf);

 			if (mp) {

 				__lpfc_mbuf_free(phba, mp->virt, mp->phys);

 				kfree(mp);

@@ -5066,7 +5066,7 @@ lpfc_nlp_remove(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp)

 				mbox->mbox_flag |= LPFC_MBX_IMED_UNREG;

 				mbox->mbox_cmpl = lpfc_mbx_cmpl_dflt_rpi;

 				mbox->vport = vport;

-				mbox->context2 = ndlp;

+				mbox->ctx_ndlp = ndlp;

 				rc =lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);

 				if (rc == MBX_NOT_FINISHED) {

 					mempool_free(mbox, phba->mbox_mem_pool);

@@ -5831,12 +5831,12 @@ void

 lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 {

 	MAILBOX_t *mb = &pmb->u.mb;

-	struct lpfc_dmabuf   *mp = (struct lpfc_dmabuf *) (pmb->context1);

-	struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *) pmb->context2;

+	struct lpfc_dmabuf   *mp = (struct lpfc_dmabuf *)(pmb->ctx_buf);

+	struct lpfc_nodelist *ndlp = (struct lpfc_nodelist *)pmb->ctx_ndlp;

 	struct lpfc_vport    *vport = pmb->vport;

-	pmb->context1 = NULL;

-	pmb->context2 = NULL;

+	pmb->ctx_buf = NULL;

+	pmb->ctx_ndlp = NULL;

 	if (phba->sli_rev < LPFC_SLI_REV4)

 		ndlp->nlp_rpi = mb->un.varWords[0];

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c

index d20a55aa153b..e95a768575b0 100644

--- a/drivers/scsi/lpfc/lpfc_init.c

+++ b/drivers/scsi/lpfc/lpfc_init.c

@@ -443,19 +443,19 @@ lpfc_config_port_post(struct lpfc_hba *phba)

 				"READ_SPARM mbxStatus x%x\n",

 				mb->mbxCommand, mb->mbxStatus);

 		phba->link_state = LPFC_HBA_ERROR;

-		mp = (struct lpfc_dmabuf *) pmb->context1;

+		mp = (struct lpfc_dmabuf *)pmb->ctx_buf;

 		mempool_free(pmb, phba->mbox_mem_pool);

 		lpfc_mbuf_free(phba, mp->virt, mp->phys);

 		kfree(mp);

 		return -EIO;

 	}

-	mp = (struct lpfc_dmabuf *) pmb->context1;

+	mp = (struct lpfc_dmabuf *)pmb->ctx_buf;

 	memcpy(&vport->fc_sparam, mp->virt, sizeof (struct serv_parm));

 	lpfc_mbuf_free(phba, mp->virt, mp->phys);

 	kfree(mp);

-	pmb->context1 = NULL;

+	pmb->ctx_buf = NULL;

 	lpfc_update_vport_wwn(vport);

 	/* Update the fc_host data structures with new wwn. */

diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c

index deb094fdbb79..b6aedc55be77 100644

--- a/drivers/scsi/lpfc/lpfc_mbox.c

+++ b/drivers/scsi/lpfc/lpfc_mbox.c

@@ -94,7 +94,7 @@ lpfc_dump_static_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb,

 	memset(mp->virt, 0, LPFC_BPL_SIZE);

 	INIT_LIST_HEAD(&mp->list);

 	/* save address for completion */

-	pmb->context1 = (uint8_t *)mp;

+	pmb->ctx_buf = (uint8_t *)mp;

 	mb->un.varWords[3] = putPaddrLow(mp->phys);

 	mb->un.varWords[4] = putPaddrHigh(mp->phys);

 	mb->un.varDmp.sli4_length = sizeof(struct static_vport_info);

@@ -139,7 +139,7 @@ lpfc_dump_mem(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb, uint16_t offset,

 	void *ctx;

 	mb = &pmb->u.mb;

-	ctx = pmb->context2;

+	ctx = pmb->ctx_buf;

 	/* Setup to dump VPD region */

 	memset(pmb, 0, sizeof (LPFC_MBOXQ_t));

@@ -151,7 +151,7 @@ lpfc_dump_mem(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb, uint16_t offset,

 	mb->un.varDmp.word_cnt = (DMP_RSP_SIZE / sizeof (uint32_t));

 	mb->un.varDmp.co = 0;

 	mb->un.varDmp.resp_offset = 0;

-	pmb->context2 = ctx;

+	pmb->ctx_buf = ctx;

 	mb->mbxOwner = OWN_HOST;

 	return;

 }

@@ -172,7 +172,7 @@ lpfc_dump_wakeup_param(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 	mb = &pmb->u.mb;

 	/* Save context so that we can restore after memset */

-	ctx = pmb->context2;

+	ctx = pmb->ctx_buf;

 	/* Setup to dump VPD region */

 	memset(pmb, 0, sizeof(LPFC_MBOXQ_t));

@@ -186,7 +186,7 @@ lpfc_dump_wakeup_param(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)

 	mb->un.varDmp.word_cnt = WAKE_UP_PARMS_WORD_SIZE;

 	mb->un.varDmp.co = 0;

 	mb->un.varDmp.resp_offset = 0;

-	pmb->context2 = ctx;

+	pmb->ctx_buf = ctx;

 	return;

 }

@@ -304,7 +304,7 @@ lpfc_read_topology(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb,

 	/* Save address for later completion and set the owner to host so that

 	 * the FW knows this mailbox is available for processing.

 	 */

-	pmb->context1 = (uint8_t *)mp;

+	pmb->ctx_buf = (uint8_t *)mp;

 	mb->mbxOwner = OWN_HOST;

 	return (0);

 }

@@ -631,7 +631,7 @@ lpfc_read_sparam(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb, int vpi)

 		mb->un.varRdSparm.vpi = phba->vpi_ids[vpi];

 	/* save address for completion */

-	pmb->context1 = mp;

+	pmb->ctx_buf = mp;

 	return (0);

 }

@@ -783,7 +783,7 @@ lpfc_reg_rpi(struct lpfc_hba *phba, uint16_t vpi, uint32_t did,

 	memcpy(sparam, param, sizeof (struct serv_parm));

 	/* save address for completion */

-	pmb->context1 = (uint8_t *) mp;

+	pmb->ctx_buf = (uint8_t *)mp;

 	mb->mbxCommand = MBX_REG_LOGIN64;

 	mb->un.varRegLogin.un.sp64.tus.f.bdeSize = sizeof (struct serv_parm);

@@ -858,7 +858,7 @@ lpfc_sli4_unreg_all_rpis(struct lpfc_vport *vport)

 		mbox->u.mb.un.varUnregLogin.rsvd1 = 0x4000;

 		mbox->vport = vport;

 		mbox->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

-		mbox->context1 = NULL;

+		mbox->ctx_ndlp = NULL;

 		rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);

 		if (rc == MBX_NOT_FINISHED)

 			mempool_free(mbox, phba->mbox_mem_pool);

@@ -2288,7 +2288,7 @@ lpfc_sli4_dump_cfg_rg23(struct lpfc_hba *phba, struct lpfcMboxq *mbox)

 	INIT_LIST_HEAD(&mp->list);

 	/* save address for completion */

-	mbox->context1 = (uint8_t *) mp;

+	mbox->ctx_buf = (uint8_t *)mp;

 	mb->mbxCommand = MBX_DUMP_MEMORY;

 	mb->un.varDmp.type = DMP_NV_PARAMS;

@@ -2305,7 +2305,7 @@ lpfc_mbx_cmpl_rdp_link_stat(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)

 	MAILBOX_t *mb;

 	int rc = FAILURE;

 	struct lpfc_rdp_context *rdp_context =

-			(struct lpfc_rdp_context *)(mboxq->context2);

+			(struct lpfc_rdp_context *)(mboxq->ctx_ndlp);

 	mb = &mboxq->u.mb;

 	if (mb->mbxStatus)

@@ -2323,9 +2323,9 @@ lpfc_mbx_cmpl_rdp_link_stat(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)

 static void

 lpfc_mbx_cmpl_rdp_page_a2(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox)

 {

-	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) mbox->context1;

+	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *)mbox->ctx_buf;

 	struct lpfc_rdp_context *rdp_context =

-			(struct lpfc_rdp_context *)(mbox->context2);

+			(struct lpfc_rdp_context *)(mbox->ctx_ndlp);

 	if (bf_get(lpfc_mqe_status, &mbox->u.mqe))

 		goto error_mbuf_free;

@@ -2341,7 +2341,7 @@ lpfc_mbx_cmpl_rdp_page_a2(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox)

 	lpfc_read_lnk_stat(phba, mbox);

 	mbox->vport = rdp_context->ndlp->vport;

 	mbox->mbox_cmpl = lpfc_mbx_cmpl_rdp_link_stat;

-	mbox->context2 = (struct lpfc_rdp_context *) rdp_context;

+	mbox->ctx_ndlp = (struct lpfc_rdp_context *)rdp_context;

 	if (lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT) == MBX_NOT_FINISHED)

 		goto error_cmd_free;

@@ -2359,9 +2359,9 @@ void

 lpfc_mbx_cmpl_rdp_page_a0(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox)

 {

 	int rc;

-	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *) (mbox->context1);

+	struct lpfc_dmabuf *mp = (struct lpfc_dmabuf *)(mbox->ctx_buf);

 	struct lpfc_rdp_context *rdp_context =

-			(struct lpfc_rdp_context *)(mbox->context2);

+			(struct lpfc_rdp_context *)(mbox->ctx_ndlp);

 	if (bf_get(lpfc_mqe_status, &mbox->u.mqe))

 		goto error;

@@ -2375,7 +2375,7 @@ lpfc_mbx_cmpl_rdp_page_a0(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox)

 	INIT_LIST_HEAD(&mp->list);

 	/* save address for completion */

-	mbox->context1 = mp;

+	mbox->ctx_buf = mp;

 	mbox->vport = rdp_context->ndlp->vport;

 	bf_set(lpfc_mqe_command, &mbox->u.mqe, MBX_DUMP_MEMORY);

@@ -2391,7 +2391,7 @@ lpfc_mbx_cmpl_rdp_page_a0(struct lpfc_hba *phba, LPFC_MBOXQ_t *mbox)

 	mbox->u.mqe.un.mem_dump_type3.addr_hi = putPaddrHigh(mp->phys);

 	mbox->mbox_cmpl = lpfc_mbx_cmpl_rdp_page_a2;

-	mbox->context2 = (struct lpfc_rdp_context *) rdp_context;

+	mbox->ctx_ndlp = (struct lpfc_rdp_context *)rdp_context;

 	rc = lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT);

 	if (rc == MBX_NOT_FINISHED)

 		goto error;

@@ -2436,7 +2436,7 @@ lpfc_sli4_dump_page_a0(struct lpfc_hba *phba, struct lpfcMboxq *mbox)

 	bf_set(lpfc_mqe_command, &mbox->u.mqe, MBX_DUMP_MEMORY);

 	/* save address for completion */

-	mbox->context1 = mp;

+	mbox->ctx_buf = mp;

 	bf_set(lpfc_mbx_memory_dump_type3_type,

 		&mbox->u.mqe.un.mem_dump_type3, DMP_LMSD);

diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c

index 9c22a2c93462..66191fa35f63 100644

--- a/drivers/scsi/lpfc/lpfc_mem.c

+++ b/drivers/scsi/lpfc/lpfc_mem.c

@@ -330,7 +330,7 @@ lpfc_mem_free_all(struct lpfc_hba *phba)

 	/* Free memory used in mailbox queue back to mailbox memory pool */

 	list_for_each_entry_safe(mbox, next_mbox, &psli->mboxq, list) {

-		mp = (struct lpfc_dmabuf *) (mbox->context1);

+		mp = (struct lpfc_dmabuf *)(mbox->ctx_buf);

 		if (mp) {

 			lpfc_mbuf_free(phba, mp->virt, mp->phys);

 			kfree(mp);

@@ -340,7 +340,7 @@ lpfc_mem_free_all(struct lpfc_hba *phba)

 	}

 	/* Free memory used in mailbox cmpl list back to mailbox memory pool */

 	list_for_each_entry_safe(mbox, next_mbox, &psli->mboxq_cmpl, list) {

-		mp = (struct lpfc_dmabuf *) (mbox->context1);

+		mp = (struct lpfc_dmabuf *)(mbox->ctx_buf);

 		if (mp) {

 			lpfc_mbuf_free(phba, mp->virt, mp->phys);

 			kfree(mp);

@@ -354,7 +354,7 @@ lpfc_mem_free_all(struct lpfc_hba *phba)

 	spin_unlock_irq(&phba->hbalock);

 	if (psli->mbox_active) {

 		mbox = psli->mbox_active;

-		mp = (struct lpfc_dmabuf *) (mbox->context1);

+		mp = (struct lpfc_dmabuf *)(mbox->ctx_buf);

 		if (mp) {

 			lpfc_mbuf_free(phba, mp->virt, mp->phys);

 			kfree(mp);

diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c

index 7d5693cfaa87..9cb93b50dd43 100644

--- a/drivers/scsi/lpfc/lpfc_nportdisc.c

+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c

@@ -467,7 +467,7 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,

 	 */

 	mbox->mbox_cmpl = lpfc_mbx_cmpl_reg_login;

 	/*

-	 * mbox->context2 = lpfc_nlp_get(ndlp) deferred until mailbox

+	 * mbox->ctx_ndlp = lpfc_nlp_get(ndlp) deferred until mailbox

 	 * command issued in lpfc_cmpl_els_acc().

 	 */

 	mbox->vport = vport;

@@ -535,8 +535,8 @@ lpfc_mbx_cmpl_resume_rpi(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq)

 	struct lpfc_nodelist *ndlp;

 	uint32_t cmd;

-	elsiocb = (struct lpfc_iocbq *)mboxq->context1;

-	ndlp = (struct lpfc_nodelist *) mboxq->context2;

+	elsiocb = (struct lpfc_iocbq *)mboxq->ctx_buf;

+	ndlp = (struct lpfc_nodelist *)mboxq->ctx_ndlp;

 	vport = mboxq->vport;

 	cmd = elsiocb->drvrTimeout;

@@ -1258,7 +1258,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_vport *vport,

 			ndlp->nlp_flag |= NLP_REG_LOGIN_SEND;

 			mbox->mbox_cmpl = lpfc_mbx_cmpl_reg_login;

 		}

-		mbox->context2 = lpfc_nlp_get(ndlp);

+		mbox->ctx_ndlp = lpfc_nlp_get(ndlp);

 		mbox->vport = vport;

 		if (lpfc_sli_issue_mbox(phba, mbox, MBX_NOWAIT)

 		    != MBX_NOT_FINISHED) {

@@ -1272,7 +1272,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_vport *vport,

 		 * command

 		 */

 		lpfc_nlp_put(ndlp);

-		mp = (struct lpfc_dmabuf *) mbox->context1;

+		mp = (struct lpfc_dmabuf *)mbox->ctx_buf;

 		lpfc_mbuf_free(phba, mp->virt, mp->phys);

 		kfree(mp);

 		mempool_free(mbox, phba->mbox_mem_pool);

@@ -1641,10 +1641,10 @@ lpfc_rcv_logo_reglogin_issue(struct lpfc_vport *vport,

 	/* cleanup any ndlp on mbox q waiting for reglogin cmpl */

 	if ((mb = phba->sli.mbox_active)) {

 		if ((mb->u.mb.mbxCommand == MBX_REG_LOGIN64) &&

-		   (ndlp == (struct lpfc_nodelist *) mb->context2)) {

+		   (ndlp == (struct lpfc_nodelist *)mb->ctx_ndlp)) {

 			ndlp->nlp_flag &= ~NLP_REG_LOGIN_SEND;

 			lpfc_nlp_put(ndlp);

-			mb->context2 = NULL;

+			mb->ctx_ndlp = NULL;

 			mb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;

 		}

 	}

@@ -1652,8 +1652,8 @@ lpfc_rcv_logo_reglogin_issue(struct lpfc_vport *vport,

 	spin_lock_irq(&phba->hbalock);

 	list_for_each_entry_safe(mb, nextmb, &phba->sli.mboxq, list) {

 		if ((mb->u.mb.mbxCommand == MBX_REG_LOGIN64) &&

-		   (ndlp == (struct lpfc_nodelist *) mb->context2)) {

-			mp = (struct lpfc_dmabuf *) (mb->context1);

+		   (ndlp == (struct lpfc_nodelist *)mb->ctx_ndlp)) {

+			mp = (struct lpfc_dmabuf *)(mb->ctx_buf);

 			if (mp) {