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

scsi: qla2xxx: Stop using the SCSI pointer 

Instead of using the SCp.ptr field to track whether or not a command is
in flight, use the sp->type field to track this information. sp->type
must be set for proper operation of the qla2xxx driver. See e.g. the
switch (sp->type) statement in qla2x00_ct_entry().

This patch prepares for removal of the SCSI pointer from struct scsi_cmnd.

Link: https://lore.kernel.org/r/20220218195117.25689-43-bvanassche@acm.org


Cc: Nilesh Javali <njavali@marvell.com>
Cc: Ewan D. Milne <emilne@redhat.com>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarDaniel Wagner <dwagner@suse.de>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 504540d0

drivers/scsi/qla2xxx/qla_def.h

+0 −2
Original line number Diff line number Diff line
@@ -5201,8 +5201,6 @@ struct secure_flash_update_block_pk { 


#define	QLA_DSDS_PER_IOCB	37



#define CMD_SP(Cmnd)		((Cmnd)->SCp.ptr)



#define QLA_SG_ALL	1024



enum nexus_wait_type {

drivers/scsi/qla2xxx/qla_os.c

+5 −8
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ void qla2x00_sp_compl(srb_t *sp, int res) 
	/* kref: INIT */

	kref_put(&sp->cmd_kref, qla2x00_sp_release);

	cmd->result = res;

	CMD_SP(cmd) = NULL;

	sp->type = 0;

	scsi_done(cmd);

	if (comp)

		complete(comp);
@@ -831,7 +831,7 @@ void qla2xxx_qpair_sp_compl(srb_t *sp, int res) 
	/* ref: INIT */

	kref_put(&sp->cmd_kref, qla2x00_sp_release);

	cmd->result = res;

	CMD_SP(cmd) = NULL;

	sp->type = 0;

	scsi_done(cmd);

	if (comp)

		complete(comp);
@@ -934,8 +934,6 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) 


	sp->u.scmd.cmd = cmd;

	sp->type = SRB_SCSI_CMD;



	CMD_SP(cmd) = (void *)sp;

	sp->free = qla2x00_sp_free_dma;

	sp->done = qla2x00_sp_compl;
@@ -1025,7 +1023,6 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd, 


	sp->u.scmd.cmd = cmd;

	sp->type = SRB_SCSI_CMD;

	CMD_SP(cmd) = (void *)sp;

	sp->free = qla2xxx_qpair_sp_free_dma;

	sp->done = qla2xxx_qpair_sp_compl;
@@ -1071,6 +1068,7 @@ qla2x00_eh_wait_on_command(struct scsi_cmnd *cmd) 
	unsigned long wait_iter = ABORT_WAIT_ITER;

	scsi_qla_host_t *vha = shost_priv(cmd->device->host);

	struct qla_hw_data *ha = vha->hw;

	srb_t *sp = scsi_cmd_priv(cmd);

	int ret = QLA_SUCCESS;



	if (unlikely(pci_channel_offline(ha->pdev)) || ha->flags.eeh_busy) {
@@ -1079,10 +1077,9 @@ qla2x00_eh_wait_on_command(struct scsi_cmnd *cmd) 
		return ret;

	}



	while (CMD_SP(cmd) && wait_iter--) {

	while (sp->type && wait_iter--)

		msleep(ABORT_POLLING_PERIOD);

	}

	if (CMD_SP(cmd))

	if (sp->type)

		ret = QLA_FUNCTION_FAILED;



	return ret;