Commit 7851fe2c authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.25: Adapter Interface fixes and changes 



Adapter Interface fixes and changes

- Modify the macro field from lpfc_init_vpi_vpi to lpfc_init_vfi_vpi
- Add the new CQE_CODE_RECEIVE_V1 CQE Code, add code in the driver to handle
  the new Code the same as the CQE_CODE_RECEIVE code except that there are
  two new checks for this code that will cause the driver to use the new V1
  macros for rq_id and fcf_id.
- Fix a bug in lpfc_prep_seq() where the size out of the first CQE was
  ONLY being used, even though multiple dmabufs make up the sequence,
  each have their own CQE with potentially different sizes.
- Fix bug in lpfc_bsg_ct_unsol_event() where the ulpContext and ulpWord[3]
  fields of the XMIT_SEQUENCE64_CX IOCB were being calculated incorrectly.
- Do physical to logical translation before indexing into the active
  XRI array.
- Populate physical vpi in the iocb data structure.
- Put the current accumulated total in each IOCB in the chain as we are
  walking thru then. The last IOCB in the chain should have the total
  length of the sequence.

Signed-off-by: default avatarAlex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 88a2cfbb

drivers/scsi/lpfc/lpfc.h

+2 −1
Original line number Diff line number Diff line
@@ -470,9 +470,10 @@ enum intr_type_t { 
struct unsol_rcv_ct_ctx {

	uint32_t ctxt_id;

	uint32_t SID;

	uint32_t oxid;

	uint32_t flags;

#define UNSOL_VALID	0x00000001

	uint16_t oxid;

	uint16_t rxid;

};



#define LPFC_USER_LINK_SPEED_AUTO	0	/* auto select (default)*/

drivers/scsi/lpfc/lpfc_bsg.c

+8 −7
Original line number Diff line number Diff line
@@ -960,8 +960,10 @@ lpfc_bsg_ct_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
						    evt_dat->immed_dat].oxid,

						phba->ct_ctx[

						    evt_dat->immed_dat].SID);

			phba->ct_ctx[evt_dat->immed_dat].oxid =

			phba->ct_ctx[evt_dat->immed_dat].rxid =

				piocbq->iocb.ulpContext;

			phba->ct_ctx[evt_dat->immed_dat].oxid =

				piocbq->iocb.unsli3.rcvsli3.ox_id;

			phba->ct_ctx[evt_dat->immed_dat].SID =

				piocbq->iocb.un.rcvels.remoteID;

			phba->ct_ctx[evt_dat->immed_dat].flags = UNSOL_VALID;
