From: Eric Anholt <eric@anholt.net>
To: linux-rpi-kernel@lists.infradead.org
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Stephen Warren <swarren@wwwdotorg.org>,
Lee Jones <lee@kernel.org>, Vinod Koul <vinod.koul@intel.com>,
dmaengine@vger.kernel.org, Martin Sperl <kernel@martin.sperl.org>,
Eric Anholt <eric@anholt.net>
Subject: [PATCH 4/8] dmaengine: bcm2835: move cyclic member from bcm2835_chan into bcm2835_desc
Date: Wed, 16 Mar 2016 12:24:58 -0700 [thread overview]
Message-ID: <1458156302-4359-5-git-send-email-eric@anholt.net> (raw)
In-Reply-To: <1458156302-4359-1-git-send-email-eric@anholt.net>
From: Martin Sperl <kernel@martin.sperl.org>
In preparation to consolidating code we move the cyclic member
into the bcm_2835_desc structure.
Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Eric Anholt <eric@anholt.net>
---
drivers/dma/bcm2835-dma.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c
index a1d851a..b3bc382 100644
--- a/drivers/dma/bcm2835-dma.c
+++ b/drivers/dma/bcm2835-dma.c
@@ -73,7 +73,6 @@ struct bcm2835_chan {
struct list_head node;
struct dma_slave_config cfg;
- bool cyclic;
unsigned int dreq;
int ch;
@@ -93,6 +92,8 @@ struct bcm2835_desc {
unsigned int frames;
size_t size;
+
+ bool cyclic;
};
#define BCM2835_DMA_CS 0x00
@@ -377,8 +378,6 @@ static void bcm2835_dma_issue_pending(struct dma_chan *chan)
struct bcm2835_chan *c = to_bcm2835_dma_chan(chan);
unsigned long flags;
- c->cyclic = true; /* Nothing else is implemented */
-
spin_lock_irqsave(&c->vc.lock, flags);
if (vchan_issue_pending(&c->vc) && !c->desc)
bcm2835_dma_start_desc(c);
@@ -432,6 +431,7 @@ static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_cyclic(
d->c = c;
d->dir = direction;
d->frames = buf_len / period_len;
+ d->cyclic = true;
d->cb_list = kcalloc(d->frames, sizeof(*d->cb_list), GFP_KERNEL);
if (!d->cb_list) {
--
2.7.0
next prev parent reply other threads:[~2016-03-16 19:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-16 19:24 [PATCH 0/8 v4] bcm2835 DMA slave support Eric Anholt
2016-03-16 19:24 ` [PATCH 1/8] dmaengine: bcm2835: set residue_granularity field Eric Anholt
2016-03-16 19:24 ` [PATCH 2/8] dmaengine: bcm2835: remove unnecessary masking of dma channels Eric Anholt
2016-03-16 19:24 ` [PATCH 3/8] dmaengine: bcm2835: add additional defines for DMA-registers Eric Anholt
2016-03-16 19:24 ` Eric Anholt [this message]
2016-03-16 19:24 ` [PATCH 5/8] dmaengine: bcm2835: move controlblock chain generation into separate method Eric Anholt
2016-03-16 19:25 ` [PATCH 6/8] dmaengine: bcm2835: limit max length based on channel type Eric Anholt
2016-03-16 19:25 ` [PATCH 7/8] dmaengine: bcm2835: add slave_sg support to bcm2835-dma Eric Anholt
2016-03-16 19:25 ` [PATCH 8/8] dmaengine: bcm2835: add dma_memcopy " Eric Anholt
2016-03-17 10:22 ` [PATCH 0/8 v4] bcm2835 DMA slave support Martin Sperl
2016-03-17 13:17 ` Martin Sperl
2016-04-05 18:03 ` Vinod Koul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1458156302-4359-5-git-send-email-eric@anholt.net \
--to=eric@anholt.net \
--cc=dmaengine@vger.kernel.org \
--cc=kernel@martin.sperl.org \
--cc=lee@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=swarren@wwwdotorg.org \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox