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

Commit 12e7c678 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: mpt3sas: Introduce mpt3sas_get_st_from_smid() 



Abstract accesses to the scsi_lookup array by introducing
mpt3sas_get_st_from_smid().

Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarSuganath Prabu S <suganath-prabu.subramani@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 02a386df

drivers/scsi/mpt3sas/mpt3sas_base.c

+18 −4
Original line number Diff line number Diff line
@@ -888,6 +888,15 @@ _base_async_event(struct MPT3SAS_ADAPTER *ioc, u8 msix_index, u32 reply) 
	return 1;

}



struct scsiio_tracker *

mpt3sas_get_st_from_smid(struct MPT3SAS_ADAPTER *ioc, u16 smid)

{

	if (WARN_ON(!smid) ||

	    WARN_ON(smid >= ioc->hi_priority_smid))

		return NULL;

	return &ioc->scsi_lookup[smid - 1];

}



/**

 * _base_get_cb_idx - obtain the callback index

 * @ioc: per adapter object
@@ -902,8 +911,11 @@ _base_get_cb_idx(struct MPT3SAS_ADAPTER *ioc, u16 smid) 
	u8 cb_idx = 0xFF;



	if (smid < ioc->hi_priority_smid) {

		i = smid - 1;

		cb_idx = ioc->scsi_lookup[i].cb_idx;

		struct scsiio_tracker *st;



		st = mpt3sas_get_st_from_smid(ioc, smid);

		if (st)

			cb_idx = st->cb_idx;

	} else if (smid < ioc->internal_smid) {

		i = smid - ioc->hi_priority_smid;

		cb_idx = ioc->hpr_lookup[i].cb_idx;
@@ -1294,6 +1306,7 @@ static struct chain_tracker * 
_base_get_chain_buffer_tracker(struct MPT3SAS_ADAPTER *ioc, u16 smid)

{

	struct chain_tracker *chain_req;

	struct scsiio_tracker *st;

	unsigned long flags;



	spin_lock_irqsave(&ioc->scsi_lookup_lock, flags);
@@ -1306,8 +1319,9 @@ _base_get_chain_buffer_tracker(struct MPT3SAS_ADAPTER *ioc, u16 smid) 
	chain_req = list_entry(ioc->free_chain_list.next,

	    struct chain_tracker, tracker_list);

	list_del_init(&chain_req->tracker_list);

	list_add_tail(&chain_req->tracker_list,

	    &ioc->scsi_lookup[smid - 1].chain_list);

	st = mpt3sas_get_st_from_smid(ioc, smid);

	if (st)

		list_add_tail(&chain_req->tracker_list, &st->chain_list);

	spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);

	return chain_req;

}

drivers/scsi/mpt3sas/mpt3sas_base.h

+2 −0
Original line number Diff line number Diff line
@@ -1402,6 +1402,8 @@ void mpt3sas_base_sync_reply_irqs(struct MPT3SAS_ADAPTER *ioc); 
u16 mpt3sas_base_get_smid_hpr(struct MPT3SAS_ADAPTER *ioc, u8 cb_idx);

u16 mpt3sas_base_get_smid_scsiio(struct MPT3SAS_ADAPTER *ioc, u8 cb_idx,

	struct scsi_cmnd *scmd);

struct scsiio_tracker *mpt3sas_get_st_from_smid(struct MPT3SAS_ADAPTER *ioc,

	u16 smid);



u16 mpt3sas_base_get_smid(struct MPT3SAS_ADAPTER *ioc, u8 cb_idx);

void mpt3sas_base_free_smid(struct MPT3SAS_ADAPTER *ioc, u16 smid);

drivers/scsi/mpt3sas/mpt3sas_scsih.c

+4 −3
Original line number Diff line number Diff line
@@ -2779,7 +2779,7 @@ mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, uint channel, 
	}



	if (type == MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK)

		scsi_lookup = &ioc->scsi_lookup[smid_task - 1];

		scsi_lookup = mpt3sas_get_st_from_smid(ioc, smid_task);



	dtmprintk(ioc, pr_info(MPT3SAS_FMT

		"sending tm: handle(0x%04x), task_type(0x%02x), smid(%d)\n",
@@ -2797,6 +2797,7 @@ mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, uint channel, 
	mpt3sas_scsih_set_tm_flag(ioc, handle);

	init_completion(&ioc->tm_cmds.done);

	if ((type == MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK) &&

	    scsi_lookup &&

	    (scsi_lookup->msix_io < ioc->reply_queue_count))

		msix_task = scsi_lookup->msix_io;

	else
@@ -2838,7 +2839,7 @@ mpt3sas_scsih_issue_tm(struct MPT3SAS_ADAPTER *ioc, u16 handle, uint channel, 
	switch (type) {

	case MPI2_SCSITASKMGMT_TASKTYPE_ABORT_TASK:

		rc = SUCCESS;

		if (scsi_lookup->scmd == NULL)

		if (scsi_lookup && scsi_lookup->scmd == NULL)

			break;

		rc = FAILED;

		break;

drivers/scsi/mpt3sas/mpt3sas_warpdrive.c

+3 −1
Original line number Diff line number Diff line
@@ -270,7 +270,9 @@ mpt3sas_init_warpdrive_properties(struct MPT3SAS_ADAPTER *ioc, 
inline u8

mpt3sas_scsi_direct_io_get(struct MPT3SAS_ADAPTER *ioc, u16 smid)

{

	return ioc->scsi_lookup[smid - 1].direct_io;

	struct scsiio_tracker *st = mpt3sas_get_st_from_smid(ioc, smid);



	return st ? st->direct_io : 0;

}



/**