@@ -1312,7 +1314,8 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct fc_bsg_job *job, uint32_t tag, 
			rc = IOCB_ERROR;

			goto issue_ct_rsp_exit;

		}

		icmd->ulpContext = phba->ct_ctx[tag].oxid;

		icmd->ulpContext = phba->ct_ctx[tag].rxid;

		icmd->unsli3.rcvsli3.ox_id = phba->ct_ctx[tag].oxid;

		ndlp = lpfc_findnode_did(phba->pport, phba->ct_ctx[tag].SID);

		if (!ndlp) {

			lpfc_printf_log(phba, KERN_WARNING, LOG_ELS,
@@ -1337,9 +1340,7 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct fc_bsg_job *job, uint32_t tag, 
			goto issue_ct_rsp_exit;

		}



		icmd->un.ulpWord[3] = ndlp->nlp_rpi;

		if (phba->sli_rev == LPFC_SLI_REV4)

			icmd->ulpContext =

		icmd->un.ulpWord[3] =

				phba->sli4_hba.rpi_ids[ndlp->nlp_rpi];



		/* The exchange is done, mark the entry as invalid */
@@ -1351,8 +1352,8 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct fc_bsg_job *job, uint32_t tag, 


	/* Xmit CT response on exchange <xid> */

	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,

			"2722 Xmit CT response on exchange x%x Data: x%x x%x\n",

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

		"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_cmpl = NULL;

	ctiocb->iocb_flag |= LPFC_IO_LIBDFC;

drivers/scsi/lpfc/lpfc_crtn.h

+1 −0
Original line number Diff line number Diff line
@@ -432,6 +432,7 @@ void lpfc_handle_rrq_active(struct lpfc_hba *); 
int lpfc_send_rrq(struct lpfc_hba *, struct lpfc_node_rrq *);

int lpfc_set_rrq_active(struct lpfc_hba *, struct lpfc_nodelist *,

	uint16_t, uint16_t, uint16_t);

uint16_t lpfc_sli4_xri_inrange(struct lpfc_hba *, uint16_t);

void lpfc_cleanup_wt_rrqs(struct lpfc_hba *);

void lpfc_cleanup_vports_rrqs(struct lpfc_vport *, struct lpfc_nodelist *);

struct lpfc_node_rrq *lpfc_get_active_rrq(struct lpfc_vport *, uint16_t,

drivers/scsi/lpfc/lpfc_els.c

+49 −21
Original line number Diff line number Diff line
@@ -3656,7 +3656,8 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag, 
		}



		icmd = &elsiocb->iocb;

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

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

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

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

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

		pcmd += sizeof(uint32_t);
@@ -3673,7 +3674,8 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag, 
			return 1;



		icmd = &elsiocb->iocb;

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

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

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

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



		if (mbox)
@@ -3695,7 +3697,8 @@ lpfc_els_rsp_acc(struct lpfc_vport *vport, uint32_t flag, 
			return 1;



		icmd = &elsiocb->iocb;

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

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

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

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



		memcpy(pcmd, ((struct lpfc_dmabuf *) oldiocb->context2)->virt,
@@ -3781,7 +3784,8 @@ lpfc_els_rsp_reject(struct lpfc_vport *vport, uint32_t rejectError, 


	icmd = &elsiocb->iocb;

	oldcmd = &oldiocb->iocb;

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

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

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

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



	*((uint32_t *) (pcmd)) = ELS_CMD_LS_RJT;
@@ -3853,7 +3857,8 @@ lpfc_els_rsp_adisc_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb, 


	icmd = &elsiocb->iocb;

	oldcmd = &oldiocb->iocb;

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

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

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



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

	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,
@@ -3931,7 +3936,9 @@ lpfc_els_rsp_prli_acc(struct lpfc_vport *vport, struct lpfc_iocbq *oldiocb, 


	icmd = &elsiocb->iocb;

	oldcmd = &oldiocb->iocb;

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

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

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



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

	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,

			 "0131 Xmit PRLI ACC response tag x%x xri x%x, "
@@ -4035,7 +4042,9 @@ lpfc_els_rsp_rnid_acc(struct lpfc_vport *vport, uint8_t format, 


	icmd = &elsiocb->iocb;

	oldcmd = &oldiocb->iocb;

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

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

	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",
@@ -4163,7 +4172,9 @@ lpfc_els_rsp_echo_acc(struct lpfc_vport *vport, uint8_t *data, 
	if (!elsiocb)

		return 1;



	elsiocb->iocb.ulpContext = oldiocb->iocb.ulpContext;	/* Xri */

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

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



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

	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,

			 "2876 Xmit ECHO ACC response tag x%x xri x%x\n",
@@ -5054,13 +5065,15 @@ lpfc_els_rsp_rls_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	uint8_t *pcmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_nodelist *ndlp;

	uint16_t xri;

	uint16_t oxid;

	uint16_t rxid;

	uint32_t cmdsize;



	mb = &pmb->u.mb;



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

	xri = (uint16_t) ((unsigned long)(pmb->context1));

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

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

	pmb->context1 = NULL;

	pmb->context2 = NULL;
@@ -5082,7 +5095,8 @@ lpfc_els_rsp_rls_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
		return;



	icmd = &elsiocb->iocb;

	icmd->ulpContext = xri;

	icmd->ulpContext = rxid;

	icmd->unsli3.rcvsli3.ox_id = oxid;



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

	*((uint32_t *) (pcmd)) = ELS_CMD_ACC;
@@ -5137,13 +5151,16 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	uint8_t *pcmd;

	struct lpfc_iocbq *elsiocb;

	struct lpfc_nodelist *ndlp;

	uint16_t xri, status;

	uint16_t status;

	uint16_t oxid;

	uint16_t rxid;

	uint32_t cmdsize;



	mb = &pmb->u.mb;



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

	xri = (uint16_t) ((unsigned long)(pmb->context1));

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

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

	pmb->context1 = NULL;

	pmb->context2 = NULL;
@@ -5165,7 +5182,8 @@ lpfc_els_rsp_rps_acc(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
		return;



	icmd = &elsiocb->iocb;

	icmd->ulpContext = xri;

	icmd->ulpContext = rxid;

	icmd->unsli3.rcvsli3.ox_id = oxid;



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

	*((uint32_t *) (pcmd)) = ELS_CMD_ACC;
@@ -5238,8 +5256,9 @@ 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) cmdiocb->iocb.ulpContext);

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

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

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

		mbox->context2 = lpfc_nlp_get(ndlp);

		mbox->vport = vport;

		mbox->mbox_cmpl = lpfc_els_rsp_rls_acc;
@@ -5314,7 +5333,8 @@ lpfc_els_rcv_rtv(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
	pcmd += sizeof(uint32_t); /* Skip past command */



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

	elsiocb->iocb.ulpContext = cmdiocb->iocb.ulpContext;

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

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



	rtv_rsp = (struct RTV_RSP *)pcmd;
@@ -5399,8 +5419,9 @@ 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) cmdiocb->iocb.ulpContext);

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

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

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

			mbox->context2 = lpfc_nlp_get(ndlp);

			mbox->vport = vport;

			mbox->mbox_cmpl = lpfc_els_rsp_rps_acc;
@@ -5554,7 +5575,8 @@ lpfc_els_rsp_rpl_acc(struct lpfc_vport *vport, uint16_t cmdsize, 


	icmd = &elsiocb->iocb;

	oldcmd = &oldiocb->iocb;

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

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

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



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

	*((uint32_t *) (pcmd)) = ELS_CMD_ACC;
@@ -7787,6 +7809,7 @@ lpfc_sli4_els_xri_aborted(struct lpfc_hba *phba, 
{

	uint16_t xri = bf_get(lpfc_wcqe_xa_xri, axri);

	uint16_t rxid = bf_get(lpfc_wcqe_xa_remote_xid, axri);

	uint16_t lxri = 0;



	struct lpfc_sglq *sglq_entry = NULL, *sglq_next = NULL;

	unsigned long iflag = 0;
@@ -7815,7 +7838,12 @@ lpfc_sli4_els_xri_aborted(struct lpfc_hba *phba, 
		}

	}

	spin_unlock(&phba->sli4_hba.abts_sgl_list_lock);

	sglq_entry = __lpfc_get_active_sglq(phba, xri);

	lxri = lpfc_sli4_xri_inrange(phba, xri);

	if (lxri == NO_XRI) {

		spin_unlock_irqrestore(&phba->hbalock, iflag);

		return;

	}

	sglq_entry = __lpfc_get_active_sglq(phba, lxri);

	if (!sglq_entry || (sglq_entry->sli4_xritag != xri)) {

		spin_unlock_irqrestore(&phba->hbalock, iflag);

		return;

drivers/scsi/lpfc/lpfc_hw.h

+6 −1
Original line number Diff line number Diff line
@@ -3470,11 +3470,16 @@ typedef struct { 
   or CMD_IOCB_RCV_SEQ64_CX (0xB5) */



struct rcv_sli3 {

	uint32_t word8Rsvd;

#ifdef __BIG_ENDIAN_BITFIELD

	uint16_t ox_id;

	uint16_t seq_cnt;



	uint16_t vpi;

	uint16_t word9Rsvd;

#else  /*  __LITTLE_ENDIAN */

	uint16_t seq_cnt;

	uint16_t ox_id;



	uint16_t word9Rsvd;

	uint16_t vpi;

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE