From: Caesar Wang <wxt@rock-chips.com>
To: dinguyen@opensource.altera.com, vinod.koul@intel.com
Cc: dan.j.williams@intel.com, linux-kernel@vger.kernel.org,
dmaengine@vger.kernel.org, heiko@sntech.de,
dianders@chromium.org, sonnyrao@chromium.org,
al.kochet@gmail.com, shawn.lin@rock-chips.com,
linux-rockchip@lists.infradead.org, boojin.kim@samsung.com,
Caesar Wang <wxt@rock-chips.com>
Subject: [PATCH] dmaengine: pl330: fix to support the brust mode
Date: Wed, 24 Feb 2016 11:52:25 +0800 [thread overview]
Message-ID: <1456285945-19258-1-git-send-email-wxt@rock-chips.com> (raw)
This patch fixes the brust mode that will break DMA uart on SoCFPGA.
In some cases, some SoCS didn't support the multi-brust
even if the devices who use the pl330 claim support the maxbrust.
Fixes: commit 848e977
"dmaengine: pl330: support burst mode for dev-to-mem and mem-to-dev transmit"
Reported-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
---
drivers/dma/pl330.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 1b0453b..372b435 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -1161,7 +1161,7 @@ static inline int _ldst_devtomem(struct pl330_dmac *pl330, unsigned dry_run,
if (pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP)
cond = BURST;
else
- cond = (pxs->desc->rqcfg.brst_len == 1) ? SINGLE : BURST;
+ cond = SINGLE;
while (cyc--) {
off += _emit_WFP(dry_run, &buf[off], cond, pxs->desc->peri);
@@ -1186,8 +1186,7 @@ static inline int _ldst_memtodev(struct pl330_dmac *pl330,
if (pl330->quirks & PL330_QUIRK_BROKEN_NO_FLUSHP)
cond = BURST;
else
- cond = (pxs->desc->rqcfg.brst_len == 1) ? SINGLE : BURST;
-
+ cond = SINGLE;
while (cyc--) {
off += _emit_WFP(dry_run, &buf[off], cond, pxs->desc->peri);
@@ -2598,7 +2597,7 @@ static struct dma_async_tx_descriptor *pl330_prep_dma_cyclic(
desc->rqtype = direction;
desc->rqcfg.brst_size = pch->burst_sz;
- desc->rqcfg.brst_len = pch->burst_len;
+ desc->rqcfg.brst_len = 1;
desc->bytes_requested = period_len;
fill_px(&desc->px, dst, src, period_len);
@@ -2743,7 +2742,7 @@ pl330_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
}
desc->rqcfg.brst_size = pch->burst_sz;
- desc->rqcfg.brst_len = pch->burst_len;
+ desc->rqcfg.brst_len = 1;
desc->rqtype = direction;
desc->bytes_requested = sg_dma_len(sg);
}
--
1.9.1
next reply other threads:[~2016-02-24 3:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 3:52 Caesar Wang [this message]
2016-02-24 17:09 ` Dinh Nguyen
2016-02-24 17:09 ` Dinh Nguyen
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=1456285945-19258-1-git-send-email-wxt@rock-chips.com \
--to=wxt@rock-chips.com \
--cc=al.kochet@gmail.com \
--cc=boojin.kim@samsung.com \
--cc=dan.j.williams@intel.com \
--cc=dianders@chromium.org \
--cc=dinguyen@opensource.altera.com \
--cc=dmaengine@vger.kernel.org \
--cc=heiko@sntech.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=shawn.lin@rock-chips.com \
--cc=sonnyrao@chromium.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
all inboxes | Powered by JetHome®