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

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

[SCSI] lpfc 8.3.9: Discovery changes to the lpfc driver. 



- Add init_vpi mailbox command before re-registering VPI.
- Add Fast FCF failover support.

Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 1dfb5a47

drivers/scsi/lpfc/lpfc_crtn.h

+8 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ void lpfc_set_disctmo(struct lpfc_vport *); 
int  lpfc_can_disctmo(struct lpfc_vport *);

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

void lpfc_unreg_all_rpis(struct lpfc_vport *);

void lpfc_unreg_hba_rpis(struct lpfc_hba *);

void lpfc_unreg_default_rpis(struct lpfc_vport *);

void lpfc_issue_reg_vpi(struct lpfc_hba *, struct lpfc_vport *);
@@ -202,6 +203,7 @@ void lpfc_reg_fcfi(struct lpfc_hba *, struct lpfcMboxq *); 
void lpfc_unreg_fcfi(struct lpfcMboxq *, uint16_t);

void lpfc_resume_rpi(struct lpfcMboxq *, struct lpfc_nodelist *);

int lpfc_check_pending_fcoe_event(struct lpfc_hba *, uint8_t);

void lpfc_issue_init_vpi(struct lpfc_vport *);



void lpfc_config_hbq(struct lpfc_hba *, uint32_t, struct lpfc_hbq_init *,

	uint32_t , LPFC_MBOXQ_t *);
@@ -211,7 +213,11 @@ struct hbq_dmabuf *lpfc_sli4_rb_alloc(struct lpfc_hba *); 
void lpfc_sli4_rb_free(struct lpfc_hba *, struct hbq_dmabuf *);

void lpfc_sli4_build_dflt_fcf_record(struct lpfc_hba *, struct fcf_record *,

			uint16_t);

void lpfc_unregister_fcf(struct lpfc_hba *);

void lpfc_unregister_fcf_rescan(struct lpfc_hba *);

void lpfc_unregister_unused_fcf(struct lpfc_hba *);

int lpfc_sli4_redisc_fcf_table(struct lpfc_hba *);

void lpfc_fcf_redisc_wait_start_timer(struct lpfc_hba *);



int lpfc_mem_alloc(struct lpfc_hba *, int align);

void lpfc_mem_free(struct lpfc_hba *);
@@ -370,6 +376,8 @@ void lpfc_free_fast_evt(struct lpfc_hba *, struct lpfc_fast_path_event *); 
void lpfc_create_static_vport(struct lpfc_hba *);

void lpfc_stop_hba_timers(struct lpfc_hba *);

void lpfc_stop_port(struct lpfc_hba *);

void __lpfc_sli4_stop_fcf_redisc_wait_timer(struct lpfc_hba *);

void lpfc_sli4_stop_fcf_redisc_wait_timer(struct lpfc_hba *);

void lpfc_parse_fcoe_conf(struct lpfc_hba *, uint8_t *, uint32_t);

int lpfc_parse_vpd(struct lpfc_hba *, uint8_t *, int);

void lpfc_start_fdiscs(struct lpfc_hba *phba);

drivers/scsi/lpfc/lpfc_els.c

+14 −2
Original line number Diff line number Diff line
@@ -589,6 +589,15 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
			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);

		}

	}



	if (phba->sli_rev < LPFC_SLI_REV4) {
@@ -606,7 +615,7 @@ lpfc_cmpl_els_flogi_fabric(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp, 
			lpfc_start_fdiscs(phba);

			lpfc_do_scr_ns_plogi(phba, vport);

		} else if (vport->fc_flag & FC_VFI_REGISTERED)

			lpfc_register_new_vport(phba, vport, ndlp);

			lpfc_issue_init_vpi(vport);

		else

			lpfc_issue_reg_vfi(vport);

	}
@@ -6210,10 +6219,13 @@ lpfc_cmpl_els_fdisc(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
		lpfc_mbx_unreg_vpi(vport);

		spin_lock_irq(shost->host_lock);

		vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;

		vport->fc_flag |= FC_VPORT_NEEDS_INIT_VPI;

		spin_unlock_irq(shost->host_lock);

	}



	if (vport->fc_flag & FC_VPORT_NEEDS_REG_VPI)

	if (vport->fc_flag & FC_VPORT_NEEDS_INIT_VPI)

		lpfc_issue_init_vpi(vport);

	else if (vport->fc_flag & FC_VPORT_NEEDS_REG_VPI)

		lpfc_register_new_vport(phba, vport, ndlp);

	else

		lpfc_do_scr_ns_plogi(phba, vport);