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

scsi: megasas: Stop using the SCSI pointer 

Set .cmd_size in the SCSI host template instead of using the SCSI pointer
from struct scsi_cmnd. This patch prepares for removal of the SCSI pointer
from struct scsi_cmnd.

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


Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent fb597392

drivers/scsi/megaraid/megaraid_sas.h

+12 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
#ifndef LSI_MEGARAID_SAS_H

#define LSI_MEGARAID_SAS_H



#include <scsi/scsi_cmnd.h>



/*

 * MegaRAID SAS Driver meta data

 */
@@ -2594,6 +2596,16 @@ struct megasas_cmd { 
	};

};



struct megasas_cmd_priv {

	void	*cmd_priv;

	u8	status;

};



static inline struct megasas_cmd_priv *megasas_priv(struct scsi_cmnd *cmd)

{

	return scsi_cmd_priv(cmd);

}



#define MAX_MGMT_ADAPTERS		1024

#define MAX_IOCTL_SGE			16

drivers/scsi/megaraid/megaraid_sas_base.c

+4 −4
Original line number Diff line number Diff line
@@ -1760,7 +1760,7 @@ megasas_build_and_issue_cmd(struct megasas_instance *instance, 
		goto out_return_cmd;



	cmd->scmd = scmd;

	scmd->SCp.ptr = (char *)cmd;

	megasas_priv(scmd)->cmd_priv = cmd;



	/*

	 * Issue the command to the FW
@@ -2992,11 +2992,10 @@ megasas_dump_reg_set(void __iomem *reg_set) 
void

megasas_dump_fusion_io(struct scsi_cmnd *scmd)

{

	struct megasas_cmd_fusion *cmd;

	struct megasas_cmd_fusion *cmd = megasas_priv(scmd)->cmd_priv;

	union MEGASAS_REQUEST_DESCRIPTOR_UNION *req_desc;

	struct megasas_instance *instance;



	cmd = (struct megasas_cmd_fusion *)scmd->SCp.ptr;

	instance = (struct megasas_instance *)scmd->device->host->hostdata;



	scmd_printk(KERN_INFO, scmd,
@@ -3518,6 +3517,7 @@ static struct scsi_host_template megasas_template = { 
	.mq_poll = megasas_blk_mq_poll,

	.change_queue_depth = scsi_change_queue_depth,

	.max_segment_size = 0xffffffff,

	.cmd_size = sizeof(struct megasas_cmd_priv),

};



/**
@@ -3601,7 +3601,7 @@ megasas_complete_cmd(struct megasas_instance *instance, struct megasas_cmd *cmd, 
	cmd->retry_for_fw_reset = 0;



	if (cmd->scmd)

		cmd->scmd->SCp.ptr = NULL;

		megasas_priv(cmd->scmd)->cmd_priv = NULL;



	switch (hdr->cmd) {

	case MFI_CMD_INVALID:

drivers/scsi/megaraid/megaraid_sas_fusion.c

+8 −7
Original line number Diff line number Diff line
@@ -2915,7 +2915,7 @@ megasas_build_ldio_fusion(struct megasas_instance *instance, 
				get_updated_dev_handle(instance,

					&fusion->load_balance_info[device_id],

					&io_info, local_map_ptr);

			scp->SCp.Status |= MEGASAS_LOAD_BALANCE_FLAG;

			megasas_priv(scp)->status |= MEGASAS_LOAD_BALANCE_FLAG;

			cmd->pd_r1_lb = io_info.pd_after_lb;

			if (instance->adapter_type >= VENTURA_SERIES)

				rctx_g35->span_arm = io_info.span_arm;
@@ -2923,7 +2923,7 @@ megasas_build_ldio_fusion(struct megasas_instance *instance, 
				rctx->span_arm = io_info.span_arm;



		} else

			scp->SCp.Status &= ~MEGASAS_LOAD_BALANCE_FLAG;

			megasas_priv(scp)->status &= ~MEGASAS_LOAD_BALANCE_FLAG;



		if (instance->adapter_type >= VENTURA_SERIES)

			cmd->r1_alt_dev_handle = io_info.r1_alt_dev_handle;
@@ -3293,7 +3293,7 @@ megasas_build_io_fusion(struct megasas_instance *instance, 
	io_request->SenseBufferLength = SCSI_SENSE_BUFFERSIZE;



	cmd->scmd = scp;

	scp->SCp.ptr = (char *)cmd;

	megasas_priv(scp)->cmd_priv = cmd;



	return 0;

}
@@ -3489,7 +3489,7 @@ megasas_complete_r1_command(struct megasas_instance *instance, 
		if (instance->ldio_threshold &&

		    megasas_cmd_type(scmd_local) == READ_WRITE_LDIO)

			atomic_dec(&instance->ldio_outstanding);

		scmd_local->SCp.ptr = NULL;

		megasas_priv(scmd_local)->cmd_priv = NULL;

		megasas_return_cmd_fusion(instance, cmd);

		scsi_dma_unmap(scmd_local);

		megasas_sdev_busy_dec(instance, scmd_local);
@@ -3613,12 +3613,13 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex, 
		case MPI2_FUNCTION_SCSI_IO_REQUEST:  /*Fast Path IO.*/

			/* Update load balancing info */

			if (fusion->load_balance_info &&

			    (cmd_fusion->scmd->SCp.Status &

			    (megasas_priv(cmd_fusion->scmd)->status &

			    MEGASAS_LOAD_BALANCE_FLAG)) {

				device_id = MEGASAS_DEV_INDEX(scmd_local);

				lbinfo = &fusion->load_balance_info[device_id];

				atomic_dec(&lbinfo->scsi_pending_cmds[cmd_fusion->pd_r1_lb]);

				cmd_fusion->scmd->SCp.Status &= ~MEGASAS_LOAD_BALANCE_FLAG;

				megasas_priv(cmd_fusion->scmd)->status &=

					~MEGASAS_LOAD_BALANCE_FLAG;

			}

			fallthrough;	/* and complete IO */

		case MEGASAS_MPI2_FUNCTION_LD_IO_REQUEST: /* LD-IO Path */
@@ -3630,7 +3631,7 @@ complete_cmd_fusion(struct megasas_instance *instance, u32 MSIxIndex, 
				if (instance->ldio_threshold &&

				    (megasas_cmd_type(scmd_local) == READ_WRITE_LDIO))

					atomic_dec(&instance->ldio_outstanding);

				scmd_local->SCp.ptr = NULL;

				megasas_priv(scmd_local)->cmd_priv = NULL;

				megasas_return_cmd_fusion(instance, cmd_fusion);

				scsi_dma_unmap(scmd_local);

				megasas_sdev_busy_dec(instance, scmd_local);