Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fb120a7 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.2 : Addition of SLI4 Interface - FCOE Discovery support 



SLI4 supports both FC and FCOE, with some extended topology objects.
This patch adss support for the objects, and updates the disovery
engines for their use.

Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 04c68496

drivers/scsi/lpfc/lpfc_attr.c

+13 −19
Original line number Diff line number Diff line
@@ -2924,6 +2924,14 @@ LPFC_ATTR_R(enable_hba_heartbeat, 1, 0, 1, "Enable HBA Heartbeat."); 
*/

LPFC_ATTR_R(enable_bg, 0, 0, 1, "Enable BlockGuard Support");



/*

# lpfc_enable_fip: When set, FIP is required to start discovery. If not

# set, the driver will add an FCF record manually if the port has no

# FCF records available and start discovery.

# Value range is [0,1]. Default value is 1 (enabled)

*/

LPFC_ATTR_RW(enable_fip, 0, 0, 1, "Enable FIP Discovery");





/*

# lpfc_prot_mask: i
@@ -2990,6 +2998,7 @@ struct device_attribute *lpfc_hba_attrs[] = { 
	&dev_attr_lpfc_peer_port_login,

	&dev_attr_lpfc_nodev_tmo,

	&dev_attr_lpfc_devloss_tmo,

	&dev_attr_lpfc_enable_fip,

	&dev_attr_lpfc_fcp_class,

	&dev_attr_lpfc_use_adisc,

	&dev_attr_lpfc_ack0,
@@ -3042,6 +3051,7 @@ struct device_attribute *lpfc_vport_attrs[] = { 
	&dev_attr_lpfc_lun_queue_depth,

	&dev_attr_lpfc_nodev_tmo,

	&dev_attr_lpfc_devloss_tmo,

	&dev_attr_lpfc_enable_fip,

	&dev_attr_lpfc_hba_queue_depth,

	&dev_attr_lpfc_peer_port_login,

	&dev_attr_lpfc_restrict_login,
@@ -4167,26 +4177,10 @@ lpfc_get_cfgparam(struct lpfc_hba *phba) 
	phba->cfg_soft_wwpn = 0L;

	lpfc_sg_seg_cnt_init(phba, lpfc_sg_seg_cnt);

	lpfc_prot_sg_seg_cnt_init(phba, lpfc_prot_sg_seg_cnt);

	/*

	 * Since the sg_tablesize is module parameter, the sg_dma_buf_size

	 * used to create the sg_dma_buf_pool must be dynamically calculated.

	 * 2 segments are added since the IOCB needs a command and response bde.

	 */

	phba->cfg_sg_dma_buf_size = sizeof(struct fcp_cmnd) +

			sizeof(struct fcp_rsp) +

			((phba->cfg_sg_seg_cnt + 2) * sizeof(struct ulp_bde64));



	if (phba->cfg_enable_bg) {

		phba->cfg_sg_seg_cnt = LPFC_MAX_SG_SEG_CNT;

		phba->cfg_sg_dma_buf_size +=

			phba->cfg_prot_sg_seg_cnt * sizeof(struct ulp_bde64);

	}



	/* Also reinitialize the host templates with new values. */

	lpfc_vport_template.sg_tablesize = phba->cfg_sg_seg_cnt;

	lpfc_template.sg_tablesize = phba->cfg_sg_seg_cnt;



	lpfc_hba_queue_depth_init(phba, lpfc_hba_queue_depth);

	lpfc_enable_fip_init(phba, lpfc_enable_fip);

	lpfc_hba_log_verbose_init(phba, lpfc_log_verbose);



	return;

}

drivers/scsi/lpfc/lpfc_crtn.h

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ typedef int (*node_filter)(struct lpfc_nodelist *, void *); 
struct fc_rport;

void lpfc_dump_mem(struct lpfc_hba *, LPFC_MBOXQ_t *, uint16_t);

