Commit bcc85657 authored by Bart Van Assche's avatar Bart Van Assche Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Introduce qla2xxx_get_next_handle() 



This patch reduces code duplication.

Cc: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Tested-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Reviewed-by: default avatarHimanshu Madhani <hmadhani@marvell.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3cb5f3ae

drivers/scsi/qla2xxx/qla_gbl.h

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ extern void qla2x00_build_scsi_iocbs_32(srb_t *, cmd_entry_t *, uint16_t); 
extern void qla2x00_build_scsi_iocbs_64(srb_t *, cmd_entry_t *, uint16_t);

extern void qla24xx_build_scsi_iocbs(srb_t *, struct cmd_type_7 *,

	uint16_t, struct req_que *);

extern uint32_t qla2xxx_get_next_handle(struct req_que *req);

extern int qla2x00_start_scsi(srb_t *sp);

extern int qla24xx_start_scsi(srb_t *sp);

int qla2x00_marker(struct scsi_qla_host *, struct qla_qpair *,

drivers/scsi/qla2xxx/qla_iocb.c

+37 −91
Original line number Diff line number Diff line
@@ -292,6 +292,26 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt, 
	}

}



/*

 * Find the first handle that is not in use, starting from

 * req->current_outstanding_cmd + 1. The caller must hold the lock that is

 * associated with @req.

 */

uint32_t qla2xxx_get_next_handle(struct req_que *req)

{

	uint32_t index, handle = req->current_outstanding_cmd;



	for (index = 1; index < req->num_outstanding_cmds; index++) {

		handle++;

		if (handle == req->num_outstanding_cmds)

			handle = 1;

		if (!req->outstanding_cmds[handle])

			return handle;

	}



	return 0;

}



/**

 * qla2x00_start_scsi() - Send a SCSI command to the ISP

 * @sp: command to send to the ISP
@@ -306,7 +326,6 @@ qla2x00_start_scsi(srb_t *sp) 
	scsi_qla_host_t	*vha;

	struct scsi_cmnd *cmd;

	uint32_t	*clr_ptr;

	uint32_t        index;

	uint32_t	handle;

	cmd_entry_t	*cmd_pkt;

	uint16_t	cnt;
@@ -339,16 +358,8 @@ qla2x00_start_scsi(srb_t *sp) 
	/* Acquire ring specific lock */

	spin_lock_irqsave(&ha->hardware_lock, flags);



	/* Check for room in outstanding command list. */

	handle = req->current_outstanding_cmd;

	for (index = 1; index < req->num_outstanding_cmds; index++) {

		handle++;

		if (handle == req->num_outstanding_cmds)

			handle = 1;

		if (!req->outstanding_cmds[handle])

			break;

	}

	if (index == req->num_outstanding_cmds)

	handle = qla2xxx_get_next_handle(req);

	if (handle == 0)

		goto queuing_error;



	/* Map the sg table so we have an accurate count of sg entries needed */
@@ -1584,7 +1595,6 @@ qla24xx_start_scsi(srb_t *sp) 
	int		nseg;

	unsigned long   flags;

	uint32_t	*clr_ptr;

	uint32_t        index;

	uint32_t	handle;

	struct cmd_type_7 *cmd_pkt;

	uint16_t	cnt;
@@ -1612,16 +1622,8 @@ qla24xx_start_scsi(srb_t *sp) 
	/* Acquire ring specific lock */

	spin_lock_irqsave(&ha->hardware_lock, flags);



	/* Check for room in outstanding command list. */

	handle = req->current_outstanding_cmd;

	for (index = 1; index < req->num_outstanding_cmds; index++) {

		handle++;

		if (handle == req->num_outstanding_cmds)

			handle = 1;

		if (!req->outstanding_cmds[handle])

			break;

	}

	if (index == req->num_outstanding_cmds)

	handle = qla2xxx_get_next_handle(req);

	if (handle == 0)

		goto queuing_error;



	/* Map the sg table so we have an accurate count of sg entries needed */
@@ -1724,7 +1726,6 @@ qla24xx_dif_start_scsi(srb_t *sp) 
	int			nseg;

	unsigned long		flags;

	uint32_t		*clr_ptr;

	uint32_t		index;

	uint32_t		handle;

	uint16_t		cnt;

	uint16_t		req_cnt = 0;
