lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] mpt2sas: Basic Code Cleanup in mpt2sas_base

Browse Source 
Basic Code Cleanup:
(1) _base_get_cb_idx and mpt2sas_base_free_smid were reorganized in
similar fashion so the order of obtaining the cbx and smid are
scsiio,
hi_priority, and internal.
(2) The hi_priority and internal request queue struct was made
smaller
by removing the scmd and chain_tracker, thus saving memory
allocation.
(3) For scsiio request, a new structure was created having the same
elements from the former request tracker struct.

Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Kashyap, Desai
2011-01-04 11:39:20 +05:30
committed by James Bottomley
parent fb396bec76
commit d5bd3491c8
2 changed files with 67 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
drivers/scsi/mpt2sas/mpt2sas_base.c
View File

@@ -752,20 +752,19 @@ static u8
_base_get_cb_idx(struct MPT2SAS_ADAPTER *ioc, u16 smid) _base_get_cb_idx(struct MPT2SAS_ADAPTER *ioc, u16 smid)
{ {
int i; int i;
u8 cb_idx = 0xFF; u8 cb_idx;
if (smid >= ioc->hi_priority_smid) { if (smid < ioc->hi_priority_smid) {
if (smid < ioc->internal_smid) {
i = smid - ioc->hi_priority_smid;
cb_idx = ioc->hpr_lookup[i].cb_idx;
} else if (smid <= ioc->hba_queue_depth) {
i = smid - ioc->internal_smid;
cb_idx = ioc->internal_lookup[i].cb_idx;
}
} else {
i = smid - 1; i = smid - 1;
cb_idx = ioc->scsi_lookup[i].cb_idx; cb_idx = ioc->scsi_lookup[i].cb_idx;
} } else if (smid < ioc->internal_smid) {
i = smid - ioc->hi_priority_smid;
cb_idx = ioc->hpr_lookup[i].cb_idx;
} else if (smid <= ioc->hba_queue_depth) {
i = smid - ioc->internal_smid;
cb_idx = ioc->internal_lookup[i].cb_idx;
} else
cb_idx = 0xFF;
return cb_idx; return cb_idx;
} }
@@ -1430,7 +1429,7 @@ mpt2sas_base_get_smid_scsiio(struct MPT2SAS_ADAPTER *ioc, u8 cb_idx,
struct scsi_cmnd *scmd) struct scsi_cmnd *scmd)
{ {
unsigned long flags; unsigned long flags;
struct request_tracker *request; struct scsiio_tracker *request;
u16 smid; u16 smid;
spin_lock_irqsave(&ioc->scsi_lookup_lock, flags); spin_lock_irqsave(&ioc->scsi_lookup_lock, flags);
@@ -1442,7 +1441,7 @@ mpt2sas_base_get_smid_scsiio(struct MPT2SAS_ADAPTER *ioc, u8 cb_idx,
} }
request = list_entry(ioc->free_list.next, request = list_entry(ioc->free_list.next,
struct request_tracker, tracker_list); struct scsiio_tracker, tracker_list);
request->scmd = scmd; request->scmd = scmd;
request->cb_idx = cb_idx; request->cb_idx = cb_idx;
smid = request->smid; smid = request->smid;
@@ -1496,48 +1495,47 @@ mpt2sas_base_free_smid(struct MPT2SAS_ADAPTER *ioc, u16 smid)
struct chain_tracker *chain_req, *next; struct chain_tracker *chain_req, *next;
spin_lock_irqsave(&ioc->scsi_lookup_lock, flags); spin_lock_irqsave(&ioc->scsi_lookup_lock, flags);
if (smid >= ioc->hi_priority_smid) { if (smid < ioc->hi_priority_smid) {
if (smid < ioc->internal_smid) { /* scsiio queue */
/* hi-priority */ i = smid - 1;
i = smid - ioc->hi_priority_smid; if (!list_empty(&ioc->scsi_lookup[i].chain_list)) {
ioc->hpr_lookup[i].cb_idx = 0xFF; list_for_each_entry_safe(chain_req, next,
list_add_tail(&ioc->hpr_lookup[i].tracker_list, &ioc->scsi_lookup[i].chain_list, tracker_list) {
&ioc->hpr_free_list); list_del_init(&chain_req->tracker_list);
} else { list_add_tail(&chain_req->tracker_list,
/* internal queue */ &ioc->free_chain_list);
i = smid - ioc->internal_smid; }
ioc->internal_lookup[i].cb_idx = 0xFF;
list_add_tail(&ioc->internal_lookup[i].tracker_list,
&ioc->internal_free_list);
} }
ioc->scsi_lookup[i].cb_idx = 0xFF;
ioc->scsi_lookup[i].scmd = NULL;
list_add_tail(&ioc->scsi_lookup[i].tracker_list,
&ioc->free_list);
spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags); spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);
return;
}
/* scsiio queue */ /*
i = smid - 1; * See _wait_for_commands_to_complete() call with regards
if (!list_empty(&ioc->scsi_lookup[i].chain_list)) { * to this code.
list_for_each_entry_safe(chain_req, next, */
&ioc->scsi_lookup[i].chain_list, tracker_list) { if (ioc->shost_recovery && ioc->pending_io_count) {
list_del_init(&chain_req->tracker_list); if (ioc->pending_io_count == 1)
list_add_tail(&chain_req->tracker_list, wake_up(&ioc->reset_wq);
&ioc->free_chain_list); ioc->pending_io_count--;
} }
return;
} else if (smid < ioc->internal_smid) {
/* hi-priority */
i = smid - ioc->hi_priority_smid;
ioc->hpr_lookup[i].cb_idx = 0xFF;
list_add_tail(&ioc->hpr_lookup[i].tracker_list,
&ioc->hpr_free_list);
} else if (smid <= ioc->hba_queue_depth) {
/* internal queue */
i = smid - ioc->internal_smid;
ioc->internal_lookup[i].cb_idx = 0xFF;
list_add_tail(&ioc->internal_lookup[i].tracker_list,
&ioc->internal_free_list);
} }
ioc->scsi_lookup[i].cb_idx = 0xFF;
ioc->scsi_lookup[i].scmd = NULL;
list_add_tail(&ioc->scsi_lookup[i].tracker_list,
&ioc->free_list);
spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags); spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags);
/*
* See _wait_for_commands_to_complete() call with regards to this code.
*/
if (ioc->shost_recovery && ioc->pending_io_count) {
if (ioc->pending_io_count == 1)
wake_up(&ioc->reset_wq);
ioc->pending_io_count--;
}
} }
/** /**
@@ -2278,9 +2276,9 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
ioc->name, (unsigned long long) ioc->request_dma)); ioc->name, (unsigned long long) ioc->request_dma));
total_sz += sz; total_sz += sz;
sz = ioc->scsiio_depth * sizeof(struct request_tracker); sz = ioc->scsiio_depth * sizeof(struct scsiio_tracker);
ioc->scsi_lookup_pages = get_order(sz); ioc->scsi_lookup_pages = get_order(sz);
ioc->scsi_lookup = (struct request_tracker *)__get_free_pages( ioc->scsi_lookup = (struct scsiio_tracker *)__get_free_pages(
GFP_KERNEL, ioc->scsi_lookup_pages); GFP_KERNEL, ioc->scsi_lookup_pages);
if (!ioc->scsi_lookup) { if (!ioc->scsi_lookup) {
printk(MPT2SAS_ERR_FMT "scsi_lookup: get_free_pages failed, " printk(MPT2SAS_ERR_FMT "scsi_lookup: get_free_pages failed, "

22
drivers/scsi/mpt2sas/mpt2sas_base.h
View File

@@ -101,7 +101,8 @@
#define MPT_NAME_LENGTH 32 /* generic length of strings */ #define MPT_NAME_LENGTH 32 /* generic length of strings */
#define MPT_STRING_LENGTH 64 #define MPT_STRING_LENGTH 64
#define MPT_MAX_CALLBACKS 16 #define MPT_MAX_CALLBACKS 16
#define CAN_SLEEP 1 #define CAN_SLEEP 1
#define NO_SLEEP 0 #define NO_SLEEP 0
@@ -445,14 +446,14 @@ struct chain_tracker {
}; };
/** /**
* struct request_tracker - firmware request tracker * struct scsiio_tracker - scsi mf request tracker
* @smid: system message id * @smid: system message id
* @scmd: scsi request pointer * @scmd: scsi request pointer
* @cb_idx: callback index * @cb_idx: callback index
* @chain_list: list of chains associated to this IO * @chain_list: list of chains associated to this IO
* @tracker_list: list of free request (ioc->free_list) * @tracker_list: list of free request (ioc->free_list)
*/ */
struct request_tracker { struct scsiio_tracker {
u16 smid; u16 smid;
struct scsi_cmnd *scmd; struct scsi_cmnd *scmd;
u8 cb_idx; u8 cb_idx;
@@ -460,6 +461,19 @@ struct request_tracker {
struct list_head tracker_list; struct list_head tracker_list;
}; };
/**
* struct request_tracker - misc mf request tracker
* @smid: system message id
* @scmd: scsi request pointer
* @cb_idx: callback index
* @tracker_list: list of free request (ioc->free_list)
*/
struct request_tracker {
u16 smid;
u8 cb_idx;
struct list_head tracker_list;
};
/** /**
* struct _tr_list - target reset list * struct _tr_list - target reset list
* @handle: device handle * @handle: device handle
@@ -723,7 +737,7 @@ struct MPT2SAS_ADAPTER {
u8 *request; u8 *request;
dma_addr_t request_dma; dma_addr_t request_dma;
u32 request_dma_sz; u32 request_dma_sz;
struct request_tracker *scsi_lookup; struct scsiio_tracker *scsi_lookup;
ulong scsi_lookup_pages; ulong scsi_lookup_pages;
spinlock_t scsi_lookup_lock; spinlock_t scsi_lookup_lock;
struct list_head free_list; struct list_head free_list;