Commit 02136516 authored by Suganath Prabu S's avatar Suganath Prabu S Committed by Martin K. Petersen
Browse files

scsi: mpt3sas: change _base_get_msix_index prototype 



Code refactoring.

In function _base_get_msix_index, add scmd as second argument. This change
is made in preparation for the next patch where we introduce a new function
to get the MSI-X index for high iops queues.

Signed-off-by: default avatarSuganath Prabu S <suganath-prabu.subramani@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 18fd3d8c

drivers/scsi/mpt3sas/mpt3sas_base.c

+20 −10
Original line number Diff line number Diff line
@@ -3300,8 +3300,18 @@ mpt3sas_base_get_reply_virt_addr(struct MPT3SAS_ADAPTER *ioc, u32 phys_addr) 
	return ioc->reply + (phys_addr - (u32)ioc->reply_dma);

}



/**

 * _base_get_msix_index - get the msix index

 * @ioc: per adapter object

 * @scmd: scsi_cmnd object

 *

 * returns msix index of general reply queues,

 * i.e. reply queue on which IO request's reply

 * should be posted by the HBA firmware.

 */

static inline u8

_base_get_msix_index(struct MPT3SAS_ADAPTER *ioc)

_base_get_msix_index(struct MPT3SAS_ADAPTER *ioc,

	struct scsi_cmnd *scmd)

{

	/* Enables reply_queue load balancing */

	if (ioc->msix_load_balance)
@@ -3360,7 +3370,7 @@ mpt3sas_base_get_smid_scsiio(struct MPT3SAS_ADAPTER *ioc, u8 cb_idx, 


	smid = tag + 1;

	request->cb_idx = cb_idx;

	request->msix_io = _base_get_msix_index(ioc);

	request->msix_io = _base_get_msix_index(ioc, NULL);

	request->smid = smid;

	INIT_LIST_HEAD(&request->chain_list);

	return smid;
@@ -3534,7 +3544,7 @@ _base_put_smid_mpi_ep_scsi_io(struct MPT3SAS_ADAPTER *ioc, 
	_base_clone_mpi_to_sys_mem(mpi_req_iomem, (void *)mfp,

					ioc->request_sz);

	descriptor.SCSIIO.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_SCSI_IO;

	descriptor.SCSIIO.MSIxIndex =  _base_get_msix_index(ioc);

	descriptor.SCSIIO.MSIxIndex =  _base_get_msix_index(ioc, NULL);

	descriptor.SCSIIO.SMID = cpu_to_le16(smid);

	descriptor.SCSIIO.DevHandle = cpu_to_le16(handle);

	descriptor.SCSIIO.LMID = 0;
@@ -3556,7 +3566,7 @@ _base_put_smid_scsi_io(struct MPT3SAS_ADAPTER *ioc, u16 smid, u16 handle) 




	descriptor.SCSIIO.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_SCSI_IO;

	descriptor.SCSIIO.MSIxIndex =  _base_get_msix_index(ioc);

	descriptor.SCSIIO.MSIxIndex =  _base_get_msix_index(ioc, NULL);

	descriptor.SCSIIO.SMID = cpu_to_le16(smid);

	descriptor.SCSIIO.DevHandle = cpu_to_le16(handle);

	descriptor.SCSIIO.LMID = 0;
@@ -3579,7 +3589,7 @@ _base_put_smid_fast_path(struct MPT3SAS_ADAPTER *ioc, u16 smid, 


	descriptor.SCSIIO.RequestFlags =

	    MPI25_REQ_DESCRIPT_FLAGS_FAST_PATH_SCSI_IO;

	descriptor.SCSIIO.MSIxIndex = _base_get_msix_index(ioc);

	descriptor.SCSIIO.MSIxIndex = _base_get_msix_index(ioc, NULL);

	descriptor.SCSIIO.SMID = cpu_to_le16(smid);

	descriptor.SCSIIO.DevHandle = cpu_to_le16(handle);

	descriptor.SCSIIO.LMID = 0;
@@ -3643,7 +3653,7 @@ mpt3sas_base_put_smid_nvme_encap(struct MPT3SAS_ADAPTER *ioc, u16 smid) 


	descriptor.Default.RequestFlags =

		MPI26_REQ_DESCRIPT_FLAGS_PCIE_ENCAPSULATED;

	descriptor.Default.MSIxIndex =  _base_get_msix_index(ioc);

	descriptor.Default.MSIxIndex =  _base_get_msix_index(ioc, NULL);

	descriptor.Default.SMID = cpu_to_le16(smid);

	descriptor.Default.LMID = 0;

	descriptor.Default.DescriptorTypeDependent = 0;
@@ -3675,7 +3685,7 @@ _base_put_smid_default(struct MPT3SAS_ADAPTER *ioc, u16 smid) 
	}

	request = (u64 *)&descriptor;

	descriptor.Default.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE;

	descriptor.Default.MSIxIndex =  _base_get_msix_index(ioc);

	descriptor.Default.MSIxIndex =  _base_get_msix_index(ioc, NULL);

	descriptor.Default.SMID = cpu_to_le16(smid);

	descriptor.Default.LMID = 0;

	descriptor.Default.DescriptorTypeDependent = 0;
@@ -3705,7 +3715,7 @@ _base_put_smid_scsi_io_atomic(struct MPT3SAS_ADAPTER *ioc, u16 smid, 
	u32 *request = (u32 *)&descriptor;



	descriptor.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_SCSI_IO;

	descriptor.MSIxIndex = _base_get_msix_index(ioc);

	descriptor.MSIxIndex = _base_get_msix_index(ioc, NULL);

	descriptor.SMID = cpu_to_le16(smid);



	writel(cpu_to_le32(*request), &ioc->chip->AtomicRequestDescriptorPost);
@@ -3727,7 +3737,7 @@ _base_put_smid_fast_path_atomic(struct MPT3SAS_ADAPTER *ioc, u16 smid, 
	u32 *request = (u32 *)&descriptor;



	descriptor.RequestFlags = MPI25_REQ_DESCRIPT_FLAGS_FAST_PATH_SCSI_IO;

	descriptor.MSIxIndex = _base_get_msix_index(ioc);

	descriptor.MSIxIndex = _base_get_msix_index(ioc, NULL);

	descriptor.SMID = cpu_to_le16(smid);



	writel(cpu_to_le32(*request), &ioc->chip->AtomicRequestDescriptorPost);
@@ -3771,7 +3781,7 @@ _base_put_smid_default_atomic(struct MPT3SAS_ADAPTER *ioc, u16 smid) 
	u32 *request = (u32 *)&descriptor;



	descriptor.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE;

	descriptor.MSIxIndex = _base_get_msix_index(ioc);

	descriptor.MSIxIndex = _base_get_msix_index(ioc, NULL);

	descriptor.SMID = cpu_to_le16(smid);



	writel(cpu_to_le32(*request), &ioc->chip->AtomicRequestDescriptorPost);