Commit 5d964837 authored by Quinn Tran's avatar Quinn Tran Committed by Nicholas Bellinger
Browse files

qla2xxx: Track I-T nexus as single fc_port struct 



Current code merges qla_tgt_sess and fc_port structure
into single fc_port structure representing same I-T nexus.

Signed-off-by: default avatarQuinn Tran <quinn.tran@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
[ bvanassche: fixed spelling of patch description ]
Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>

Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 37cacc0a

drivers/scsi/qla2xxx/qla_def.h

+111 −1
Original line number Diff line number Diff line
@@ -1976,6 +1976,84 @@ struct mbx_entry { 
	uint8_t port_name[WWN_SIZE];

};



#ifndef IMMED_NOTIFY_TYPE

#define IMMED_NOTIFY_TYPE 0x0D		/* Immediate notify entry. */

/*

 * ISP queue -	immediate notify entry structure definition.

 *		This is sent by the ISP to the Target driver.

 *		This IOCB would have report of events sent by the

 *		initiator, that needs to be handled by the target

 *		driver immediately.

 */

struct imm_ntfy_from_isp {

	uint8_t	 entry_type;		    /* Entry type. */

	uint8_t	 entry_count;		    /* Entry count. */

	uint8_t	 sys_define;		    /* System defined. */

	uint8_t	 entry_status;		    /* Entry Status. */

	union {

		struct {

			uint32_t sys_define_2; /* System defined. */

			target_id_t target;

			uint16_t lun;

			uint8_t  target_id;

			uint8_t  reserved_1;

			uint16_t status_modifier;

			uint16_t status;

			uint16_t task_flags;

			uint16_t seq_id;

			uint16_t srr_rx_id;

			uint32_t srr_rel_offs;

			uint16_t srr_ui;

#define SRR_IU_DATA_IN	0x1

#define SRR_IU_DATA_OUT	0x5

#define SRR_IU_STATUS	0x7

			uint16_t srr_ox_id;

			uint8_t reserved_2[28];

		} isp2x;

		struct {

			uint32_t reserved;

			uint16_t nport_handle;

			uint16_t reserved_2;

			uint16_t flags;

#define NOTIFY24XX_FLAGS_GLOBAL_TPRLO   BIT_1

#define NOTIFY24XX_FLAGS_PUREX_IOCB     BIT_0

			uint16_t srr_rx_id;

			uint16_t status;

			uint8_t  status_subcode;

			uint8_t  fw_handle;

			uint32_t exchange_address;

			uint32_t srr_rel_offs;

			uint16_t srr_ui;

			uint16_t srr_ox_id;

			union {

				struct {

					uint8_t node_name[8];

				} plogi; /* PLOGI/ADISC/PDISC */

				struct {

					/* PRLI word 3 bit 0-15 */

					uint16_t wd3_lo;

					uint8_t resv0[6];

				} prli;

				struct {

					uint8_t port_id[3];

					uint8_t resv1;

					uint16_t nport_handle;

					uint16_t resv2;

				} req_els;

			} u;

			uint8_t port_name[8];

			uint8_t resv3[3];

			uint8_t  vp_index;

			uint32_t reserved_5;

			uint8_t  port_id[3];

			uint8_t  reserved_6;

		} isp24;

	} u;

	uint16_t reserved_7;

	uint16_t ox_id;

} __packed;

#endif



/*

 * ISP request and response queue entry sizes

 */
@@ -2035,6 +2113,19 @@ typedef struct { 
	FCT_TARGET

} fc_port_type_t;



enum qlt_plogi_link_t {

	QLT_PLOGI_LINK_SAME_WWN,

	QLT_PLOGI_LINK_CONFLICT,

	QLT_PLOGI_LINK_MAX

};



struct qlt_plogi_ack_t {

	struct list_head	list;

	struct imm_ntfy_from_isp iocb;

	port_id_t	id;

	int		ref_count;

};



/*

 * Fibre channel port structure.

 */
@@ -2048,6 +2139,25 @@ typedef struct fc_port { 
	uint16_t loop_id;

	uint16_t old_loop_id;



	unsigned int conf_compl_supported:1;

	unsigned int deleted:2;

	unsigned int local:1;

	unsigned int logout_on_delete:1;

	unsigned int keep_nport_handle:1;

	unsigned int send_els_logo:1;



	unsigned char logout_completed;

	int generation;



	struct se_session *se_sess;

	struct kref sess_kref;

	struct qla_tgt *tgt;

	unsigned long expires;

	struct list_head del_list_entry;

	struct work_struct free_work;



	struct qlt_plogi_ack_t *plogi_link[QLT_PLOGI_LINK_MAX];



	uint16_t tgt_id;

	uint16_t old_tgt_id;

drivers/scsi/qla2xxx/qla_dfs.c

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ qla2x00_dfs_tgt_sess_show(struct seq_file *s, void *unused) 
	scsi_qla_host_t *vha = s->private;

	struct qla_hw_data *ha = vha->hw;

	unsigned long flags;

	struct qla_tgt_sess *sess = NULL;

	struct fc_port *sess = NULL;

	struct qla_tgt *tgt= vha->vha_tgt.qla_tgt;



	seq_printf(s, "%s\n",vha->host_str);
@@ -26,7 +26,7 @@ qla2x00_dfs_tgt_sess_show(struct seq_file *s, void *unused) 
		seq_printf(s, "Port ID   Port Name                Handle\n");



		spin_lock_irqsave(&ha->tgt.sess_lock, flags);

		list_for_each_entry(sess, &tgt->sess_list, sess_list_entry)

		list_for_each_entry(sess, &vha->vp_fcports, list)

			seq_printf(s, "%02x:%02x:%02x  %8phC  %d\n",

			    sess->d_id.b.domain, sess->d_id.b.area,

			    sess->d_id.b.al_pa, sess->port_name,

drivers/scsi/qla2xxx/qla_init.c

+0 −12
Original line number Diff line number Diff line
@@ -3352,12 +3352,6 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport) 
		    "Unable to allocate fc remote port.\n");

		return;

	}

	/*

	 * Create target mode FC NEXUS in qla_target.c if target mode is

	 * enabled..

	 */



	qlt_fc_port_added(vha, fcport);



	spin_lock_irqsave(fcport->vha->host->host_lock, flags);

	*((fc_port_t **)rport->dd_data) = fcport;
@@ -3407,12 +3401,6 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport) 
reg_port:

	if (qla_ini_mode_enabled(vha))

		qla2x00_reg_remote_port(vha, fcport);

	else {

		/*

		 * Create target mode FC NEXUS in qla_target.c

		 */

		qlt_fc_port_added(vha, fcport);

	}

}



/*

drivers/scsi/qla2xxx/qla_iocb.c

+1 −1
Original line number Diff line number Diff line
@@ -2248,7 +2248,7 @@ qla24xx_logout_iocb(srb_t *sp, struct logio_entry_24xx *logio) 
	logio->control_flags =

	    cpu_to_le16(LCF_COMMAND_LOGO|LCF_IMPL_LOGO);

	if (!sp->fcport->tgt_session ||

	    !sp->fcport->tgt_session->keep_nport_handle)

	    !sp->fcport->keep_nport_handle)

		logio->control_flags |= cpu_to_le16(LCF_FREE_NPORT);

	logio->nport_handle = cpu_to_le16(sp->fcport->loop_id);

	logio->port_id[0] = sp->fcport->d_id.b.al_pa;

drivers/scsi/qla2xxx/qla_target.c

+108 −218

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE