* [PATCH RESEND] dmaengine: stm32-dma: Rework starting transfer management
@ 2017-01-02 9:33 M'boumba Cedric Madianga
2017-01-03 3:57 ` Vinod Koul
0 siblings, 1 reply; 3+ messages in thread
From: M'boumba Cedric Madianga @ 2017-01-02 9:33 UTC (permalink / raw)
To: vinod.koul, robh+dt, mark.rutland, mcoquelin.stm32,
alexandre.torgue, dan.j.williams, dmaengine, devicetree,
linux-arm-kernel, linux-kernel
Cc: M'boumba Cedric Madianga
This patch reworks the way to manage transfer starting.
Now, starting DMA is only allowed when the channel is not busy.
Then, stm32_dma_start_transfer is declared as void.
At least, after each transfer completion, we start the next transfer if a
new descriptor as been queued in the issued list during an ongoing
transfer.
Signed-off-by: M'boumba Cedric Madianga <cedric.madianga@gmail.com>
Reviewed-by: Ludovic BARRE <ludovic.barre@st.com>
---
drivers/dma/stm32-dma.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/dma/stm32-dma.c b/drivers/dma/stm32-dma.c
index 3056ce7..adb846c 100644
--- a/drivers/dma/stm32-dma.c
+++ b/drivers/dma/stm32-dma.c
@@ -421,7 +421,7 @@ static void stm32_dma_dump_reg(struct stm32_dma_chan *chan)
dev_dbg(chan2dev(chan), "SFCR: 0x%08x\n", sfcr);
}
-static int stm32_dma_start_transfer(struct stm32_dma_chan *chan)
+static void stm32_dma_start_transfer(struct stm32_dma_chan *chan)
{
struct stm32_dma_device *dmadev = stm32_dma_get_dev(chan);
struct virt_dma_desc *vdesc;
@@ -432,12 +432,12 @@ static int stm32_dma_start_transfer(struct stm32_dma_chan *chan)
ret = stm32_dma_disable_chan(chan);
if (ret < 0)
- return ret;
+ return;
if (!chan->desc) {
vdesc = vchan_next_desc(&chan->vchan);
if (!vdesc)
- return -EPERM;
+ return;
chan->desc = to_stm32_dma_desc(vdesc);
chan->next_sg = 0;
@@ -471,7 +471,7 @@ static int stm32_dma_start_transfer(struct stm32_dma_chan *chan)
chan->busy = true;
- return 0;
+ dev_dbg(chan2dev(chan), "vchan %p: started\n", &chan->vchan);
}
static void stm32_dma_configure_next_sg(struct stm32_dma_chan *chan)
@@ -552,15 +552,13 @@ static void stm32_dma_issue_pending(struct dma_chan *c)
{
struct stm32_dma_chan *chan = to_stm32_dma_chan(c);
unsigned long flags;
- int ret;
spin_lock_irqsave(&chan->vchan.lock, flags);
- if (!chan->busy) {
- if (vchan_issue_pending(&chan->vchan) && !chan->desc) {
- ret = stm32_dma_start_transfer(chan);
- if ((!ret) && (chan->desc->cyclic))
- stm32_dma_configure_next_sg(chan);
- }
+ if (vchan_issue_pending(&chan->vchan) && !chan->desc && !chan->busy) {
+ dev_dbg(chan2dev(chan), "vchan %p: issued\n", &chan->vchan);
+ stm32_dma_start_transfer(chan);
+ if (chan->desc->cyclic)
+ stm32_dma_configure_next_sg(chan);
}
spin_unlock_irqrestore(&chan->vchan.lock, flags);
}
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH RESEND] dmaengine: stm32-dma: Rework starting transfer management
2017-01-02 9:33 [PATCH RESEND] dmaengine: stm32-dma: Rework starting transfer management M'boumba Cedric Madianga
@ 2017-01-03 3:57 ` Vinod Koul
2017-01-03 16:51 ` M'boumba Cedric Madianga
0 siblings, 1 reply; 3+ messages in thread
From: Vinod Koul @ 2017-01-03 3:57 UTC (permalink / raw)
To: M'boumba Cedric Madianga
Cc: robh+dt, mark.rutland, mcoquelin.stm32, alexandre.torgue,
dan.j.williams, dmaengine, devicetree, linux-arm-kernel,
linux-kernel
On Mon, Jan 02, 2017 at 10:33:27AM +0100, M'boumba Cedric Madianga wrote:
> This patch reworks the way to manage transfer starting.
> Now, starting DMA is only allowed when the channel is not busy.
> Then, stm32_dma_start_transfer is declared as void.
> At least, after each transfer completion, we start the next transfer if a
> new descriptor as been queued in the issued list during an ongoing
> transfer.
ah sorry, i missed to push topic/stm32-dma. can you rebase onnthis and
resend again. Btw this fails as as well..
--
~Vinod
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH RESEND] dmaengine: stm32-dma: Rework starting transfer management
2017-01-03 3:57 ` Vinod Koul
@ 2017-01-03 16:51 ` M'boumba Cedric Madianga
0 siblings, 0 replies; 3+ messages in thread
From: M'boumba Cedric Madianga @ 2017-01-03 16:51 UTC (permalink / raw)
To: Vinod Koul
Cc: Rob Herring, Mark Rutland, Maxime Coquelin, Alexandre Torgue,
dan.j.williams, dmaengine, devicetree, linux-arm-kernel,
linux-kernel
Hi Vinod,
> ah sorry, i missed to push topic/stm32-dma. can you rebase onnthis and
> resend again. Btw this fails as as well..
I have tried again and I don't have any issue.
Please see below my way of working and let me know if there is
something I don't understand:
slave-dma git://git.infradead.org/users/vkoul/slave-dma.git
$ git fetch slave-dma
$ git checkout -b dma-fixes slave-dma/topic/dma-fixes
$ git checkout -b dma-stm32 slave-dma/topic/stm32-dma
$ git rebase dma-fixes
First, rewinding head to replay your work on top of it...
Applying: dmaengine: stm32-dma: Fix typo in Kconfig
Applying: dt-bindings: stm32-dma: Fix typo regarding DMA client binding
Applying: dmaengine: stm32-dma: Rework starting transfer management
Applying: dmaengine: stm32-dma: Fix residue computation issue in cyclic mode
Applying: dmaengine: stm32-dma: Add synchronization support
Applying: dmaengine: stm32-dma: Add max_burst support
Best regards,
Cedric
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-03 17:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-02 9:33 [PATCH RESEND] dmaengine: stm32-dma: Rework starting transfer management M'boumba Cedric Madianga
2017-01-03 3:57 ` Vinod Koul
2017-01-03 16:51 ` M'boumba Cedric Madianga
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).