summaryrefslogtreecommitdiff
path: root/target/linux/brcm2708/patches-4.4/0390-Revert-bcm2835-dma-Fix-up-convert-to-DMA-pool.patch
diff options
context:
space:
mode:
authorÁlvaro Fernández Rojas <noltari@gmail.com>2016-09-10 14:54:26 +0200
committerÁlvaro Fernández Rojas <noltari@gmail.com>2016-09-10 14:54:26 +0200
commit2b1c6b21b5e6c82ebb55d7fb7df90e60e88cbb14 (patch)
treeba6d48b4fec219d07110f5d55afc19bc309d2bdb /target/linux/brcm2708/patches-4.4/0390-Revert-bcm2835-dma-Fix-up-convert-to-DMA-pool.patch
parentac08cb06f6734ebf73ed855cbc836c566f80eaca (diff)
downloadmtk-20170518-2b1c6b21b5e6c82ebb55d7fb7df90e60e88cbb14.zip
mtk-20170518-2b1c6b21b5e6c82ebb55d7fb7df90e60e88cbb14.tar.gz
mtk-20170518-2b1c6b21b5e6c82ebb55d7fb7df90e60e88cbb14.tar.bz2
brcm2708: update linux 4.4 patches to latest version
As usual these patches were extracted and rebased from the raspberry pi repo: https://github.com/raspberrypi/linux/tree/rpi-4.4.y Also adds support for Raspberry Pi Compute Module 3 (untested). Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0390-Revert-bcm2835-dma-Fix-up-convert-to-DMA-pool.patch')
-rw-r--r--target/linux/brcm2708/patches-4.4/0390-Revert-bcm2835-dma-Fix-up-convert-to-DMA-pool.patch86
1 files changed, 0 insertions, 86 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0390-Revert-bcm2835-dma-Fix-up-convert-to-DMA-pool.patch b/target/linux/brcm2708/patches-4.4/0390-Revert-bcm2835-dma-Fix-up-convert-to-DMA-pool.patch
deleted file mode 100644
index 97a16a2..0000000
--- a/target/linux/brcm2708/patches-4.4/0390-Revert-bcm2835-dma-Fix-up-convert-to-DMA-pool.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From d9c36fdc44cdf154a0849b03e94b0a6b6f86defb Mon Sep 17 00:00:00 2001
-From: Martin Sperl <kernel@martin.sperl.org>
-Date: Fri, 22 Apr 2016 17:17:13 +0000
-Subject: [PATCH 390/423] Revert "bcm2835-dma: Fix up convert to DMA pool"
-
-This reverts commit ec2e48fda22c57cab56a4332d1a095f91c919493.
----
- drivers/dma/bcm2835-dma.c | 36 ++++++++++--------------------------
- 1 file changed, 10 insertions(+), 26 deletions(-)
-
---- a/drivers/dma/bcm2835-dma.c
-+++ b/drivers/dma/bcm2835-dma.c
-@@ -488,17 +488,6 @@ static struct dma_async_tx_descriptor *b
- 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 *
-@@ -545,7 +534,6 @@ bcm2835_dma_prep_slave_sg(struct dma_cha
- if (!d)
- return NULL;
-
-- d->c = c;
- d->dir = direction;
-
- if (c->ch >= 8) /* LITE channel */
-@@ -565,21 +553,15 @@ bcm2835_dma_prep_slave_sg(struct dma_cha
- d->frames += len / max_size + 1;
- }
-
-- d->cb_list = kcalloc(d->frames, sizeof(*d->cb_list), GFP_KERNEL);
-- if (!d->cb_list) {
-+ /* 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) {
- 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
-@@ -596,7 +578,7 @@ bcm2835_dma_prep_slave_sg(struct dma_cha
-
- for (j = 0; j < len; j += max_size) {
- struct bcm2835_dma_cb *control_block =
-- d->cb_list[i + split_cnt].cb;
-+ &d->control_block_base[i + split_cnt];
-
- /* Setup addresses */
- if (d->dir == DMA_DEV_TO_MEM) {
-@@ -638,7 +620,9 @@ bcm2835_dma_prep_slave_sg(struct dma_cha
- if (i < sg_len - 1 || len - j > max_size) {
- /* Next block is the next frame. */
- control_block->next =
-- d->cb_list[i + split_cnt + 1].paddr;
-+ d->control_block_base_phys +
-+ sizeof(struct bcm2835_dma_cb) *
-+ (i + split_cnt + 1);
- } else {
- /* Next block is empty. */
- control_block->next = 0;