@@ -1765,17 +1766,8 @@ qla24xx_dif_start_scsi(srb_t *sp) 
	/* Acquire ring specific lock */

	spin_lock_irqsave(&ha->hardware_lock, flags);



	/* Check for room in outstanding command list. */

	handle = req->current_outstanding_cmd;

	for (index = 1; index < req->num_outstanding_cmds; index++) {

		handle++;

		if (handle == req->num_outstanding_cmds)

			handle = 1;

		if (!req->outstanding_cmds[handle])

			break;

	}



	if (index == req->num_outstanding_cmds)

	handle = qla2xxx_get_next_handle(req);

	if (handle == 0)

		goto queuing_error;



	/* Compute number of required data segments */
@@ -1920,7 +1912,6 @@ qla2xxx_start_scsi_mq(srb_t *sp) 
	int		nseg;

	unsigned long   flags;

	uint32_t	*clr_ptr;

	uint32_t        index;

	uint32_t	handle;

	struct cmd_type_7 *cmd_pkt;

	uint16_t	cnt;
@@ -1951,16 +1942,8 @@ qla2xxx_start_scsi_mq(srb_t *sp) 
		vha->marker_needed = 0;

	}



	/* Check for room in outstanding command list. */

	handle = req->current_outstanding_cmd;

	for (index = 1; index < req->num_outstanding_cmds; index++) {

		handle++;

		if (handle == req->num_outstanding_cmds)

			handle = 1;

		if (!req->outstanding_cmds[handle])

			break;

	}

	if (index == req->num_outstanding_cmds)

	handle = qla2xxx_get_next_handle(req);

	if (handle == 0)

		goto queuing_error;



	/* Map the sg table so we have an accurate count of sg entries needed */
@@ -2064,7 +2047,6 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp) 
	int			nseg;

	unsigned long		flags;

	uint32_t		*clr_ptr;

	uint32_t		index;

	uint32_t		handle;

	uint16_t		cnt;

	uint16_t		req_cnt = 0;
@@ -2119,17 +2101,8 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp) 
		vha->marker_needed = 0;

	}



	/* Check for room in outstanding command list. */

	handle = req->current_outstanding_cmd;

	for (index = 1; index < req->num_outstanding_cmds; index++) {

		handle++;

		if (handle == req->num_outstanding_cmds)

			handle = 1;

		if (!req->outstanding_cmds[handle])

			break;

	}



	if (index == req->num_outstanding_cmds)

	handle = qla2xxx_get_next_handle(req);

	if (handle == 0)

		goto queuing_error;



	/* Compute number of required data segments */
@@ -2276,7 +2249,7 @@ __qla2x00_alloc_iocbs(struct qla_qpair *qpair, srb_t *sp) 
	struct qla_hw_data *ha = vha->hw;

	struct req_que *req = qpair->req;

	device_reg_t *reg = ISP_QUE_REG(ha, req->id);

	uint32_t index, handle;

	uint32_t handle;

	request_t *pkt;

	uint16_t cnt, req_cnt;
