UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

spi: rspi: Pass sg_tables instead of spi_tranfer to rspi_*_dma() 

The DMA routines only need access to the scatter-gather tables inside the
spi_transfer structures, hence just pass those.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Geert Uytterhoeven 2014-06-02 15:38:14 +02:00 committed by Mark Brown
parent 8393fa787b
commit e4b52dc462
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/spi/spi-rspi.c
View File

@ -463,13 +463,13 @@ static void rspi_dma_complete(void *arg)
wake_up_interruptible(&rspi->wait); wake_up_interruptible(&rspi->wait);
} }
static int rspi_send_dma(struct rspi_data *rspi, struct spi_transfer *t) static int rspi_send_dma(struct rspi_data *rspi, struct sg_table *tx)
{ {
struct dma_async_tx_descriptor *desc; struct dma_async_tx_descriptor *desc;
int ret; int ret;
desc = dmaengine_prep_slave_sg(rspi->master->dma_tx, t->tx_sg.sgl, desc = dmaengine_prep_slave_sg(rspi->master->dma_tx, tx->sgl,
t->tx_sg.nents, DMA_TO_DEVICE, tx->nents, DMA_TO_DEVICE,
DMA_PREP_INTERRUPT | DMA_CTRL_ACK); DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
if (!desc) if (!desc)
return -EIO; return -EIO;
@ -530,21 +530,22 @@ static void qspi_receive_init(const struct rspi_data *rspi)
rspi_write8(rspi, 0, QSPI_SPBFCR); rspi_write8(rspi, 0, QSPI_SPBFCR);
} }
static int rspi_send_receive_dma(struct rspi_data *rspi, struct spi_transfer *t) static int rspi_send_receive_dma(struct rspi_data *rspi, struct sg_table *tx,
struct sg_table *rx)
{ {
struct dma_async_tx_descriptor *desc_tx, *desc_rx; struct dma_async_tx_descriptor *desc_tx, *desc_rx;
int ret; int ret;
/* prepare transmit transfer */ /* prepare transmit transfer */
desc_tx = dmaengine_prep_slave_sg(rspi->master->dma_tx, t->tx_sg.sgl, desc_tx = dmaengine_prep_slave_sg(rspi->master->dma_tx, tx->sgl,
t->tx_sg.nents, DMA_TO_DEVICE, tx->nents, DMA_TO_DEVICE,
DMA_PREP_INTERRUPT | DMA_CTRL_ACK); DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
if (!desc_tx) if (!desc_tx)
return -EIO; return -EIO;
/* prepare receive transfer */ /* prepare receive transfer */
desc_rx = dmaengine_prep_slave_sg(rspi->master->dma_rx, t->rx_sg.sgl, desc_rx = dmaengine_prep_slave_sg(rspi->master->dma_rx, rx->sgl,
t->rx_sg.nents, DMA_FROM_DEVICE, rx->nents, DMA_FROM_DEVICE,
DMA_PREP_INTERRUPT | DMA_CTRL_ACK); DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
if (!desc_rx) if (!desc_rx)
return -EIO; return -EIO;
@ -616,9 +617,10 @@ static int rspi_transfer_one(struct spi_master *master, struct spi_device *spi,
if (master->can_dma && __rspi_can_dma(rspi, xfer)) { if (master->can_dma && __rspi_can_dma(rspi, xfer)) {
if (xfer->rx_buf) if (xfer->rx_buf)
return rspi_send_receive_dma(rspi, xfer); return rspi_send_receive_dma(rspi, &xfer->tx_sg,
&xfer->rx_sg);
else else
return rspi_send_dma(rspi, xfer); return rspi_send_dma(rspi, &xfer->tx_sg);
} }
ret = rspi_pio_transfer(rspi, xfer->tx_buf, xfer->rx_buf, xfer->len); ret = rspi_pio_transfer(rspi, xfer->tx_buf, xfer->rx_buf, xfer->len);