void lpfc_dump_wakeup_param(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_dump_static_vport(struct lpfc_hba *, LPFC_MBOXQ_t *, uint16_t);

int lpfc_dump_fcoe_param(struct lpfc_hba *, struct lpfcMboxq *);

void lpfc_read_nv(struct lpfc_hba *, LPFC_MBOXQ_t *);

void lpfc_config_async(struct lpfc_hba *, LPFC_MBOXQ_t *, uint32_t);
@@ -108,6 +110,7 @@ int lpfc_issue_els_adisc(struct lpfc_vport *, struct lpfc_nodelist *, uint8_t); 
int lpfc_issue_els_logo(struct lpfc_vport *, struct lpfc_nodelist *, uint8_t);

int lpfc_issue_els_npiv_logo(struct lpfc_vport *, struct lpfc_nodelist *);

int lpfc_issue_els_scr(struct lpfc_vport *, uint32_t, uint8_t);

int lpfc_issue_fabric_reglogin(struct lpfc_vport *);

int lpfc_els_free_iocb(struct lpfc_hba *, struct lpfc_iocbq *);

int lpfc_ct_free_iocb(struct lpfc_hba *, struct lpfc_iocbq *);

int lpfc_els_rsp_acc(struct lpfc_vport *, uint32_t, struct lpfc_iocbq *,

drivers/scsi/lpfc/lpfc_els.c

+156 −23
Original line number Diff line number Diff line
@@ -387,6 +387,75 @@ lpfc_issue_fabric_reglogin(struct lpfc_vport *vport) 
	return -ENXIO;

}



/**

 * lpfc_issue_reg_vfi - Register VFI for this vport's fabric login

 * @vport: pointer to a host virtual N_Port data structure.

 *

 * This routine issues a REG_VFI mailbox for the vfi, vpi, fcfi triplet for

 * the @vport. This mailbox command is necessary for FCoE only.

 *

 * Return code

 *   0 - successfully issued REG_VFI for @vport

 *   A failure code otherwise.

 **/

static int

lpfc_issue_reg_vfi(struct lpfc_vport *vport)

{

	struct lpfc_hba  *phba = vport->phba;

	LPFC_MBOXQ_t *mboxq;

	struct lpfc_nodelist *ndlp;

	struct serv_parm *sp;

	struct lpfc_dmabuf *dmabuf;

	int rc = 0;



	sp = &phba->fc_fabparam;

	ndlp = lpfc_findnode_did(vport, Fabric_DID);

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

		rc = -ENODEV;

		goto fail;

	}



	dmabuf = kzalloc(sizeof(struct lpfc_dmabuf), GFP_KERNEL);

	if (!dmabuf) {

		rc = -ENOMEM;

		goto fail;

	}

	dmabuf->virt = lpfc_mbuf_alloc(phba, MEM_PRI, &dmabuf->phys);

	if (!dmabuf->virt) {

		rc = -ENOMEM;

		goto fail_free_dmabuf;

	}

	mboxq = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);

	if (!mboxq) {

		rc = -ENOMEM;

		goto fail_free_coherent;

	}

	vport->port_state = LPFC_FABRIC_CFG_LINK;

	memcpy(dmabuf->virt, &phba->fc_fabparam, sizeof(vport->fc_sparam));

	lpfc_reg_vfi(mboxq, vport, dmabuf->phys);

	mboxq->mbox_cmpl = lpfc_mbx_cmpl_reg_vfi;

	mboxq->vport = vport;

	mboxq->context1 = dmabuf;

	rc = lpfc_sli_issue_mbox(phba, mboxq, MBX_NOWAIT);

	if (rc == MBX_NOT_FINISHED) {

		rc = -ENXIO;

		goto fail_free_mbox;

	}

	return 0;



fail_free_mbox:

	mempool_free(mboxq, phba->mbox_mem_pool);

fail_free_coherent:

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

fail_free_dmabuf:

	kfree(dmabuf);

fail:

	lpfc_vport_set_state(vport, FC_VPORT_FAILED);

	lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,

		"0289 Issue Register VFI failed: Err %d\n", rc);

	return rc;

}



