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

lpfc: Fix FDMI Fabric support in driver for Brocade 



Signed-off-by: default avatarDick Kennedy <dick.kennedy@emulex.com>
Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent f0bf5f91

drivers/scsi/lpfc/lpfc.h

+3 −0
Original line number Diff line number Diff line
@@ -413,6 +413,9 @@ struct lpfc_vport { 
	uint32_t cfg_fcp_class;

	uint32_t cfg_use_adisc;

	uint32_t cfg_fdmi_on;

#define LPFC_FDMI_SUPPORT	1	/* bit 0 - FDMI supported? */

#define LPFC_FDMI_REG_DELAY	2	/* bit 1 - 60 sec registration delay */

#define LPFC_FDMI_ALL_ATTRIB	4	/* bit 2 - register ALL attributes? */

	uint32_t cfg_discovery_threads;

	uint32_t cfg_log_verbose;

	uint32_t cfg_max_luns;

drivers/scsi/lpfc/lpfc_attr.c

+11 −5
Original line number Diff line number Diff line
@@ -4573,12 +4573,18 @@ LPFC_ATTR_R(multi_ring_type, FC_TYPE_IP, 1, 


/*

# lpfc_fdmi_on: controls FDMI support.

#       0 = no FDMI support

#       1 = support FDMI without attribute of hostname

#       2 = support FDMI with attribute of hostname

# Value range [0,2]. Default value is 0.

#               Set                NOT Set

#       bit 0 = FDMI support       no FDMI support

#           LPFC_FDMI_SUPPORT just turns basic support on/off

#       bit 1 = Register delay     no register delay  (60 seconds)

#           LPFC_FDMI_REG_DELAY	60 sec registration delay after FDMI login

#       bit 2 = All attributes     Use a attribute subset

#           LPFC_FDMI_ALL_ATTRIB applies to both port and HBA attributes

#           Port attrutes subset: 1 thru 6 OR all: 1 thru 0xd 0x101 0x102 0x103

#           HBA attributes subset: 1 thru 0xb OR all: 1 thru 0xc

# Value range [0,7]. Default value is 0.

*/

LPFC_VPORT_ATTR_RW(fdmi_on, 0, 0, 2, "Enable FDMI support");

LPFC_VPORT_ATTR_RW(fdmi_on, 0, 0, 7, "Enable FDMI support");



/*

# Specifies the maximum number of ELS cmds we can have outstanding (for

drivers/scsi/lpfc/lpfc_ct.c

+535 −180

File changed.

Preview size limit exceeded, changes collapsed.

drivers/scsi/lpfc/lpfc_els.c

+1 −1
Original line number Diff line number Diff line
@@ -7172,7 +7172,7 @@ lpfc_do_scr_ns_plogi(struct lpfc_hba *phba, struct lpfc_vport *vport) 
		return;

	}



	if (vport->cfg_fdmi_on) {

	if (vport->cfg_fdmi_on & LPFC_FDMI_SUPPORT) {

		/* If this is the first time, allocate an ndlp and initialize

		 * it. Otherwise, make sure the node is enabled and then do the

		 * login.

drivers/scsi/lpfc/lpfc_hbadisc.c

+3 −3
Original line number Diff line number Diff line
@@ -5489,11 +5489,11 @@ lpfc_mbx_cmpl_fdmi_reg_login(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb) 
	 * fdmi-on=2 (supporting RPA/hostnmae)

	 */



	if (vport->cfg_fdmi_on == 1)

		lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DHBA);

	else

	if (vport->cfg_fdmi_on & LPFC_FDMI_REG_DELAY)

		mod_timer(&vport->fc_fdmitmo,

			  jiffies + msecs_to_jiffies(1000 * 60));

	else

		lpfc_fdmi_cmd(vport, ndlp, SLI_MGMT_DHBA);



	/* decrement the node reference count held for this callback

	 * function.