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

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

[SCSI] lpfc 8.3.18: Add logic to detect last devloss timeout 



Added driver logic to detect the last devloss timeout of remote nodes which
was still in use of FCF. At that point, the driver should set the last
in-use remote node devloss timeout flag if it was not already set and should
perform proper action on the in-use FCF and recover of FCF from firmware,
depending on the state the driver's FIP engine is in.

Find eligible FCF through FCF table rescan or the next new FCF event when
FCF table rescan turned out empty eligible FCF, and the successful flogi
into an FCF shall clear the HBA_DEVLOSS_TMO flag, indicating the successful
recovery from devloss timeout.

[jejb: add delay.h include to lpfc_hbadisc.c to fix ppc compile]
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 <James.Bottomley@suse.de>
parent 12265f68

drivers/scsi/lpfc/lpfc.h

+5 −3
Original line number Diff line number Diff line
@@ -552,9 +552,11 @@ struct lpfc_hba { 
#define ELS_XRI_ABORT_EVENT	0x40

#define ASYNC_EVENT		0x80

#define LINK_DISABLED		0x100 /* Link disabled by user */

#define FCF_DISC_INPROGRESS	0x200 /* FCF discovery in progress */

#define HBA_FIP_SUPPORT		0x400 /* FIP support in HBA */

#define HBA_AER_ENABLED		0x800 /* AER enabled with HBA */

#define FCF_TS_INPROG           0x200 /* FCF table scan in progress */

#define FCF_RR_INPROG           0x400 /* FCF roundrobin flogi in progress */

#define HBA_FIP_SUPPORT		0x800 /* FIP support in HBA */

#define HBA_AER_ENABLED		0x1000 /* AER enabled with HBA */

#define HBA_DEVLOSS_TMO         0x2000 /* HBA in devloss timeout */

	uint32_t fcp_ring_in_use; /* When polling test if intr-hndlr active*/

	struct lpfc_dmabuf slim2p;

drivers/scsi/lpfc/lpfc_crtn.h

+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ void lpfc_sli4_fcf_dead_failthrough(struct lpfc_hba *); 
uint16_t lpfc_sli4_fcf_rr_next_index_get(struct lpfc_hba *);

int lpfc_sli4_fcf_rr_index_set(struct lpfc_hba *, uint16_t);

void lpfc_sli4_fcf_rr_index_clear(struct lpfc_hba *, uint16_t);

int lpfc_sli4_fcf_rr_next_proc(struct lpfc_vport *, uint16_t);



int lpfc_mem_alloc(struct lpfc_hba *, int align);

void lpfc_mem_free(struct lpfc_hba *);

drivers/scsi/lpfc/lpfc_els.c

+11 −43
Original line number Diff line number Diff line
@@ -803,49 +803,17 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
		    (irsp->ulpStatus != IOSTAT_LOCAL_REJECT) &&

		    (irsp->un.ulpWord[4] != IOERR_SLI_ABORTED)) {

			lpfc_printf_log(phba, KERN_WARNING, LOG_FIP | LOG_ELS,

					"2611 FLOGI failed on registered "

					"FCF record fcf_index(%d), status: "

					"x%x/x%x, tmo:x%x, trying to perform "

					"round robin failover\n",

					"2611 FLOGI failed on FCF (x%x), "

					"status:x%x/x%x, tmo:x%x, perform "

					"roundrobin FCF failover\n",

					phba->fcf.current_rec.fcf_indx,

					irsp->ulpStatus, irsp->un.ulpWord[4],

					irsp->ulpTimeout);

			fcf_index = lpfc_sli4_fcf_rr_next_index_get(phba);

			if (fcf_index == LPFC_FCOE_FCF_NEXT_NONE) {

				/*

				 * Exhausted the eligible FCF record list,

				 * fail through to retry FLOGI on current

				 * FCF record.

				 */

				lpfc_printf_log(phba, KERN_WARNING,

						LOG_FIP | LOG_ELS,

						"2760 Completed one round "

						"of FLOGI FCF round robin "

						"failover list, retry FLOGI "

						"on currently registered "

						"FCF index:%d\n",

						phba->fcf.current_rec.fcf_indx);

			} else {

				lpfc_printf_log(phba, KERN_INFO,

						LOG_FIP | LOG_ELS,

						"2794 FLOGI FCF round robin "

						"failover to FCF index x%x\n",

						fcf_index);

				rc = lpfc_sli4_fcf_rr_read_fcf_rec(phba,

								   fcf_index);

			rc = lpfc_sli4_fcf_rr_next_proc(vport, fcf_index);

			if (rc)

					lpfc_printf_log(phba, KERN_WARNING,

							LOG_FIP | LOG_ELS,

							"2761 FLOGI round "

							"robin FCF failover "

							"read FCF failed "

							"rc:x%x, fcf_index:"

							"%d\n", rc,

						phba->fcf.current_rec.fcf_indx);

				else

				goto out;

		}

		}



		/* FLOGI failure */

		lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
@@ -934,6 +902,7 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
			lpfc_nlp_put(ndlp);

			spin_lock_irq(&phba->hbalock);

			phba->fcf.fcf_flag &= ~FCF_DISCOVERY;

			phba->hba_flag &= ~(FCF_RR_INPROG | HBA_DEVLOSS_TMO);

			spin_unlock_irq(&phba->hbalock);

			goto out;

		}
@@ -942,13 +911,12 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
			if (phba->hba_flag & HBA_FIP_SUPPORT)

				lpfc_printf_vlog(vport, KERN_INFO, LOG_FIP |

						LOG_ELS,

						"2769 FLOGI successful on FCF "

						"record: current_fcf_index:"

						"x%x, terminate FCF round "

						"robin failover process\n",

						"2769 FLOGI to FCF (x%x) "

						"completed successfully\n",

						phba->fcf.current_rec.fcf_indx);

			spin_lock_irq(&phba->hbalock);

			phba->fcf.fcf_flag &= ~FCF_DISCOVERY;

			phba->hba_flag &= ~(FCF_RR_INPROG | HBA_DEVLOSS_TMO);

			spin_unlock_irq(&phba->hbalock);

			goto out;

		}

drivers/scsi/lpfc/lpfc_hbadisc.c

+264 −85

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/lpfc/lpfc_init.c

+18 −23

File changed.

Preview size limit exceeded, changes collapsed.