/**

 * lpfc_cmpl_els_flogi_fabric - Completion function for flogi to a fabric port

 * @vport: pointer to a host virtual N_Port data structure.
@@ -499,17 +568,24 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
		}

	}



	if (phba->sli_rev < LPFC_SLI_REV4) {

		lpfc_nlp_set_state(vport, ndlp, NLP_STE_REG_LOGIN_ISSUE);



		if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED &&

	    vport->fc_flag & FC_VPORT_NEEDS_REG_VPI) {

		    vport->fc_flag & FC_VPORT_NEEDS_REG_VPI)

			lpfc_register_new_vport(phba, vport, ndlp);

		return 0;

	}

		else

			lpfc_issue_fabric_reglogin(vport);

	} else {

		ndlp->nlp_type |= NLP_FABRIC;

		lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);

		if (vport->vfi_state & LPFC_VFI_REGISTERED) {

			lpfc_start_fdiscs(phba);

			lpfc_do_scr_ns_plogi(phba, vport);

		} else

			lpfc_issue_reg_vfi(vport);

	}

	return 0;

}



/**

 * lpfc_cmpl_els_flogi_nport - Completion function for flogi to an N_Port

 * @vport: pointer to a host virtual N_Port data structure.
@@ -817,9 +893,14 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	if (sp->cmn.fcphHigh < FC_PH3)

		sp->cmn.fcphHigh = FC_PH3;



	if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) {

	if  (phba->sli_rev == LPFC_SLI_REV4) {

		elsiocb->iocb.ulpCt_h = ((SLI4_CT_FCFI >> 1) & 1);

		elsiocb->iocb.ulpCt_l = (SLI4_CT_FCFI & 1);

		/* FLOGI needs to be 3 for WQE FCFI */

		/* Set the fcfi to the fcfi we registered with */

		elsiocb->iocb.ulpContext = phba->fcf.fcfi;

	} else if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) {

		sp->cmn.request_multiple_Nport = 1;



		/* For FLOGI, Let FLOGI rsp set the NPortID for VPI 0 */

		icmd->ulpCt_h = 1;

		icmd->ulpCt_l = 0;
@@ -932,6 +1013,8 @@ lpfc_initial_flogi(struct lpfc_vport *vport) 
		if (!ndlp)

			return 0;

		lpfc_nlp_init(vport, ndlp, Fabric_DID);

		/* Set the node type */

		ndlp->nlp_type |= NLP_FABRIC;

		/* Put ndlp onto node list */

		lpfc_enqueue_node(vport, ndlp);

	} else if (!NLP_CHK_NODE_ACT(ndlp)) {
@@ -1604,7 +1687,8 @@ lpfc_adisc_done(struct lpfc_vport *vport) 
	 * and continue discovery.

	 */

	if ((phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) &&

	    !(vport->fc_flag & FC_RSCN_MODE)) {

	    !(vport->fc_flag & FC_RSCN_MODE) &&

	    (phba->sli_rev < LPFC_SLI_REV4)) {

		lpfc_issue_reg_vpi(phba, vport);

		return;

	}
@@ -2937,6 +3021,14 @@ 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;



	/*

	 * This routine is used to register and unregister in previous SLI

	 * modes.

	 */

	if ((pmb->u.mb.mbxCommand == MBX_UNREG_LOGIN) &&

	    (phba->sli_rev == LPFC_SLI_REV4))

		lpfc_sli4_free_rpi(phba, pmb->u.mb.un.varUnregLogin.rpi);



	pmb->context1 = NULL;

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

	kfree(mp);
@@ -3816,7 +3908,9 @@ lpfc_rscn_payload_check(struct lpfc_vport *vport, uint32_t did) 
			payload_len -= sizeof(uint32_t);

			switch (rscn_did.un.b.resv & RSCN_ADDRESS_FORMAT_MASK) {

			case RSCN_ADDRESS_FORMAT_PORT:

				if (ns_did.un.word == rscn_did.un.word)

				if ((ns_did.un.b.domain == rscn_did.un.b.domain)

				    && (ns_did.un.b.area == rscn_did.un.b.area)

				    && (ns_did.un.b.id == rscn_did.un.b.id))

					goto return_did_out;

				break;

			case RSCN_ADDRESS_FORMAT_AREA:
@@ -4857,7 +4951,10 @@ lpfc_els_rcv_fan(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, 
		} else {

			/* FAN verified - skip FLOGI */

			vport->fc_myDID = vport->fc_prevDID;

			if (phba->sli_rev < LPFC_SLI_REV4)

				lpfc_issue_fabric_reglogin(vport);

			else

				lpfc_issue_reg_vfi(vport);

		}

	}

	return 0;
@@ -5540,11 +5637,10 @@ lpfc_els_unsol_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 


dropit:

	if (vport && !(vport->load_flag & FC_UNLOADING))

		lpfc_printf_log(phba, KERN_ERR, LOG_ELS,

			"(%d):0111 Dropping received ELS cmd "

		lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,

			"0111 Dropping received ELS cmd "

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

			vport->vpi, icmd->ulpStatus,

			icmd->un.ulpWord[4], icmd->ulpTimeout);

			icmd->ulpStatus, icmd->un.ulpWord[4], icmd->ulpTimeout);

	phba->fc_stat.elsRcvDrop++;

}
@@ -5620,10 +5716,9 @@ lpfc_els_unsol_event(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, 
	     icmd->ulpCommand == CMD_IOCB_RCV_SEQ64_CX)) {

		if (icmd->unsli3.rcvsli3.vpi == 0xffff)

			vport = phba->pport;

		else {

			uint16_t vpi = icmd->unsli3.rcvsli3.vpi;

			vport = lpfc_find_vport_by_vpid(phba, vpi);

		}

		else

			vport = lpfc_find_vport_by_vpid(phba,

				icmd->unsli3.rcvsli3.vpi - phba->vpi_base);

	}

	/* If there are no BDEs associated

	 * with this IOCB, there is nothing to do.
@@ -5792,7 +5887,10 @@ lpfc_cmpl_reg_new_vport(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 


	} else {

		if (vport == phba->pport)

			if (phba->sli_rev < LPFC_SLI_REV4)

				lpfc_issue_fabric_reglogin(vport);

			else

				lpfc_issue_reg_vfi(vport);

		else

			lpfc_do_scr_ns_plogi(phba, vport);

	}
@@ -5824,7 +5922,7 @@ lpfc_register_new_vport(struct lpfc_hba *phba, struct lpfc_vport *vport, 


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

	if (mbox) {

		lpfc_reg_vpi(phba, vport->vpi, vport->fc_myDID, mbox);

		lpfc_reg_vpi(vport, mbox);

		mbox->vport = vport;

		mbox->context2 = lpfc_nlp_get(ndlp);

		mbox->mbox_cmpl = lpfc_cmpl_reg_new_vport;
@@ -6496,3 +6594,38 @@ void lpfc_fabric_abort_hba(struct lpfc_hba *phba) 
	lpfc_sli_cancel_iocbs(phba, &completions, IOSTAT_LOCAL_REJECT,

			      IOERR_SLI_ABORTED);

}



/**

 * lpfc_sli4_els_xri_aborted - Slow-path process of els xri abort

 * @phba: pointer to lpfc hba data structure.

 * @axri: pointer to the els xri abort wcqe structure.

 *

 * This routine is invoked by the worker thread to process a SLI4 slow-path

 * ELS aborted xri.

 **/