@@ -2316,16 +2289,8 @@ __qla2x00_alloc_iocbs(struct qla_qpair *qpair, srb_t *sp) 
		goto queuing_error;



	if (sp) {

		/* Check for room in outstanding command list. */

		handle = req->current_outstanding_cmd;

		for (index = 1; index < req->num_outstanding_cmds; index++) {

			handle++;

			if (handle == req->num_outstanding_cmds)

				handle = 1;

			if (!req->outstanding_cmds[handle])

				break;

		}

		if (index == req->num_outstanding_cmds) {

		handle = qla2xxx_get_next_handle(req);

		if (handle == 0) {

			ql_log(ql_log_warn, vha, 0x700b,

			    "No room on outstanding cmd array.\n");

			goto queuing_error;
@@ -3112,7 +3077,6 @@ qla82xx_start_scsi(srb_t *sp) 
	unsigned long   flags;

	struct scsi_cmnd *cmd;

	uint32_t	*clr_ptr;

	uint32_t        index;

	uint32_t	handle;

	uint16_t	cnt;

	uint16_t	req_cnt;
@@ -3152,16 +3116,8 @@ qla82xx_start_scsi(srb_t *sp) 
	/* Acquire ring specific lock */

	spin_lock_irqsave(&ha->hardware_lock, flags);



	/* Check for room in outstanding command list. */

	handle = req->current_outstanding_cmd;

	for (index = 1; index < req->num_outstanding_cmds; index++) {

		handle++;

		if (handle == req->num_outstanding_cmds)

			handle = 1;

		if (!req->outstanding_cmds[handle])

			break;

	}

	if (index == req->num_outstanding_cmds)

	handle = qla2xxx_get_next_handle(req);

	if (handle == 0)

		goto queuing_error;



	/* Map the sg table so we have an accurate count of sg entries needed */
@@ -3769,7 +3725,6 @@ qla2x00_start_bidir(srb_t *sp, struct scsi_qla_host *vha, uint32_t tot_dsds) 
	struct qla_hw_data *ha = vha->hw;

	unsigned long flags;

	uint32_t handle;

	uint32_t index;

	uint16_t req_cnt;

	uint16_t cnt;

	uint32_t *clr_ptr;
@@ -3794,17 +3749,8 @@ qla2x00_start_bidir(srb_t *sp, struct scsi_qla_host *vha, uint32_t tot_dsds) 
	/* Acquire ring specific lock */

	spin_lock_irqsave(&ha->hardware_lock, flags);



	/* Check for room in outstanding command list. */

	handle = req->current_outstanding_cmd;

	for (index = 1; index < req->num_outstanding_cmds; index++) {

		handle++;

		if (handle == req->num_outstanding_cmds)

			handle = 1;

		if (!req->outstanding_cmds[handle])

			break;

	}



	if (index == req->num_outstanding_cmds) {

	handle = qla2xxx_get_next_handle(req);

	if (handle == 0) {

		rval = EXT_STATUS_BUSY;

		goto queuing_error;

	}

drivers/scsi/qla2xxx/qla_mr.c

+2 −11
Original line number Diff line number Diff line
@@ -3071,7 +3071,6 @@ qlafx00_start_scsi(srb_t *sp) 
{

	int		nseg;

	unsigned long   flags;

	uint32_t        index;

	uint32_t	handle;

	uint16_t	cnt;

	uint16_t	req_cnt;
@@ -3095,16 +3094,8 @@ qlafx00_start_scsi(srb_t *sp) 
	/* Acquire ring specific lock */

	spin_lock_irqsave(&ha->hardware_lock, flags);



	/* Check for room in outstanding command list. */

	handle = req->current_outstanding_cmd;

	for (index = 1; index < req->num_outstanding_cmds; index++) {

		handle++;

		if (handle == req->num_outstanding_cmds)

			handle = 1;

		if (!req->outstanding_cmds[handle])

			break;

	}

	if (index == req->num_outstanding_cmds)

	handle = qla2xxx_get_next_handle(req);

	if (handle == 0)

		goto queuing_error;



	/* Map the sg table so we have an accurate count of sg entries needed */

drivers/scsi/qla2xxx/qla_nvme.c

+2 −12
Original line number Diff line number Diff line
@@ -353,7 +353,6 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) 
{

	unsigned long   flags;

	uint32_t        *clr_ptr;

	uint32_t        index;

	uint32_t        handle;

	struct cmd_nvme *cmd_pkt;

	uint16_t        cnt, i;
@@ -377,17 +376,8 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) 
	/* Acquire qpair specific lock */

	spin_lock_irqsave(&qpair->qp_lock, flags);



	/* Check for room in outstanding command list. */

	handle = req->current_outstanding_cmd;

	for (index = 1; index < req->num_outstanding_cmds; index++) {

		handle++;

		if (handle == req->num_outstanding_cmds)

			handle = 1;

		if (!req->outstanding_cmds[handle])

			break;

	}



	if (index == req->num_outstanding_cmds) {

	handle = qla2xxx_get_next_handle(req);

	if (handle == 0) {

		rval = -EBUSY;

		goto queuing_error;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE