Commit 5248a749 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.25: Fabric and Target Discovery Fixes 



Fabric and Target Discovery Fixes

- Clear FC_VPORT_NEEDS_INIT_VPI flag during completion of REG_VFI mailbox
  command.
- Prevent SLI3 Code from unregistering the physical VPI.
- Add an else clause to the code that checks and sets
  sp->cmn.request_multiple_Nport to clear the bit.
- Remove a redundant mbox free.
- Modified lpfc_sli4_async_fip_evt to pass in physical VPI toi
  lpfc_find_vport_by_vpid function.
- Modified lpfc_find_vport_by_vpid to translate physical VPI to logical VPI
  before comparing with vport VPI.

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 7851fe2c

drivers/scsi/lpfc/lpfc_els.c

+15 −18
Original line number Diff line number Diff line
@@ -647,21 +647,15 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
		}

		lpfc_cleanup_pending_mbox(vport);



		if (phba->sli_rev == LPFC_SLI_REV4)

		if (phba->sli_rev == LPFC_SLI_REV4) {

			lpfc_sli4_unreg_all_rpis(vport);



		if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED) {

			lpfc_mbx_unreg_vpi(vport);

			spin_lock_irq(shost->host_lock);

			vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;

			spin_unlock_irq(shost->host_lock);

		}

			/*

			* If VPI is unreged, driver need to do INIT_VPI

			* before re-registering

			*/

		if (phba->sli_rev == LPFC_SLI_REV4) {

			spin_lock_irq(shost->host_lock);

			vport->fc_flag |= FC_VPORT_NEEDS_INIT_VPI;

			spin_unlock_irq(shost->host_lock);

		}
@@ -1096,11 +1090,14 @@ lpfc_issue_els_flogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
			/* Set the fcfi to the fcfi we registered with */

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

		}

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

	} 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;

		} else

			sp->cmn.request_multiple_Nport = 0;

	}



	if (phba->fc_topology != LPFC_TOPOLOGY_LOOP) {
@@ -6608,7 +6605,7 @@ lpfc_find_vport_by_vpid(struct lpfc_hba *phba, uint16_t vpi) 
{

	struct lpfc_vport *vport;

	unsigned long flags;

	int i;

	int i = 0;



	/* The physical ports are always vpi 0 - translate is unnecessary. */

	if (vpi > 0) {
@@ -6631,7 +6628,7 @@ lpfc_find_vport_by_vpid(struct lpfc_hba *phba, uint16_t vpi) 


	spin_lock_irqsave(&phba->hbalock, flags);

	list_for_each_entry(vport, &phba->port_list, listentry) {

		if (vport->vpi == vpi) {

		if (vport->vpi == i) {

			spin_unlock_irqrestore(&phba->hbalock, flags);

			return vport;

		}

drivers/scsi/lpfc/lpfc_hbadisc.c

+1 −1
Original line number Diff line number Diff line
@@ -2247,7 +2247,6 @@ read_next_fcf: 
				spin_lock_irq(&phba->hbalock);

				phba->fcf.fcf_flag |= FCF_REDISC_FOV;

				spin_unlock_irq(&phba->hbalock);

				lpfc_sli4_mbox_cmd_free(phba, mboxq);

				lpfc_sli4_fcf_scan_read_fcf_rec(phba,

						LPFC_FCOE_FCF_GET_FIRST);

				return;
@@ -2645,6 +2644,7 @@ lpfc_mbx_cmpl_reg_vfi(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq) 
	vport->vpi_state |= LPFC_VPI_REGISTERED;

	vport->fc_flag |= FC_VFI_REGISTERED;

	vport->fc_flag &= ~FC_VPORT_NEEDS_REG_VPI;

	vport->fc_flag &= ~FC_VPORT_NEEDS_INIT_VPI;

	spin_unlock_irq(shost->host_lock);



	if (vport->port_state == LPFC_FABRIC_CFG_LINK) {

drivers/scsi/lpfc/lpfc_init.c

+2 −2
Original line number Diff line number Diff line
@@ -3649,7 +3649,7 @@ lpfc_sli4_async_fip_evt(struct lpfc_hba *phba, 
			" tag 0x%x\n", acqe_fip->index, acqe_fip->event_tag);



		vport = lpfc_find_vport_by_vpid(phba,

				acqe_fip->index - phba->vpi_base);

						acqe_fip->index);

		ndlp = lpfc_sli4_perform_vport_cvl(vport);

		if (!ndlp)

			break;
@@ -4518,7 +4518,7 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba) 
		}

	}



	return rc;

	return 0;



out_free_fcp_eq_hdl:

	kfree(phba->sli4_hba.fcp_eq_hdl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE