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

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

[SCSI] lpfc 8.3.39: Reduced tmo value set to FLOGI WQE for quick recovery from... 


[SCSI] lpfc 8.3.39: Reduced tmo value set to FLOGI WQE for quick recovery from FLOGI sequence timeout

Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 18775708

drivers/scsi/lpfc/lpfc_els.c

+6 −3
Original line number Diff line number Diff line
@@ -239,6 +239,9 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp, 


		icmd->un.elsreq64.remoteID = did;		/* DID */

		icmd->ulpCommand = CMD_ELS_REQUEST64_CR;

		if (elscmd == ELS_CMD_FLOGI)

			icmd->ulpTimeout = FF_DEF_RATOV * 2;

		else

			icmd->ulpTimeout = phba->fc_ratov * 2;

	} else {

		icmd->un.xseq64.bdl.addrHigh = putPaddrHigh(pbuflist->phys);
@@ -1086,8 +1089,8 @@ stop_rr_fcf_flogi: 


	/* FLOGI completes successfully */

	lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS,

			 "0101 FLOGI completes successfully "

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

			 "0101 FLOGI completes successfully, I/O tag:x%x, "

			 "Data: x%x x%x x%x x%x x%x x%x\n", cmdiocb->iotag,

			 irsp->un.ulpWord[4], sp->cmn.e_d_tov,

			 sp->cmn.w2.r_a_tov, sp->cmn.edtovResolution,

			 vport->port_state, vport->fc_flag);

drivers/scsi/lpfc/lpfc_hbadisc.c

+5 −2
Original line number Diff line number Diff line
@@ -2272,8 +2272,11 @@ lpfc_mbx_cmpl_fcf_scan_read_fcf_rec(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq) 
				spin_unlock_irq(&phba->hbalock);

				lpfc_printf_log(phba, KERN_INFO, LOG_FIP,

						"2836 New FCF matches in-use "

						"FCF (x%x)\n",

						phba->fcf.current_rec.fcf_indx);

						"FCF (x%x), port_state:x%x, "

						"fc_flag:x%x\n",

						phba->fcf.current_rec.fcf_indx,

						phba->pport->port_state,

						phba->pport->fc_flag);

				goto out;

			} else

				lpfc_printf_log(phba, KERN_ERR, LOG_FIP,

drivers/scsi/lpfc/lpfc_sli.c

+6 −5
Original line number Diff line number Diff line
@@ -13992,13 +13992,14 @@ lpfc_fc_frame_check(struct lpfc_hba *phba, struct fc_frame_header *fc_hdr) 
	}



	lpfc_printf_log(phba, KERN_INFO, LOG_ELS,

			"2538 Received frame rctl:%s type:%s "

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

			rctl_names[fc_hdr->fh_r_ctl],

			type_names[fc_hdr->fh_type],

			"2538 Received frame rctl:%s (x%x), type:%s (x%x), "

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

			rctl_names[fc_hdr->fh_r_ctl], fc_hdr->fh_r_ctl,

			type_names[fc_hdr->fh_type], fc_hdr->fh_type,

			be32_to_cpu(header[0]), be32_to_cpu(header[1]),

			be32_to_cpu(header[2]), be32_to_cpu(header[3]),

			be32_to_cpu(header[4]), be32_to_cpu(header[5]));

			be32_to_cpu(header[4]), be32_to_cpu(header[5]),

			be32_to_cpu(header[6]));

	return 0;

drop:

	lpfc_printf_log(phba, KERN_WARNING, LOG_ELS,