raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 01:49:46 +00:00
Code Issues Projects Releases Wiki Activity

bcm2835-dma: Fix up convert to DMA pool

Browse Source
This commit is contained in:
Matthias Reichl
2015-11-16 14:05:35 +00:00
committed by popcornmix
parent 0a8cace2c9
commit ec2e48fda2
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
drivers/dma/bcm2835-dma.c
View File

@@ -488,6 +488,17 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic(
c->cyclic = true;
return vchan_tx_prep(&c->vc, &d->vd, flags);
error_cb:
i--;
for (; i >= 0; i--) {
struct bcm2835_cb_entry *cb_entry = &d->cb_list[i];
dma_pool_free(c->cb_pool, cb_entry->cb, cb_entry->paddr);
}
kfree(d->cb_list);
kfree(d);
return NULL;
}
static struct dma_async_tx_descriptor *
@@ -534,6 +545,7 @@ bcm2835_dma_prep_slave_sg(struct dma_chan *chan,
if (!d)
return NULL;
d->c = c;
d->dir = direction;
if (c->ch >= 8) /* LITE channel */
@@ -553,15 +565,21 @@ bcm2835_dma_prep_slave_sg(struct dma_chan *chan,
d->frames += len / max_size + 1;
}
/* Allocate memory for control blocks */
d->control_block_size = d->frames * sizeof(struct bcm2835_dma_cb);
d->control_block_base = dma_zalloc_coherent(chan->device->dev,
d->control_block_size, &d->control_block_base_phys,
GFP_NOWAIT);
if (!d->control_block_base) {
d->cb_list = kcalloc(d->frames, sizeof(*d->cb_list), GFP_KERNEL);
if (!d->cb_list) {
kfree(d);
return NULL;
}
/* Allocate memory for control blocks */
for (i = 0; i < d->frames; i++) {
struct bcm2835_cb_entry *cb_entry = &d->cb_list[i];
cb_entry->cb = dma_pool_zalloc(c->cb_pool, GFP_ATOMIC,
&cb_entry->paddr);
if (!cb_entry->cb)
goto error_cb;
}
/*
* Iterate over all SG entries, create a control block
@@ -578,7 +596,7 @@ bcm2835_dma_prep_slave_sg(struct dma_chan *chan,
for (j = 0; j < len; j += max_size) {
struct bcm2835_dma_cb *control_block =
&d->control_block_base[i + split_cnt];
d->cb_list[i + split_cnt].cb;
/* Setup addresses */
if (d->dir == DMA_DEV_TO_MEM) {
@@ -620,9 +638,7 @@ bcm2835_dma_prep_slave_sg(struct dma_chan *chan,
if (i < sg_len - 1 || len - j > max_size) {
/* Next block is the next frame. */
control_block->next =
d->control_block_base_phys +
sizeof(struct bcm2835_dma_cb) *
(i + split_cnt + 1);
d->cb_list[i + split_cnt + 1].paddr;
} else {
/* Next block is empty. */
control_block->next = 0;