From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Vinod Koul <vinod.koul@intel.com>,
linux-kernel@vger.kernel.org,
Viresh Kumar <viresh.kumar@linaro.org>,
spear-devel <spear-devel@list.st.com>
Subject: [PATCHv2 09/11] dw_dmac: make usage of dw_dma_slave optional
Date: Thu, 10 Jan 2013 10:53:04 +0200 [thread overview]
Message-ID: <1357807986-4026-10-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1357807986-4026-1-git-send-email-andriy.shevchenko@linux.intel.com>
The driver requires a custom slave configuration to be present to be able to
make the slave transfers. Nevertheless, in some cases we need only the request
line as an additional information to the generic slave configuration. The
request line is provided by slave_id parameter of the dma_slave_config
structure. That's why the custom slave configuration could be optional for such
cases.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
---
drivers/dma/dw_dmac.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
index a2c5a60..c87d8ab 100644
--- a/drivers/dma/dw_dmac.c
+++ b/drivers/dma/dw_dmac.c
@@ -50,11 +50,12 @@ static inline unsigned int dwc_get_sms(struct dw_dma_slave *slave)
struct dw_dma_slave *__slave = (_chan->private); \
struct dw_dma_chan *_dwc = to_dw_dma_chan(_chan); \
struct dma_slave_config *_sconfig = &_dwc->dma_sconfig; \
+ bool _is_slave = is_slave_xfer(_dwc->direction); \
int _dms = dwc_get_dms(__slave); \
int _sms = dwc_get_sms(__slave); \
- u8 _smsize = __slave ? _sconfig->src_maxburst : \
+ u8 _smsize = _is_slave ? _sconfig->src_maxburst : \
DW_DMA_MSIZE_16; \
- u8 _dmsize = __slave ? _sconfig->dst_maxburst : \
+ u8 _dmsize = _is_slave ? _sconfig->dst_maxburst : \
DW_DMA_MSIZE_16; \
\
(DWC_CTLL_DST_MSIZE(_dmsize) \
@@ -328,7 +329,7 @@ dwc_descriptor_complete(struct dw_dma_chan *dwc, struct dw_desc *desc,
list_splice_init(&desc->tx_list, &dwc->free_list);
list_move(&desc->desc_node, &dwc->free_list);
- if (!dwc->chan.private) {
+ if (!is_slave_xfer(dwc->direction)) {
struct device *parent = chan2parent(&dwc->chan);
if (!(txd->flags & DMA_COMPL_SKIP_DEST_UNMAP)) {
if (txd->flags & DMA_COMPL_DEST_UNMAP_SINGLE)
@@ -804,7 +805,7 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
dev_vdbg(chan2dev(chan), "%s\n", __func__);
- if (unlikely(!dws || !sg_len))
+ if (unlikely(!is_slave_xfer(direction) || !sg_len))
return NULL;
dwc->direction = direction;
@@ -980,8 +981,8 @@ set_runtime_config(struct dma_chan *chan, struct dma_slave_config *sconfig)
{
struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
- /* Check if it is chan is configured for slave transfers */
- if (!chan->private)
+ /* Check if chan will be configured for slave transfers */
+ if (!is_slave_xfer(sconfig->direction))
return -EINVAL;
memcpy(&dwc->dma_sconfig, sconfig, sizeof(*sconfig));
--
1.7.10.4
next prev parent reply other threads:[~2013-01-10 8:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-10 8:52 [PATCHv2 00/11] patches against slave dma subsystem Andy Shevchenko
2013-01-10 8:52 ` [PATCHv2 01/11] dmaengine: introduce is_slave_direction function Andy Shevchenko
2013-01-10 8:52 ` [PATCHv2 02/11] dma: at_hdmac: check direction properly for cyclic transfers Andy Shevchenko
2013-01-10 8:52 ` [PATCHv2 03/11] dma: dw_dmac: check direction properly in dw_dma_cyclic_prep Andy Shevchenko
2013-01-10 8:52 ` [PATCHv2 04/11] dma: ep93xx_dma: reuse is_slave_direction helper Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 05/11] dma: ipu_idmac: " Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 06/11] dma: ste_dma40: " Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 07/11] dw_dmac: call .probe after we have a device in place Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 08/11] dw_dmac: store direction in the custom channel structure Andy Shevchenko
2013-01-10 8:53 ` Andy Shevchenko [this message]
2013-01-10 9:08 ` [PATCHv2 09/11] dw_dmac: make usage of dw_dma_slave optional Andy Shevchenko
2013-01-10 9:11 ` [PATCHv2.1] " Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 10/11] dw_dmac: backlink to dw_dma in dw_dma_chan is superfluous Andy Shevchenko
2013-01-10 8:53 ` [PATCHv2 11/11] dma: dw_dmac: clear suspend bit during termination Andy Shevchenko
2013-01-12 13:09 ` [PATCHv2 00/11] patches against slave dma subsystem 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=1357807986-4026-10-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=spear-devel@list.st.com \
--cc=vinod.koul@intel.com \
--cc=viresh.kumar@linaro.org \
/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;
as well as URLs for NNTP newsgroup(s).