From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Vinod Koul <vinod.koul@intel.com>,
spear-devel <spear-devel@list.st.com>,
linux-kernel@vger.kernel.org,
Viresh Kumar <viresh.kumar@linaro.org>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Nicolas Ferre <nicolas.ferre@atmel.com>
Subject: [PATCH 2/6] dma: at_hdmac: check direction properly for cyclic transfers
Date: Fri, 16 Nov 2012 15:59:15 +0200 [thread overview]
Message-ID: <1353074360-1903-3-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1353074360-1903-1-git-send-email-andriy.shevchenko@linux.intel.com>
dma_transfer_direction is a normal enum. It means we can't usually use the
values as bit fields. Let's adjust this check and move it above the usage of
the direction parameter.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
---
drivers/dma/at_hdmac.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
index 13a02f4..997ae54 100644
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
@@ -778,7 +778,7 @@ err:
*/
static int
atc_dma_cyclic_check_values(unsigned int reg_width, dma_addr_t buf_addr,
- size_t period_len, enum dma_transfer_direction direction)
+ size_t period_len)
{
if (period_len > (ATC_BTSIZE_MAX << reg_width))
goto err_out;
@@ -786,8 +786,6 @@ atc_dma_cyclic_check_values(unsigned int reg_width, dma_addr_t buf_addr,
goto err_out;
if (unlikely(buf_addr & ((1 << reg_width) - 1)))
goto err_out;
- if (unlikely(!(direction & (DMA_DEV_TO_MEM | DMA_MEM_TO_DEV))))
- goto err_out;
return 0;
@@ -886,14 +884,16 @@ atc_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
return NULL;
}
+ if (unlikely(!is_slave_xfer(direction)))
+ goto err_out;
+
if (sconfig->direction == DMA_MEM_TO_DEV)
reg_width = convert_buswidth(sconfig->dst_addr_width);
else
reg_width = convert_buswidth(sconfig->src_addr_width);
/* Check for too big/unaligned periods and unaligned DMA buffer */
- if (atc_dma_cyclic_check_values(reg_width, buf_addr,
- period_len, direction))
+ if (atc_dma_cyclic_check_values(reg_width, buf_addr, period_len))
goto err_out;
/* build cyclic linked list */
--
1.7.10.4
next prev parent reply other threads:[~2012-11-16 14:01 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-16 13:59 [PATCH 0/6] dmaengine: introduce is_slave_xfer helper Andy Shevchenko
2012-11-16 13:59 ` [PATCH 1/6] dmaengine: introduce is_slave_xfer function Andy Shevchenko
2012-11-16 14:03 ` Viresh Kumar
2012-11-16 15:27 ` Andy Shevchenko
2012-11-16 14:21 ` Mika Westerberg
2012-11-16 15:26 ` Andy Shevchenko
2012-11-16 15:32 ` Mika Westerberg
2012-11-16 13:59 ` Andy Shevchenko [this message]
2012-11-16 14:05 ` [PATCH 2/6] dma: at_hdmac: check direction properly for cyclic transfers Viresh Kumar
2012-11-16 15:33 ` Nicolas Ferre
2012-11-16 13:59 ` [PATCH 3/6] dma: dw_dmac: check direction properly in dw_dma_cyclic_prep Andy Shevchenko
2012-11-16 13:56 ` Felipe Balbi
2012-11-16 15:30 ` Andy Shevchenko
2012-11-16 18:09 ` Felipe Balbi
2012-11-16 14:06 ` Viresh Kumar
2012-11-16 13:59 ` [PATCH 4/6] dma: ep93xx_dma: reuse is_slave_xfer helper Andy Shevchenko
2012-11-16 14:06 ` Viresh Kumar
2012-11-16 15:33 ` Mika Westerberg
2012-11-16 13:59 ` [PATCH 5/6] dma: ipu_idmac: " Andy Shevchenko
2012-11-16 13:56 ` Felipe Balbi
2012-11-16 15:32 ` Andy Shevchenko
2012-11-16 14:07 ` Viresh Kumar
2012-11-16 13:59 ` [PATCH 6/6] dma: ste_dma40: " Andy Shevchenko
2012-11-16 14:07 ` Viresh Kumar
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=1353074360-1903-3-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--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
Powered by JetHome