Commit c9f8735b authored by Jamie Wellnitz's avatar Jamie Wellnitz Committed by James Bottomley
Browse files

[SCSI] lpfc 8.1.2: Misc FC Discovery changes : 



Misc FC Discovery changes :
   - Added FC_BYPASSED_MODE statistic
   - Corrected some log message data
   - Fix up Discovery infrastructure to support FAN:
       Allow Fabric entities to flow thru DSM
       Fix up linkup/linkdown unregister login processing for Fabric entities
       Clean up Discovery code
       Utilize nodev_tmo for Fabric entities
   - Use of 3 * ratov for CT handling timeouts
   - Fix up DSM to make more appropriate decisions and clean up code.

Signed-off-by: default avatarJamie Wellnitz <Jamie.Wellnitz@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent b28485ac

drivers/scsi/lpfc/lpfc.h

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ struct lpfc_hba { 
#define FC_SCSI_SCAN_TMO        0x4000	/* scsi scan timer running */

#define FC_ABORT_DISCOVERY      0x8000	/* we want to abort discovery */

#define FC_NDISC_ACTIVE         0x10000	/* NPort discovery active */

#define FC_BYPASSED_MODE        0x20000	/* NPort is in bypassed mode */



	uint32_t fc_topology;	/* link topology, from LINK INIT */

drivers/scsi/lpfc/lpfc_ct.c

+9 −2
Original line number Diff line number Diff line
@@ -260,8 +260,10 @@ lpfc_gen_req(struct lpfc_hba *phba, struct lpfc_dmabuf *bmp, 
	icmd->un.genreq64.w5.hcsw.Rctl = FC_UNSOL_CTL;

	icmd->un.genreq64.w5.hcsw.Type = FC_COMMON_TRANSPORT_ULP;



	if (!tmo)

		tmo = (2 * phba->fc_ratov) + 1;

	if (!tmo) {

		 /* FC spec states we need 3 * ratov for CT requests */

		tmo = (3 * phba->fc_ratov);

	}

	icmd->ulpTimeout = tmo;

	icmd->ulpBdeCount = 1;

	icmd->ulpLe = 1;
@@ -449,6 +451,11 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba * phba, struct lpfc_iocbq * cmdiocb, 
		CTrsp = (struct lpfc_sli_ct_request *) outp->virt;

		if (CTrsp->CommandResponse.bits.CmdRsp ==

		    be16_to_cpu(SLI_CT_RESPONSE_FS_ACC)) {

			lpfc_printf_log(phba, KERN_INFO, LOG_DISCOVERY,

					"%d:0239 NameServer Rsp "

					"Data: x%x\n",

					phba->brd_no,

					phba->fc_flag);

			lpfc_ns_rsp(phba, outp,

				    (uint32_t) (irsp->un.genreq64.bdl.bdeSize));

		} else if (CTrsp->CommandResponse.bits.CmdRsp ==

drivers/scsi/lpfc/lpfc_els.c

+144 −186

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/lpfc/lpfc_hbadisc.c

+132 −88

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/lpfc/lpfc_nportdisc.c

+166 −117

File changed.

Preview size limit exceeded, changes collapsed.