korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-20 12:54:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

cciss: simplify scatter gather code

Browse Source 
cciss: simplify scatter gather code.
Instead of allocating an array of pointers to a structure
containing an SGDescriptor structure, and two other elements
that aren't really used, just allocate SGDescriptor structs.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Stephen M. Cameron 2010-02-26 16:01:27 -06:00 committed by Jens Axboe
parent 49fc5601ea
commit dccc9b563e
2 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/block/cciss.c
View File

@ -257,7 +257,7 @@ static inline void removeQ(CommandList_struct *c)
hlist_del_init(&c->list); hlist_del_init(&c->list);
} }
static void cciss_free_sg_chain_blocks(struct Cmd_sg_list **cmd_sg_list, static void cciss_free_sg_chain_blocks(SGDescriptor_struct **cmd_sg_list,
int nr_cmds) int nr_cmds)
{ {
int i; int i;
@ -265,20 +265,17 @@ static void cciss_free_sg_chain_blocks(struct Cmd_sg_list **cmd_sg_list,
if (!cmd_sg_list) if (!cmd_sg_list)
return; return;
for (i = 0; i < nr_cmds; i++) { for (i = 0; i < nr_cmds; i++) {
if (cmd_sg_list[i]) { kfree(cmd_sg_list[i]);
kfree(cmd_sg_list[i]->sgchain); cmd_sg_list[i] = NULL;
kfree(cmd_sg_list[i]);
cmd_sg_list[i] = NULL;
}
} }
kfree(cmd_sg_list); kfree(cmd_sg_list);
} }
static struct Cmd_sg_list **cciss_allocate_sg_chain_blocks(ctlr_info_t *h, static SGDescriptor_struct **cciss_allocate_sg_chain_blocks(
int chainsize, int nr_cmds) ctlr_info_t *h, int chainsize, int nr_cmds)
{ {
int j; int j;
struct Cmd_sg_list **cmd_sg_list; SGDescriptor_struct **cmd_sg_list;
if (chainsize <= 0) if (chainsize <= 0)
return NULL; return NULL;
@ -289,16 +286,10 @@ static struct Cmd_sg_list **cciss_allocate_sg_chain_blocks(ctlr_info_t *h,
/* Build up chain blocks for each command */ /* Build up chain blocks for each command */
for (j = 0; j < nr_cmds; j++) { for (j = 0; j < nr_cmds; j++) {
cmd_sg_list[j] = kmalloc(sizeof(*cmd_sg_list[j]), GFP_KERNEL);
if (!cmd_sg_list[j]) {
dev_err(&h->pdev->dev, "Cannot get memory "
"for chain block.\n");
goto clean;
}
/* Need a block of chainsized s/g elements. */ /* Need a block of chainsized s/g elements. */
cmd_sg_list[j]->sgchain = kmalloc((chainsize * cmd_sg_list[j] = kmalloc((chainsize *
sizeof(SGDescriptor_struct)), GFP_KERNEL); sizeof(*cmd_sg_list[j])), GFP_KERNEL);
if (!cmd_sg_list[j]->sgchain) { if (!cmd_sg_list[j]) {
dev_err(&h->pdev->dev, "Cannot get memory " dev_err(&h->pdev->dev, "Cannot get memory "
"for s/g chains.\n"); "for s/g chains.\n");
goto clean; goto clean;
@ -1731,7 +1722,7 @@ static void cciss_softirq_done(struct request *rq)
pci_unmap_single(h->pdev, temp64.val, pci_unmap_single(h->pdev, temp64.val,
cmd->SG[i].Len, ddir); cmd->SG[i].Len, ddir);
/* Point to the next block */ /* Point to the next block */
curr_sg = h->cmd_sg_list[cmd->cmdindex]->sgchain; curr_sg = h->cmd_sg_list[cmd->cmdindex];
sg_index = 0; sg_index = 0;
} }
temp64.val32.lower = curr_sg[sg_index].Addr.lower; temp64.val32.lower = curr_sg[sg_index].Addr.lower;
@ -3206,7 +3197,7 @@ static void do_cciss_request(struct request_queue *q)
curr_sg[sg_index].Ext = CCISS_SG_CHAIN; curr_sg[sg_index].Ext = CCISS_SG_CHAIN;
/* Point to next chain block. */ /* Point to next chain block. */
curr_sg = h->cmd_sg_list[c->cmdindex]->sgchain; curr_sg = h->cmd_sg_list[c->cmdindex];
sg_index = 0; sg_index = 0;
chained = 1; chained = 1;
} }
@ -3223,6 +3214,7 @@ static void do_cciss_request(struct request_queue *q)
if (chained) { if (chained) {
int len; int len;
dma_addr_t dma_addr;
curr_sg = c->SG; curr_sg = c->SG;
sg_index = h->max_cmd_sgentries - 1; sg_index = h->max_cmd_sgentries - 1;
len = curr_sg[sg_index].Len; len = curr_sg[sg_index].Len;
@ -3231,16 +3223,11 @@ static void do_cciss_request(struct request_queue *q)
* block with address of next chain block. * block with address of next chain block.
*/ */
temp64.val = pci_map_single(h->pdev, temp64.val = pci_map_single(h->pdev,
h->cmd_sg_list[c->cmdindex]->sgchain, h->cmd_sg_list[c->cmdindex], len, dir);
len, dir); dma_addr = temp64.val;
h->cmd_sg_list[c->cmdindex]->sg_chain_dma = temp64.val;
curr_sg[sg_index].Addr.lower = temp64.val32.lower; curr_sg[sg_index].Addr.lower = temp64.val32.lower;
curr_sg[sg_index].Addr.upper = temp64.val32.upper; curr_sg[sg_index].Addr.upper = temp64.val32.upper;
pci_dma_sync_single_for_device(h->pdev, dma_addr, len, dir);
pci_dma_sync_single_for_device(h->pdev,
h->cmd_sg_list[c->cmdindex]->sg_chain_dma,
len, dir);
} }
/* track how many SG entries we are using */ /* track how many SG entries we are using */

8
drivers/block/cciss.h
View File

@ -55,12 +55,6 @@ typedef struct _drive_info_struct
char device_initialized; /* indicates whether dev is initialized */ char device_initialized; /* indicates whether dev is initialized */
} drive_info_struct; } drive_info_struct;
struct Cmd_sg_list {
SGDescriptor_struct *sgchain;
dma_addr_t sg_chain_dma;
int chain_block_size;
};
struct ctlr_info struct ctlr_info
{ {
int ctlr; int ctlr;
@ -89,7 +83,7 @@ struct ctlr_info
int maxsgentries; int maxsgentries;
int chainsize; int chainsize;
int max_cmd_sgentries; int max_cmd_sgentries;
struct Cmd_sg_list **cmd_sg_list; SGDescriptor_struct **cmd_sg_list;
# define DOORBELL_INT 0 # define DOORBELL_INT 0
# define PERF_MODE_INT 1 # define PERF_MODE_INT 1