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

Commit 642ef983 authored by Chad Dupuis's avatar Chad Dupuis Committed by James Bottomley
Browse files

[SCSI] qla2xxx: Add ha->max_fibre_devices to keep track of the maximum number of targets. 



Add a field to the qla_hw_data struct to allow us to set the maximum number of
fabric devices on a per adapter basis based on ISP type.

[jejb: fix up missing rval = QLA_SUCCESS to prevent uninit var warning]
Signed-off-by: default avatarGiridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: default avatarChad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 7a67735b

drivers/scsi/qla2xxx/qla_dbg.c

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint32_t *ram, 
	WRT_REG_WORD(&reg->mailbox0, MBC_DUMP_RISC_RAM_EXTENDED);

	clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);



	dwords = GID_LIST_SIZE / 4;

	dwords = qla2x00_gid_list_size(ha) / 4;

	for (cnt = 0; cnt < ram_dwords && rval == QLA_SUCCESS;

	    cnt += dwords, addr += dwords) {

		if (cnt + dwords > ram_dwords)
@@ -264,7 +264,7 @@ qla2xxx_dump_ram(struct qla_hw_data *ha, uint32_t addr, uint16_t *ram, 
	WRT_MAILBOX_REG(ha, reg, 0, MBC_DUMP_RISC_RAM_EXTENDED);

	clear_bit(MBX_INTERRUPT, &ha->mbx_cmd_flags);



	words = GID_LIST_SIZE / 2;

	words = qla2x00_gid_list_size(ha) / 2;

	for (cnt = 0; cnt < ram_words && rval == QLA_SUCCESS;

	    cnt += words, addr += words) {

		if (cnt + words > ram_words)

drivers/scsi/qla2xxx/qla_def.h

+13 −7
Original line number Diff line number Diff line
@@ -125,7 +125,10 @@ 
 * Fibre Channel device definitions.

 */

#define WWN_SIZE		8	/* Size of WWPN, WWN & WWNN */

#define MAX_FIBRE_DEVICES	512

#define MAX_FIBRE_DEVICES_2100	512

#define MAX_FIBRE_DEVICES_2400	2048

#define MAX_FIBRE_DEVICES_LOOP	128

#define MAX_FIBRE_DEVICES_MAX	MAX_FIBRE_DEVICES_2400

#define MAX_FIBRE_LUNS  	0xFFFF

#define	MAX_HOST_COUNT		16
@@ -133,8 +136,6 @@ 
 * Host adapter default definitions.

 */

#define MAX_BUSES		1  /* We only have one bus today */

#define MAX_TARGETS_2100	MAX_FIBRE_DEVICES

#define MAX_TARGETS_2200	MAX_FIBRE_DEVICES

#define MIN_LUNS		8

#define MAX_LUNS		MAX_FIBRE_LUNS

#define MAX_CMDS_PER_LUN	255
@@ -1773,7 +1774,6 @@ static const char * const port_state_str[] = { 


#define	GID_PT_CMD	0x1A1

#define	GID_PT_REQ_SIZE	(16 + 4)

#define	GID_PT_RSP_SIZE	(16 + (MAX_FIBRE_DEVICES * 4))



#define	GPN_ID_CMD	0x112

#define	GPN_ID_REQ_SIZE	(16 + 4)
@@ -2063,7 +2063,9 @@ struct ct_sns_rsp { 
		} ga_nxt;



		struct {

			struct ct_sns_gid_pt_data entries[MAX_FIBRE_DEVICES];

			/* Assume the largest number of targets for the union */

			struct ct_sns_gid_pt_data

			    entries[MAX_FIBRE_DEVICES_MAX];

		} gid_pt;



		struct {
@@ -2124,7 +2126,11 @@ struct ct_sns_pkt { 


#define	GID_PT_SNS_SCMD_LEN	6

#define	GID_PT_SNS_CMD_SIZE	28

#define	GID_PT_SNS_DATA_SIZE	(MAX_FIBRE_DEVICES * 4 + 16)

/*

 * Assume MAX_FIBRE_DEVICES_2100 as these defines are only used with older

 * adapters.

 */

#define	GID_PT_SNS_DATA_SIZE	(MAX_FIBRE_DEVICES_2100 * 4 + 16)



#define	GPN_ID_SNS_SCMD_LEN	6

#define	GPN_ID_SNS_CMD_SIZE	28
@@ -2172,7 +2178,6 @@ struct gid_list_info { 
	uint16_t loop_id;	/* ISP23XX         -- 6 bytes. */

	uint16_t reserved_1;	/* ISP24XX         -- 8 bytes. */

};

#define GID_LIST_SIZE (sizeof(struct gid_list_info) * MAX_FIBRE_DEVICES)



/* NPIV */

typedef struct vport_info {
@@ -2499,6 +2504,7 @@ struct qla_hw_data { 
	atomic_t	loop_down_timer;         /* loop down timer */

	uint8_t		link_down_timeout;       /* link down timeout */

	uint16_t	max_loop_id;

	uint16_t	max_fibre_devices;	/* Maximum number of targets */



	uint16_t	fb_rev;

	uint16_t	min_external_loopid;    /* First external loop Id */

drivers/scsi/qla2xxx/qla_gs.c

+31 −21
Original line number Diff line number Diff line
@@ -240,6 +240,12 @@ qla2x00_ga_nxt(scsi_qla_host_t *vha, fc_port_t *fcport) 
	return (rval);

}



static inline int

qla2x00_gid_pt_rsp_size(scsi_qla_host_t *vha)

{

	return vha->hw->max_fibre_devices * 4 + 16;

}



/**

 * qla2x00_gid_pt() - SNS scan for fabric devices via GID_PT command.

 * @ha: HA context
@@ -261,20 +267,21 @@ qla2x00_gid_pt(scsi_qla_host_t *vha, sw_info_t *list) 


	struct ct_sns_gid_pt_data *gid_data;

	struct qla_hw_data *ha = vha->hw;

	uint16_t gid_pt_rsp_size;



	if (IS_QLA2100(ha) || IS_QLA2200(ha))

		return qla2x00_sns_gid_pt(vha, list);



	gid_data = NULL;



	gid_pt_rsp_size = qla2x00_gid_pt_rsp_size(vha);

	/* Issue GID_PT */

	/* Prepare common MS IOCB */

	ms_pkt = ha->isp_ops->prep_ms_iocb(vha, GID_PT_REQ_SIZE,

	    GID_PT_RSP_SIZE);

	    gid_pt_rsp_size);



	/* Prepare CT request */

	ct_req = qla2x00_prep_ct_req(&ha->ct_sns->p.req, GID_PT_CMD,

	    GID_PT_RSP_SIZE);

	    gid_pt_rsp_size);

	ct_rsp = &ha->ct_sns->p.rsp;



	/* Prepare CT arguments -- port_type */
@@ -292,7 +299,7 @@ qla2x00_gid_pt(scsi_qla_host_t *vha, sw_info_t *list) 
		rval = QLA_FUNCTION_FAILED;

	} else {

		/* Set port IDs in switch info list. */

		for (i = 0; i < MAX_FIBRE_DEVICES; i++) {

		for (i = 0; i < ha->max_fibre_devices; i++) {

			gid_data = &ct_rsp->rsp.gid_pt.entries[i];

			list[i].d_id.b.domain = gid_data->port_id[0];

			list[i].d_id.b.area = gid_data->port_id[1];
@@ -313,7 +320,7 @@ qla2x00_gid_pt(scsi_qla_host_t *vha, sw_info_t *list) 
		 * single call.  Return a failed status, and let GA_NXT handle

		 * the overload.

		 */

		if (i == MAX_FIBRE_DEVICES)

		if (i == ha->max_fibre_devices)

			rval = QLA_FUNCTION_FAILED;

	}
@@ -330,7 +337,7 @@ qla2x00_gid_pt(scsi_qla_host_t *vha, sw_info_t *list) 
int

qla2x00_gpn_id(scsi_qla_host_t *vha, sw_info_t *list)

{

	int		rval;

	int		rval = QLA_SUCCESS;

	uint16_t	i;



	ms_iocb_entry_t	*ms_pkt;
@@ -341,7 +348,7 @@ qla2x00_gpn_id(scsi_qla_host_t *vha, sw_info_t *list) 
	if (IS_QLA2100(ha) || IS_QLA2200(ha))

		return qla2x00_sns_gpn_id(vha, list);



	for (i = 0; i < MAX_FIBRE_DEVICES; i++) {

	for (i = 0; i < ha->max_fibre_devices; i++) {

		/* Issue GPN_ID */

		/* Prepare common MS IOCB */

		ms_pkt = ha->isp_ops->prep_ms_iocb(vha, GPN_ID_REQ_SIZE,
@@ -391,7 +398,7 @@ qla2x00_gpn_id(scsi_qla_host_t *vha, sw_info_t *list) 
int

qla2x00_gnn_id(scsi_qla_host_t *vha, sw_info_t *list)

{

	int		rval;

	int		rval = QLA_SUCCESS;

	uint16_t	i;

	struct qla_hw_data *ha = vha->hw;

	ms_iocb_entry_t	*ms_pkt;
@@ -401,7 +408,7 @@ qla2x00_gnn_id(scsi_qla_host_t *vha, sw_info_t *list) 
	if (IS_QLA2100(ha) || IS_QLA2200(ha))

		return qla2x00_sns_gnn_id(vha, list);



	for (i = 0; i < MAX_FIBRE_DEVICES; i++) {

	for (i = 0; i < ha->max_fibre_devices; i++) {

		/* Issue GNN_ID */

		/* Prepare common MS IOCB */

		ms_pkt = ha->isp_ops->prep_ms_iocb(vha, GNN_ID_REQ_SIZE,
@@ -735,7 +742,7 @@ qla2x00_prep_sns_cmd(scsi_qla_host_t *vha, uint16_t cmd, uint16_t scmd_len, 
static int

qla2x00_sns_ga_nxt(scsi_qla_host_t *vha, fc_port_t *fcport)

{

	int		rval;

	int		rval = QLA_SUCCESS;

	struct qla_hw_data *ha = vha->hw;

	struct sns_cmd_pkt	*sns_cmd;
@@ -814,11 +821,14 @@ qla2x00_sns_gid_pt(scsi_qla_host_t *vha, sw_info_t *list) 
	uint16_t	i;

	uint8_t		*entry;

	struct sns_cmd_pkt	*sns_cmd;

	uint16_t gid_pt_sns_data_size;



	gid_pt_sns_data_size = qla2x00_gid_pt_rsp_size(vha);



	/* Issue GID_PT. */

	/* Prepare SNS command request. */

	sns_cmd = qla2x00_prep_sns_cmd(vha, GID_PT_CMD, GID_PT_SNS_SCMD_LEN,

	    GID_PT_SNS_DATA_SIZE);

	    gid_pt_sns_data_size);



	/* Prepare SNS command arguments -- port_type. */

	sns_cmd->p.cmd.param[0] = NS_NX_PORT_TYPE;
@@ -839,7 +849,7 @@ qla2x00_sns_gid_pt(scsi_qla_host_t *vha, sw_info_t *list) 
		rval = QLA_FUNCTION_FAILED;

	} else {

		/* Set port IDs in switch info list. */

		for (i = 0; i < MAX_FIBRE_DEVICES; i++) {

		for (i = 0; i < ha->max_fibre_devices; i++) {

			entry = &sns_cmd->p.gid_data[(i * 4) + 16];

			list[i].d_id.b.domain = entry[1];

			list[i].d_id.b.area = entry[2];
@@ -858,7 +868,7 @@ qla2x00_sns_gid_pt(scsi_qla_host_t *vha, sw_info_t *list) 
		 * single call.  Return a failed status, and let GA_NXT handle

		 * the overload.

		 */

		if (i == MAX_FIBRE_DEVICES)

		if (i == ha->max_fibre_devices)

			rval = QLA_FUNCTION_FAILED;

	}
@@ -877,12 +887,12 @@ qla2x00_sns_gid_pt(scsi_qla_host_t *vha, sw_info_t *list) 
static int

qla2x00_sns_gpn_id(scsi_qla_host_t *vha, sw_info_t *list)

{

	int		rval;

	int		rval = QLA_SUCCESS;

	struct qla_hw_data *ha = vha->hw;

	uint16_t	i;

	struct sns_cmd_pkt	*sns_cmd;



	for (i = 0; i < MAX_FIBRE_DEVICES; i++) {

	for (i = 0; i < ha->max_fibre_devices; i++) {

		/* Issue GPN_ID */

		/* Prepare SNS command request. */

		sns_cmd = qla2x00_prep_sns_cmd(vha, GPN_ID_CMD,
@@ -933,12 +943,12 @@ qla2x00_sns_gpn_id(scsi_qla_host_t *vha, sw_info_t *list) 
static int

qla2x00_sns_gnn_id(scsi_qla_host_t *vha, sw_info_t *list)

{

	int		rval;

	int		rval = QLA_SUCCESS;

	struct qla_hw_data *ha = vha->hw;

	uint16_t	i;

	struct sns_cmd_pkt	*sns_cmd;



	for (i = 0; i < MAX_FIBRE_DEVICES; i++) {

	for (i = 0; i < ha->max_fibre_devices; i++) {

		/* Issue GNN_ID */

		/* Prepare SNS command request. */

		sns_cmd = qla2x00_prep_sns_cmd(vha, GNN_ID_CMD,
@@ -1734,7 +1744,7 @@ qla2x00_fdmi_register(scsi_qla_host_t *vha) 
int

qla2x00_gfpn_id(scsi_qla_host_t *vha, sw_info_t *list)

{

	int		rval;

	int		rval = QLA_SUCCESS;

	uint16_t	i;

	struct qla_hw_data *ha = vha->hw;

	ms_iocb_entry_t	*ms_pkt;
@@ -1744,7 +1754,7 @@ qla2x00_gfpn_id(scsi_qla_host_t *vha, sw_info_t *list) 
	if (!IS_IIDMA_CAPABLE(ha))

		return QLA_FUNCTION_FAILED;



	for (i = 0; i < MAX_FIBRE_DEVICES; i++) {

	for (i = 0; i < ha->max_fibre_devices; i++) {

		/* Issue GFPN_ID */

		/* Prepare common MS IOCB */

		ms_pkt = ha->isp_ops->prep_ms_iocb(vha, GFPN_ID_REQ_SIZE,
@@ -1856,7 +1866,7 @@ qla2x00_gpsc(scsi_qla_host_t *vha, sw_info_t *list) 
	if (rval)

		return rval;



	for (i = 0; i < MAX_FIBRE_DEVICES; i++) {

	for (i = 0; i < ha->max_fibre_devices; i++) {

		/* Issue GFPN_ID */

		/* Prepare common MS IOCB */

		ms_pkt = qla24xx_prep_ms_fm_iocb(vha, GPSC_REQ_SIZE,
@@ -1957,7 +1967,7 @@ qla2x00_gff_id(scsi_qla_host_t *vha, sw_info_t *list) 
	struct qla_hw_data *ha = vha->hw;

	uint8_t fcp_scsi_features = 0;



	for (i = 0; i < MAX_FIBRE_DEVICES; i++) {

	for (i = 0; i < ha->max_fibre_devices; i++) {

		/* Set default FC4 Type as UNKNOWN so the default is to

		 * Process this port */

		list[i].fc4_type = FC4_TYPE_UNKNOWN;

drivers/scsi/qla2xxx/qla_init.c

+5 −6
Original line number Diff line number Diff line
@@ -2567,8 +2567,7 @@ qla2x00_configure_loop(scsi_qla_host_t *vha) 
			ql_dbg(ql_dbg_disc, vha, 0x2015,

			    "Loop resync needed, failing.\n");

			rval = QLA_FUNCTION_FAILED;

		}

		else

		} else

			rval = qla2x00_configure_local_loop(vha);

	}
@@ -2642,7 +2641,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha) 


	found_devs = 0;

	new_fcport = NULL;

	entries = MAX_FIBRE_DEVICES;

	entries = MAX_FIBRE_DEVICES_LOOP;



	ql_dbg(ql_dbg_disc, vha, 0x2016,

	    "Getting FCAL position map.\n");
@@ -2650,7 +2649,7 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha) 
		qla2x00_get_fcal_position_map(vha, NULL);



	/* Get list of logged in devices. */

	memset(ha->gid_list, 0, GID_LIST_SIZE);

	memset(ha->gid_list, 0, qla2x00_gid_list_size(ha));

	rval = qla2x00_get_id_list(vha, ha->gid_list, ha->gid_list_dma,

	    &entries);

	if (rval != QLA_SUCCESS)
@@ -3134,7 +3133,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha, 


	/* Try GID_PT to get device list, else GAN. */

	if (!ha->swl)

		ha->swl = kcalloc(MAX_FIBRE_DEVICES, sizeof(sw_info_t),

		ha->swl = kcalloc(ha->max_fibre_devices, sizeof(sw_info_t),

		    GFP_KERNEL);

	swl = ha->swl;

	if (!swl) {
@@ -3142,7 +3141,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *vha, 
		ql_dbg(ql_dbg_disc, vha, 0x2054,

		    "GID_PT allocations failed, fallback on GA_NXT.\n");

	} else {

		memset(swl, 0, MAX_FIBRE_DEVICES * sizeof(sw_info_t));

		memset(swl, 0, ha->max_fibre_devices * sizeof(sw_info_t));

		if (qla2x00_gid_pt(vha, swl) != QLA_SUCCESS) {

			swl = NULL;

		} else if (qla2x00_gpn_id(vha, swl) != QLA_SUCCESS) {

drivers/scsi/qla2xxx/qla_inline.h

+6 −0
Original line number Diff line number Diff line
@@ -181,3 +181,9 @@ qla2x00_init_timer(srb_t *sp, unsigned long tmo) 
	add_timer(&sp->u.iocb_cmd.timer);

	sp->free = qla2x00_sp_free;

}



static inline int

qla2x00_gid_list_size(struct qla_hw_data *ha)

{

	return sizeof(struct gid_list_info) * ha->max_fibre_devices;

}