From: Varadarajan Narayanan <varada-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> To: broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, mark.rutland-5wv7dgnIgG8@public.gmane.org, andy.gross-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, david.brown-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Varadarajan Narayanan <varada-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>, Matthew McClintock <mmcclint-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> Subject: [PATCH v5 09/14] spi: qup: call io_config in mode specific function Date: Mon, 24 Jul 2017 13:17:20 +0530 [thread overview] Message-ID: <1500882445-29008-10-git-send-email-varada@codeaurora.org> (raw) In-Reply-To: <1500882445-29008-1-git-send-email-varada-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.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-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> Signed-off-by: Varadarajan Narayanan <varada-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> --- drivers/spi/spi-qup.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 82593f6..b2bda47 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -156,6 +156,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); @@ -417,10 +419,12 @@ 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) { dma_async_tx_callback rx_done = NULL, tx_done = NULL; + struct spi_master *master = spi->master; + struct spi_qup *qup = spi_master_get_devdata(master); int ret; if (xfer->rx_buf) @@ -428,6 +432,10 @@ static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer, else if (xfer->tx_buf) tx_done = spi_qup_dma_done; + 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) { @@ -461,12 +469,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"); @@ -744,10 +757,6 @@ 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); @@ -762,9 +771,9 @@ static int spi_qup_transfer_one(struct spi_master *master, spin_unlock_irqrestore(&controller->lock, flags); 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 -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
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 v5 09/14] spi: qup: call io_config in mode specific function Date: Mon, 24 Jul 2017 13:17:20 +0530 [thread overview] Message-ID: <1500882445-29008-10-git-send-email-varada@codeaurora.org> (raw) In-Reply-To: <1500882445-29008-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 | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index 82593f6..b2bda47 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -156,6 +156,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); @@ -417,10 +419,12 @@ 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) { dma_async_tx_callback rx_done = NULL, tx_done = NULL; + struct spi_master *master = spi->master; + struct spi_qup *qup = spi_master_get_devdata(master); int ret; if (xfer->rx_buf) @@ -428,6 +432,10 @@ static int spi_qup_do_dma(struct spi_master *master, struct spi_transfer *xfer, else if (xfer->tx_buf) tx_done = spi_qup_dma_done; + 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) { @@ -461,12 +469,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"); @@ -744,10 +757,6 @@ 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); @@ -762,9 +771,9 @@ static int spi_qup_transfer_one(struct spi_master *master, spin_unlock_irqrestore(&controller->lock, flags); 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-07-24 7:47 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-07-24 7:47 [PATCH v5 00/14] spi: qup: Fixes and add support for >64k transfers Varadarajan Narayanan 2017-07-24 7:47 ` [PATCH v5 01/14] spi: qup: Enable chip select support Varadarajan Narayanan [not found] ` <1500882445-29008-1-git-send-email-varada-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2017-07-24 7:47 ` [PATCH v5 02/14] spi: qup: Setup DMA mode correctly Varadarajan Narayanan 2017-07-24 7:47 ` Varadarajan Narayanan 2017-07-24 7:47 ` [PATCH v5 03/14] spi: qup: Add completion timeout Varadarajan Narayanan 2017-07-24 7:47 ` Varadarajan Narayanan 2017-07-27 8:30 ` kbuild test robot 2017-07-27 8:30 ` kbuild test robot 2017-07-24 7:47 ` [PATCH v5 05/14] spi: qup: Fix error handling in spi_qup_prep_sg Varadarajan Narayanan 2017-07-24 7:47 ` Varadarajan Narayanan 2017-08-08 11:18 ` Applied "spi: qup: Fix error handling in spi_qup_prep_sg" to the spi tree Mark Brown 2017-08-08 11:18 ` Mark Brown 2017-07-24 7:47 ` [PATCH v5 07/14] spi: qup: Do block sized read/write in block mode Varadarajan Narayanan 2017-07-24 7:47 ` Varadarajan Narayanan 2017-08-08 11:18 ` Applied "spi: qup: Do block sized read/write in block mode" to the spi tree Mark Brown 2017-08-08 11:18 ` Mark Brown 2017-07-24 7:47 ` Varadarajan Narayanan [this message] 2017-07-24 7:47 ` [PATCH v5 09/14] spi: qup: call io_config in mode specific function Varadarajan Narayanan 2017-07-24 7:47 ` [PATCH v5 10/14] spi: qup: allow block mode to generate multiple transactions Varadarajan Narayanan 2017-07-24 7:47 ` Varadarajan Narayanan 2017-08-08 11:18 ` Applied "spi: qup: allow block mode to generate multiple transactions" to the spi tree Mark Brown 2017-08-08 11:18 ` Mark Brown 2017-07-24 7:47 ` [PATCH v5 11/14] spi: qup: refactor spi_qup_prep_sg Varadarajan Narayanan 2017-07-24 7:47 ` Varadarajan Narayanan 2017-08-08 11:18 ` Applied "spi: qup: refactor spi_qup_prep_sg" to the spi tree Mark Brown 2017-08-08 11:18 ` Mark Brown 2017-07-24 7:47 ` [PATCH v5 12/14] spi: qup: allow multiple DMA transactions per spi xfer Varadarajan Narayanan 2017-07-24 7:47 ` Varadarajan Narayanan 2017-07-24 7:47 ` [PATCH v5 04/14] spi: qup: Place the QUP in run mode before DMA Varadarajan Narayanan 2017-08-08 11:18 ` Applied "spi: qup: Place the QUP in run mode before DMA" to the spi tree Mark Brown 2017-08-08 11:18 ` Mark Brown 2017-07-24 7:47 ` [PATCH v5 06/14] spi: qup: Fix transaction done signaling Varadarajan Narayanan 2017-07-24 7:47 ` [PATCH v5 08/14] spi: qup: refactor spi_qup_io_config into two functions Varadarajan Narayanan 2017-08-08 11:18 ` Applied "spi: qup: refactor spi_qup_io_config into two functions" to the spi tree Mark Brown 2017-08-08 11:18 ` Mark Brown 2017-07-24 7:47 ` [PATCH v5 13/14] spi: qup: Ensure done detection Varadarajan Narayanan 2017-07-24 7:47 ` [PATCH v5 14/14] spi: qup: Fix QUP version identify method Varadarajan Narayanan [not found] ` <1500882445-29008-15-git-send-email-varada-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2017-07-25 2:52 ` kbuild test robot 2017-07-25 2:52 ` kbuild test robot 2017-07-25 2:52 ` kbuild test robot 2017-08-08 11:17 ` Applied "spi: qup: Fix QUP version identify method" to the spi tree Mark Brown 2017-08-08 11:17 ` Mark Brown 2017-08-08 11:17 ` Mark Brown
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=1500882445-29008-10-git-send-email-varada@codeaurora.org \ --to=varada-sgv2jx0feol9jmxxk+q4oq@public.gmane.org \ --cc=andy.gross-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=david.brown-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \ --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \ --cc=mmcclint-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \ --cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.