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

Commit 8d93f550 authored Jan 30, 2013 by Chad Dupuis Committed by James Bottomley Feb 22, 2013

[SCSI] qla2xxx: Determine the number of outstanding commands based on available resources.



Base the number of outstanding requests the driver will keep track of on the
available resources instead of being hard-coded.

Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

parent 6d1f6621

drivers/scsi/qla2xxx/qla_bsg.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1950,7 +1950,7 @@ qla24xx_bsg_timeout(struct fc_bsg_job *bsg_job)
		if (!req)
		continue;

		for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) {
		for (cnt = 1; cnt < req->num_outstanding_cmds; cnt++) {
		sp = req->outstanding_cmds[cnt];
		if (sp) {
		if (((sp->type == SRB_CT_CMD) \|\|

drivers/scsi/qla2xxx/qla_dbg.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@
		* ----------------------------------------------------------------------
		* \| Level \| Last Value Used \| Holes \|
		* ----------------------------------------------------------------------
		* \| Module Init and Probe \| 0x0125 \| 0x4b,0xba,0xfa \|
		* \| Module Init and Probe \| 0x0126 \| 0x4b,0xba,0xfa \|
		* \| Mailbox commands \| 0x114f \| 0x111a-0x111b \|
		* \| \| \| 0x112c-0x112e \|
		* \| \| \| 0x113a \|

drivers/scsi/qla2xxx/qla_def.h

+6 −6

Original line number	Diff line number	Diff line
		@@ -253,8 +253,8 @@
		#define LOOP_DOWN_TIME 255 /* 240 */
		#define LOOP_DOWN_RESET (LOOP_DOWN_TIME - 30)

		/* Maximum outstanding commands in ISP queues (1-65535) */
		#define MAX_OUTSTANDING_COMMANDS 1024
		#define DEFAULT_OUTSTANDING_COMMANDS 1024
		#define MIN_OUTSTANDING_COMMANDS 128

		/* ISP request and response entry counts (37-65535) */
		#define REQUEST_ENTRY_CNT_2100 128 /* Number of request entries. */
		@@ -2533,8 +2533,9 @@ struct req_que {
		uint16_t qos;
		uint16_t vp_idx;
		struct rsp_que *rsp;
		srb_t *outstanding_cmds[MAX_OUTSTANDING_COMMANDS];
		srb_t **outstanding_cmds;
		uint32_t current_outstanding_cmd;
		uint16_t num_outstanding_cmds;
		int max_q_depth;
		};

		@@ -2561,7 +2562,7 @@ struct qlt_hw_data {
		void *target_lport_ptr;
		struct qla_tgt_func_tmpl *tgt_ops;
		struct qla_tgt *qla_tgt;
		struct qla_tgt_cmd *cmds[MAX_OUTSTANDING_COMMANDS];
		struct qla_tgt_cmd *cmds[DEFAULT_OUTSTANDING_COMMANDS];
		uint16_t current_handle;

		struct qla_tgt_vp_map *tgt_vp_map;
		@@ -2887,6 +2888,7 @@ struct qla_hw_data {
		#define RISC_START_ADDRESS_2300 0x800
		#define RISC_START_ADDRESS_2400 0x100000
		uint16_t fw_xcb_count;
		uint16_t fw_iocb_count;

		uint16_t fw_options[16]; /* slots: 1,2,3,10,11 */
		uint8_t fw_seriallink_options[4];
		@@ -3248,8 +3250,6 @@ struct qla_tgt_vp_map {

		#define NVRAM_DELAY() udelay(10)

		#define INVALID_HANDLE (MAX_OUTSTANDING_COMMANDS+1)

		/*
		* Flash support definitions
		*/

drivers/scsi/qla2xxx/qla_gbl.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,9 @@ extern int qla83xx_nic_core_reset(scsi_qla_host_t *);
		extern void qla83xx_reset_ownership(scsi_qla_host_t *);
		extern int qla2xxx_mctp_dump(scsi_qla_host_t *);

		extern int
		qla2x00_alloc_outstanding_cmds(struct qla_hw_data , struct req_que );

		/*
		* Global Data in qla_os.c source file.
		*/

drivers/scsi/qla2xxx/qla_init.c

+52 −2

Original line number	Diff line number	Diff line
		@@ -1559,6 +1559,47 @@ qla81xx_mpi_sync(scsi_qla_host_t *vha)
		return rval;
		}

		int
		qla2x00_alloc_outstanding_cmds(struct qla_hw_data ha, struct req_que req)
		{
		/* Don't try to reallocate the array */
		if (req->outstanding_cmds)
		return QLA_SUCCESS;

		if (!IS_FWI2_CAPABLE(ha) \|\| (ha->mqiobase &&
		(ql2xmultique_tag \|\| ql2xmaxqueues > 1)))
		req->num_outstanding_cmds = DEFAULT_OUTSTANDING_COMMANDS;
		else {
		if (ha->fw_xcb_count <= ha->fw_iocb_count)
		req->num_outstanding_cmds = ha->fw_xcb_count;
		else
		req->num_outstanding_cmds = ha->fw_iocb_count;
		}

		req->outstanding_cmds = kzalloc(sizeof(srb_t )
		req->num_outstanding_cmds, GFP_KERNEL);

		if (!req->outstanding_cmds) {
		/*
		* Try to allocate a minimal size just so we can get through
		* initialization.
		*/
		req->num_outstanding_cmds = MIN_OUTSTANDING_COMMANDS;
		req->outstanding_cmds = kzalloc(sizeof(srb_t )
		req->num_outstanding_cmds, GFP_KERNEL);

		if (!req->outstanding_cmds) {
		ql_log(ql_log_fatal, NULL, 0x0126,
		"Failed to allocate memory for "
		"outstanding_cmds for req_que %p.\n", req);
		req->num_outstanding_cmds = 0;
		return QLA_FUNCTION_FAILED;
		}
		}

		return QLA_SUCCESS;
		}

		/**
		* qla2x00_setup_chip() - Load and start RISC firmware.
		* @ha: HA context
		@@ -1628,9 +1669,18 @@ qla2x00_setup_chip(scsi_qla_host_t *vha)
		MIN_MULTI_ID_FABRIC - 1;
		}
		qla2x00_get_resource_cnts(vha, NULL,
		&ha->fw_xcb_count, NULL, NULL,
		&ha->fw_xcb_count, NULL, &ha->fw_iocb_count,
		&ha->max_npiv_vports, NULL);

		/*
		* Allocate the array of outstanding commands
		* now that we know the firmware resources.
		*/
		rval = qla2x00_alloc_outstanding_cmds(ha,
		vha->req);
		if (rval != QLA_SUCCESS)
		goto failed;

		if (!fw_major_version && ql2xallocfwdump
		&& !IS_QLA82XX(ha))
		qla2x00_alloc_fw_dump(vha);
		@@ -1948,7 +1998,7 @@ qla2x00_init_rings(scsi_qla_host_t *vha)
		req = ha->req_q_map[que];
		if (!req)
		continue;
		for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++)
		for (cnt = 1; cnt < req->num_outstanding_cmds; cnt++)
		req->outstanding_cmds[cnt] = NULL;

		req->current_outstanding_cmd = 1;