2013-04-18 19:44:31

by Christian Eggers

Subject: spi: spi-davinci: Fix direction in dma_map_single()

Commit 048177ce3b3962852fd34a7e04938959271c7e70 (spi: spi-davinci:
convert to DMA engine API) introduced a regression: dma_map_single()
is called with direction DMA_FROM_DEVICE for rx and for tx.

Signed-off-by: Christian Eggers <[email protected]>
Cc: [email protected]
---
--- drivers/spi/spi-davinci.c.orig 2013-04-18 20:54:02.728719412 +0200
+++ drivers/spi/spi-davinci.c 2013-04-18 20:54:51.900623956 +0200
@@ -608,7 +608,7 @@ static int davinci_spi_bufs(struct spi_d
else
buf = (void *)t->tx_buf;
t->tx_dma = dma_map_single(&spi->dev, buf,
- t->len, DMA_FROM_DEVICE);
+ t->len, DMA_TO_DEVICE);
if (!t->tx_dma) {
ret = -EFAULT;
goto err_tx_map;

2013-04-18 19:49:15

by Matt Porter

Subject: Re: spi: spi-davinci: Fix direction in dma_map_single()

On 04/18/2013 03:31 PM, Christian Eggers wrote:
> Commit 048177ce3b3962852fd34a7e04938959271c7e70 (spi: spi-davinci:
>
> convert to DMA engine API) introduced a regression: dma_map_single()
>
> is called with direction DMA_FROM_DEVICE for rx and for tx.
>
> Signed-off-by: Christian Eggers <[email protected]>
>
> Cc: [email protected]

Cc: [email protected] # v3.7.x+
will get this applied to the correct stable kernels.

I'm wearing the brown bag for this one so other than fixing the Cc: it
looks good.

Acked-by: Matt Porter <[email protected]>

> --- drivers/spi/spi-davinci.c.orig 2013-04-18 20:54:02.728719412 +0200
>
> +++ drivers/spi/spi-davinci.c 2013-04-18 20:54:51.900623956 +0200
>
> @@ -608,7 +608,7 @@ static int davinci_spi_bufs(struct spi_d
>
> else
>
> buf = (void *)t->tx_buf;
>
> t->tx_dma = dma_map_single(&spi->dev, buf,
>
> - t->len, DMA_FROM_DEVICE);
>
> + t->len, DMA_TO_DEVICE);
>
> if (!t->tx_dma) {
>
> ret = -EFAULT;
>
> goto err_tx_map;
>