From: Varadarajan Narayanan <varada@codeaurora.org>
To: broonie@kernel.org, robh+dt@kernel.org, mark.rutland@arm.com,
andy.gross@linaro.org, david.brown@linaro.org,
linux-spi@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-soc@vger.kernel.org
Cc: Varadarajan Narayanan <varada@codeaurora.org>,
Matthew McClintock <mmcclint@codeaurora.org>
Subject: [PATCH 12/15] spi: qup: refactor spi_qup_prep_sg
Date: Fri, 16 Jun 2017 14:28:55 +0530 [thread overview]
Message-ID: <1497603538-12750-13-git-send-email-varada@codeaurora.org> (raw)
In-Reply-To: <1497603538-12750-1-git-send-email-varada@codeaurora.org>
Take specific sgl and nent to be prepared. This is in
preparation for splitting DMA into multiple transacations, this
contains no code changes just refactoring.
Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org>
Signed-off-by: Varadarajan Narayanan <varada@codeaurora.org>
---
drivers/spi/spi-qup.c | 25 ++++++++++---------------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index e6a43df..adf16e4 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -382,26 +382,19 @@ static void spi_qup_write(struct spi_qup *controller)
} while (remainder);
}
-static int spi_qup_prep_sg(struct spi_master *master, struct spi_transfer *xfer,
- enum dma_transfer_direction dir,
+static int spi_qup_prep_sg(struct spi_master *master, struct scatterlist *sgl,
+ unsigned int nents, enum dma_transfer_direction dir,
dma_async_tx_callback callback, void *data)
{
unsigned long flags = DMA_PREP_INTERRUPT | DMA_PREP_FENCE;
struct dma_async_tx_descriptor *desc;
- struct scatterlist *sgl;
struct dma_chan *chan;
dma_cookie_t cookie;
- unsigned int nents;
- if (dir == DMA_MEM_TO_DEV) {
+ if (dir == DMA_MEM_TO_DEV)
chan = master->dma_tx;
- nents = xfer->tx_sg.nents;
- sgl = xfer->tx_sg.sgl;
- } else {
+ else
chan = master->dma_rx;
- nents = xfer->rx_sg.nents;
- sgl = xfer->rx_sg.sgl;
- }
desc = dmaengine_prep_slave_sg(chan, sgl, nents, dir, flags);
if (IS_ERR_OR_NULL(desc))
@@ -444,8 +437,9 @@ static int spi_qup_do_dma(struct spi_device *spi, struct spi_transfer *xfer,
}
if (xfer->rx_buf) {
- ret = spi_qup_prep_sg(master, xfer, DMA_DEV_TO_MEM,
- spi_qup_dma_done, &qup->rxc);
+ ret = spi_qup_prep_sg(master, xfer->rx_sg.sgl,
+ xfer->rx_sg.nents, DMA_DEV_TO_MEM,
+ spi_qup_dma_done, &qup->rxc);
if (ret)
return ret;
@@ -453,8 +447,9 @@ static int spi_qup_do_dma(struct spi_device *spi, struct spi_transfer *xfer,
}
if (xfer->tx_buf) {
- ret = spi_qup_prep_sg(master, xfer, DMA_MEM_TO_DEV,
- spi_qup_dma_done, &qup->txc);
+ ret = spi_qup_prep_sg(master, xfer->tx_sg.sgl,
+ xfer->tx_sg.nents, DMA_MEM_TO_DEV,
+ spi_qup_dma_done, &qup->txc);
if (ret)
return ret;
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2017-06-16 9:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-16 8:58 [PATCH 00/15] spi: qup: Fixes and add support for >64k transfers Varadarajan Narayanan
2017-06-16 8:58 ` [PATCH 01/15] spi: qup: Enable chip select support Varadarajan Narayanan
2017-06-16 8:58 ` [PATCH 02/15] spi: qup: Setup DMA mode correctly Varadarajan Narayanan
2017-06-16 8:58 ` [PATCH 03/15] spi: qup: Add completion timeout for dma mode Varadarajan Narayanan
2017-06-18 2:17 ` kbuild test robot
2017-06-16 8:58 ` [PATCH 04/15] spi: qup: Add completion timeout for fifo/block mode Varadarajan Narayanan
2017-06-16 8:58 ` [PATCH 05/15] spi: qup: Place the QUP in run mode before DMA transactions Varadarajan Narayanan
2017-06-16 8:58 ` [PATCH 06/15] spi: qup: Fix error handling in spi_qup_prep_sg Varadarajan Narayanan
2017-06-16 8:58 ` [PATCH 07/15] spi: qup: Fix transaction done signaling Varadarajan Narayanan
2017-06-18 2:11 ` kbuild test robot
2017-06-16 8:58 ` [PATCH 08/15] spi: qup: Do block sized read/write in block mode Varadarajan Narayanan
2017-06-16 8:58 ` [PATCH 09/15] spi: qup: refactor spi_qup_io_config into two functions Varadarajan Narayanan
2017-06-16 8:58 ` [PATCH 10/15] spi: qup: call io_config in mode specific function Varadarajan Narayanan
2017-06-16 8:58 ` [PATCH 11/15] spi: qup: allow block mode to generate multiple transactions Varadarajan Narayanan
2017-06-16 8:58 ` Varadarajan Narayanan [this message]
2017-06-16 8:58 ` [PATCH 13/15] spi: qup: allow multiple DMA transactions per spi xfer Varadarajan Narayanan
2017-06-16 8:58 ` [PATCH 14/15] spi: qup: Ensure done detection Varadarajan Narayanan
2017-08-08 11:17 ` Applied "spi: qup: Ensure done detection" to the spi tree Mark Brown
2017-06-16 8:58 ` [PATCH 15/15] spi: qup: support for qup v1 dma Varadarajan Narayanan
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=1497603538-12750-13-git-send-email-varada@codeaurora.org \
--to=varada@codeaurora.org \
--cc=andy.gross@linaro.org \
--cc=broonie@kernel.org \
--cc=david.brown@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-soc@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mmcclint@codeaurora.org \
--cc=robh+dt@kernel.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).