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 v4 10/14] spi: qup: call io_config in mode specific function
Date: Tue, 27 Jun 2017 15:15:27 +0530 [thread overview]
Message-ID: <1498556731-13087-11-git-send-email-varada@codeaurora.org> (raw)
In-Reply-To: <1498556731-13087-1-git-send-email-varada@codeaurora.org>
DMA transactions should only only need to call io_config only once, but
block mode might call it several times to setup several transactions so
it can handle reads/writes larger than the max size per transaction, so
we move the call to the do_ functions.
This is just refactoring, there should be no functional change
Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org>
Signed-off-by: Varadarajan Narayanan <varada@codeaurora.org>
---
drivers/spi/spi-qup.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c
index bfb6d27..37b51e3 100644
--- a/drivers/spi/spi-qup.c
+++ b/drivers/spi/spi-qup.c
@@ -158,6 +158,8 @@ struct spi_qup {
struct dma_slave_config tx_conf;
};
+static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer);
+
static inline bool spi_qup_is_flag_set(struct spi_qup *controller, u32 flag)
{
u32 opflag = readl_relaxed(controller->base + QUP_OPERATIONAL);
@@ -416,12 +418,17 @@ static void spi_qup_dma_terminate(struct spi_master *master,
dmaengine_terminate_all(master->dma_rx);
}
-static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer,
+static int spi_qup_do_dma(struct spi_device *spi, struct spi_transfer *xfer,
unsigned long timeout)
{
+ struct spi_master *master = spi->master;
struct spi_qup *qup = spi_master_get_devdata(master);
int ret;
+ ret = spi_qup_io_config(spi, xfer);
+ if (ret)
+ return ret;
+
/* before issuing the descriptors, set the QUP to run */
ret = spi_qup_set_state(qup, QUP_STATE_RUN);
if (ret) {
@@ -457,12 +464,17 @@ static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer,
return 0;
}
-static int spi_qup_do_pio(struct spi_master *master, struct spi_transfer *xfer,
+static int spi_qup_do_pio(struct spi_device *spi, struct spi_transfer *xfer,
unsigned long timeout)
{
+ struct spi_master *master = spi->master;
struct spi_qup *qup = spi_master_get_devdata(master);
int ret;
+ ret = spi_qup_io_config(spi, xfer);
+ if (ret)
+ return ret;
+
ret = spi_qup_set_state(qup, QUP_STATE_RUN);
if (ret) {
dev_warn(qup->dev, "cannot set RUN state\n");
@@ -743,18 +755,14 @@ static int spi_qup_transfer_one(struct spi_master *master,
if (ret)
return ret;
- ret = spi_qup_io_config(spi, xfer);
- if (ret)
- return ret;
-
timeout = DIV_ROUND_UP(xfer->speed_hz, MSEC_PER_SEC);
timeout = DIV_ROUND_UP(xfer->len * 8, timeout);
timeout = 100 * msecs_to_jiffies(timeout);
if (spi_qup_is_dma_xfer(controller->mode))
- ret = spi_qup_do_dma(master, xfer, timeout);
+ ret = spi_qup_do_dma(spi, xfer, timeout);
else
- ret = spi_qup_do_pio(master, xfer, timeout);
+ ret = spi_qup_do_pio(spi, xfer, timeout);
if (ret)
goto exit;
--
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-27 9:45 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-27 9:45 [PATCH v4 00/14] spi: qup: Fixes and add support for >64k transfers Varadarajan Narayanan
2017-06-27 9:45 ` [PATCH v4 01/14] spi: qup: Enable chip select support Varadarajan Narayanan
2017-07-17 16:01 ` Mark Brown
[not found] ` <20170717160151.teozg2ni4mqxotbd-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2017-07-20 5:30 ` Varadarajan Narayanan
[not found] ` <1498556731-13087-2-git-send-email-varada-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2017-07-20 7:03 ` Geert Uytterhoeven
[not found] ` <1498556731-13087-1-git-send-email-varada-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>
2017-06-27 9:45 ` [PATCH v4 02/14] spi: qup: Setup DMA mode correctly Varadarajan Narayanan
2017-06-27 9:45 ` [PATCH v4 03/14] spi: qup: Add completion structures for DMA Varadarajan Narayanan
2017-07-17 16:02 ` Mark Brown
2017-06-27 9:45 ` [PATCH v4 04/14] spi: qup: Add completion timeout Varadarajan Narayanan
2017-06-27 9:45 ` [PATCH v4 06/14] spi: qup: Fix error handling in spi_qup_prep_sg Varadarajan Narayanan
2017-06-27 9:45 ` [PATCH v4 05/14] spi: qup: Place the QUP in run mode before DMA Varadarajan Narayanan
2017-06-27 9:45 ` [PATCH v4 07/14] spi: qup: Fix transaction done signaling Varadarajan Narayanan
2017-06-27 9:45 ` [PATCH v4 08/14] spi: qup: Do block sized read/write in block mode Varadarajan Narayanan
2017-06-27 9:45 ` [PATCH v4 09/14] spi: qup: refactor spi_qup_io_config into two functions Varadarajan Narayanan
2017-06-27 9:45 ` Varadarajan Narayanan [this message]
2017-06-27 9:45 ` [PATCH v4 11/14] spi: qup: allow block mode to generate multiple transactions Varadarajan Narayanan
2017-06-27 9:45 ` [PATCH v4 12/14] spi: qup: refactor spi_qup_prep_sg Varadarajan Narayanan
2017-06-27 9:45 ` [PATCH v4 13/14] spi: qup: allow multiple DMA transactions per spi xfer Varadarajan Narayanan
2017-06-27 9:45 ` [PATCH v4 14/14] spi: qup: Ensure done detection 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=1498556731-13087-11-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).