void

lpfc_sli4_els_xri_aborted(struct lpfc_hba *phba,

			  struct sli4_wcqe_xri_aborted *axri)

{

	uint16_t xri = bf_get(lpfc_wcqe_xa_xri, axri);

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

	unsigned long iflag = 0;



	spin_lock_irqsave(&phba->sli4_hba.abts_sgl_list_lock, iflag);

	list_for_each_entry_safe(sglq_entry, sglq_next,

			&phba->sli4_hba.lpfc_abts_els_sgl_list, list) {

		if (sglq_entry->sli4_xritag == xri) {

			list_del(&sglq_entry->list);

			spin_unlock_irqrestore(

					&phba->sli4_hba.abts_sgl_list_lock,

					 iflag);

			spin_lock_irqsave(&phba->hbalock, iflag);



			list_add_tail(&sglq_entry->list,

				&phba->sli4_hba.lpfc_sgl_list);

			spin_unlock_irqrestore(&phba->hbalock, iflag);

			return;

		}

	}

	spin_unlock_irqrestore(&phba->sli4_hba.abts_sgl_list_lock, iflag);

}

drivers/scsi/lpfc/lpfc_hbadisc.c

+1040 −15

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/lpfc/lpfc_nportdisc.c

+27 −7
Original line number Diff line number Diff line
@@ -363,7 +363,7 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
	if (!mbox)

		goto out;



	rc = lpfc_reg_login(phba, vport->vpi, icmd->un.rcvels.remoteID,

	rc = lpfc_reg_rpi(phba, vport->vpi, icmd->un.rcvels.remoteID,

			    (uint8_t *) sp, mbox, 0);

	if (rc) {

		mempool_free(mbox, phba->mbox_mem_pool);
@@ -497,8 +497,16 @@ lpfc_rcv_logo(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
		lpfc_els_rsp_acc(vport, ELS_CMD_PRLO, cmdiocb, ndlp, NULL);

	else

		lpfc_els_rsp_acc(vport, ELS_CMD_ACC, cmdiocb, ndlp, NULL);

	if ((ndlp->nlp_type & NLP_FABRIC) &&

		vport->port_type == LPFC_NPIV_PORT) {

		lpfc_linkdown_port(vport);

		mod_timer(&ndlp->nlp_delayfunc, jiffies + HZ * 1);

		spin_lock_irq(shost->host_lock);

		ndlp->nlp_flag |= NLP_DELAY_TMO;

		spin_unlock_irq(shost->host_lock);



	if ((!(ndlp->nlp_type & NLP_FABRIC) &&

		ndlp->nlp_last_elscmd = ELS_CMD_FDISC;

	} else if ((!(ndlp->nlp_type & NLP_FABRIC) &&

		((ndlp->nlp_type & NLP_FCP_TARGET) ||

		!(ndlp->nlp_type & NLP_FCP_INITIATOR))) ||

		(ndlp->nlp_state == NLP_STE_ADISC_ISSUE)) {
@@ -569,7 +577,7 @@ lpfc_disc_set_adisc(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
{

	struct Scsi_Host *shost = lpfc_shost_from_vport(vport);



	if (!ndlp->nlp_rpi) {

	if (!(ndlp->nlp_flag & NLP_RPI_VALID)) {

		ndlp->nlp_flag &= ~NLP_NPR_ADISC;

		return 0;

	}
@@ -859,7 +867,7 @@ lpfc_cmpl_plogi_plogi_issue(struct lpfc_vport *vport, 


	lpfc_unreg_rpi(vport, ndlp);



	if (lpfc_reg_login(phba, vport->vpi, irsp->un.elsreq64.remoteID,

	if (lpfc_reg_rpi(phba, vport->vpi, irsp->un.elsreq64.remoteID,

			   (uint8_t *) sp, mbox, 0) == 0) {

		switch (ndlp->nlp_DID) {

		case NameServer_DID:
@@ -1070,6 +1078,7 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_vport *vport, 
	struct lpfc_iocbq *cmdiocb, *rspiocb;

	IOCB_t *irsp;

	ADISC *ap;

	int rc;



	cmdiocb = (struct lpfc_iocbq *) arg;

	rspiocb = cmdiocb->context_un.rsp_iocb;
@@ -1095,6 +1104,15 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_vport *vport, 
		return ndlp->nlp_state;

	}



	if (phba->sli_rev == LPFC_SLI_REV4) {

		rc = lpfc_sli4_resume_rpi(ndlp);

		if (rc) {

			/* Stay in state and retry. */

			ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;

			return ndlp->nlp_state;

		}

	}



	if (ndlp->nlp_type & NLP_FCP_TARGET) {

		ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;

		lpfc_nlp_set_state(vport, ndlp, NLP_STE_MAPPED_NODE);
@@ -1102,6 +1120,7 @@ lpfc_cmpl_adisc_adisc_issue(struct lpfc_vport *vport, 
		ndlp->nlp_prev_state = NLP_STE_ADISC_ISSUE;

		lpfc_nlp_set_state(vport, ndlp, NLP_STE_UNMAPPED_NODE);

	}



	return ndlp->nlp_state;

}
@@ -1285,6 +1304,7 @@ lpfc_cmpl_reglogin_reglogin_issue(struct lpfc_vport *vport, 
	}



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

	ndlp->nlp_flag |= NLP_RPI_VALID;



	/* Only if we are not a fabric nport do we issue PRLI */

	if (!(ndlp->nlp_type & NLP_FABRIC)) {