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

Commit 0c287589 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.3 : FC/FCOE discovery fixes 



Contains the following changes:
- Force vport to send LOGO to fabric controller when deleting vport
- Fixed driver failing to register login when a PLOGI is received
- Fixes for FIP discovery
- Added stricter checks for FCF addressing mode
- Added code to send only FLOGI, FDISC and LOGO to Fabric controller as FIP
- Fixed handling of LOGO from Fabric port
- Fixed consecutive link up events skipped link_down processing

Signed-off-by: default avatarJames Smart <James.Smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent f1126688

drivers/scsi/lpfc/lpfc_els.c

+13 −0
Original line number Diff line number Diff line
@@ -168,6 +168,19 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp, 
	if (elsiocb == NULL)

		return NULL;



	/*

	 * If this command is for fabric controller and HBA running

	 * in FIP mode send FLOGI, FDISC and LOGO as FIP frames.

	 */

	if ((did == Fabric_DID) &&

		bf_get(lpfc_fip_flag, &phba->sli4_hba.sli4_flags) &&

		((elscmd == ELS_CMD_FLOGI) ||

		 (elscmd == ELS_CMD_FDISC) ||

		 (elscmd == ELS_CMD_LOGO)))

		elsiocb->iocb_flag |= LPFC_FIP_ELS;

	else

		elsiocb->iocb_flag &= ~LPFC_FIP_ELS;



	icmd = &elsiocb->iocb;



	/* fill in BDEs for command */

drivers/scsi/lpfc/lpfc_hbadisc.c

+28 −7
Original line number Diff line number Diff line
@@ -1197,6 +1197,11 @@ lpfc_match_fcf_conn_list(struct lpfc_hba *phba, 
{

	struct lpfc_fcf_conn_entry *conn_entry;



	/* If FCF not available return 0 */

	if (!bf_get(lpfc_fcf_record_fcf_avail, new_fcf_record) ||

		!bf_get(lpfc_fcf_record_fcf_valid, new_fcf_record))

		return 0;



	if (!phba->cfg_enable_fip) {

		*boot_flag = 0;

		*addr_mode = bf_get(lpfc_fcf_record_mac_addr_prov,
@@ -1216,6 +1221,14 @@ lpfc_match_fcf_conn_list(struct lpfc_hba *phba, 
		*boot_flag = 0;

		*addr_mode = bf_get(lpfc_fcf_record_mac_addr_prov,

			new_fcf_record);



		/*

		 * When there are no FCF connect entries, use driver's default

		 * addressing mode - FPMA.

		 */

		if (*addr_mode & LPFC_FCF_FPMA)

			*addr_mode = LPFC_FCF_FPMA;



		*vlan_id = 0xFFFF;

		return 1;

	}
@@ -1240,6 +1253,14 @@ lpfc_match_fcf_conn_list(struct lpfc_hba *phba, 
				continue;

		}



		/*

		 * If connection record does not support any addressing mode,

		 * skip the FCF record.

		 */

		if (!(bf_get(lpfc_fcf_record_mac_addr_prov, new_fcf_record)

			& (LPFC_FCF_FPMA | LPFC_FCF_SPMA)))

			continue;



		/*

		 * Check if the connection record specifies a required

		 * addressing mode.
@@ -1272,6 +1293,11 @@ lpfc_match_fcf_conn_list(struct lpfc_hba *phba, 
		else

			*boot_flag = 0;



		/*

		 * If user did not specify any addressing mode, or if the

		 * prefered addressing mode specified by user is not supported

		 * by FCF, allow fabric to pick the addressing mode.

		 */

		*addr_mode = bf_get(lpfc_fcf_record_mac_addr_prov,

				new_fcf_record);

		/*
@@ -1297,12 +1323,6 @@ lpfc_match_fcf_conn_list(struct lpfc_hba *phba, 
			!(conn_entry->conn_rec.flags & FCFCNCT_AM_SPMA) &&

			(*addr_mode & LPFC_FCF_FPMA))

				*addr_mode = LPFC_FCF_FPMA;

		/*

		 * If user did not specify any addressing mode, use FPMA if

		 * possible else use SPMA.

		 */

		else if (*addr_mode & LPFC_FCF_FPMA)

			*addr_mode = LPFC_FCF_FPMA;



		if (conn_entry->conn_rec.flags & FCFCNCT_VLAN_VALID)

			*vlan_id = conn_entry->conn_rec.vlan_tag;
@@ -1864,7 +1884,7 @@ lpfc_mbx_cmpl_read_la(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
		vport->fc_flag &= ~FC_BYPASSED_MODE;

	spin_unlock_irq(shost->host_lock);



	if (((phba->fc_eventTag + 1) < la->eventTag) ||

	if ((phba->fc_eventTag  < la->eventTag) ||

	    (phba->fc_eventTag == la->eventTag)) {

		phba->fc_stat.LinkMultiEvent++;

		if (la->attType == AT_LINK_UP)
@@ -2925,6 +2945,7 @@ lpfc_unreg_rpi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) 
		lpfc_no_rpi(phba, ndlp);

		ndlp->nlp_rpi = 0;

		ndlp->nlp_flag &= ~NLP_RPI_VALID;

		ndlp->nlp_flag &= ~NLP_NPR_ADISC;

		return 1;

	}

	return 0;

drivers/scsi/lpfc/lpfc_hw4.h

+1 −1
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ struct fcf_record { 
#define lpfc_fcf_record_mac_5_WORD		word4

#define lpfc_fcf_record_fcf_avail_SHIFT		16

#define lpfc_fcf_record_fcf_avail_MASK		0x000000FF

#define lpfc_fcf_record_fc_avail_WORD		word4

#define lpfc_fcf_record_fcf_avail_WORD		word4

#define lpfc_fcf_record_mac_addr_prov_SHIFT	24

#define lpfc_fcf_record_mac_addr_prov_MASK	0x000000FF

#define lpfc_fcf_record_mac_addr_prov_WORD	word4

drivers/scsi/lpfc/lpfc_mbox.c

+4 −2
Original line number Diff line number Diff line
@@ -1715,8 +1715,10 @@ lpfc_request_features(struct lpfc_hba *phba, struct lpfcMboxq *mboxq) 
	/* Set up host requested features. */

	bf_set(lpfc_mbx_rq_ftr_rq_fcpi, &mboxq->u.mqe.un.req_ftrs, 1);



	/* Virtual fabrics and FIPs are not supported yet. */

	if (phba->cfg_enable_fip)

		bf_set(lpfc_mbx_rq_ftr_rq_ifip, &mboxq->u.mqe.un.req_ftrs, 0);

	else

		bf_set(lpfc_mbx_rq_ftr_rq_ifip, &mboxq->u.mqe.un.req_ftrs, 1);



	/* Enable DIF (block guard) only if configured to do so. */

	if (phba->cfg_enable_bg)

drivers/scsi/lpfc/lpfc_nportdisc.c

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ 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) &&

	if ((ndlp->nlp_DID == Fabric_DID) &&

		vport->port_type == LPFC_NPIV_PORT) {

		lpfc_linkdown_port(vport);

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