From: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> To: linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Anton Bondarenko <anton.bondarenko.sama-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> Subject: [PATCH 11/12] spi: imx: set MX51_ECSPI_CTRL_SMC bit in setup function Date: Fri, 19 Feb 2016 08:43:11 +0100 [thread overview] Message-ID: <1455867792-26389-12-git-send-email-s.hauer@pengutronix.de> (raw) In-Reply-To: <1455867792-26389-1-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> Now that the config function knows whether we are doing DMA or not we can do the necessary register setup in the config function and no longer have to do this in the trigger function. With this the trigger function becomes a no-op for DMA, so instead of testing if we are doing DMA or not in the trigger function we simply no longer call it in the DMA case. Signed-off-by: Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> --- drivers/spi/spi-imx.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index dee5e28..3512c2f 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -106,7 +106,6 @@ struct spi_imx_data { unsigned int txfifo; /* number of words pushed in tx FIFO */ /* DMA */ - unsigned int dma_finished; bool usedma; u32 wml; struct completion dma_rx_completion; @@ -324,14 +323,10 @@ static void __maybe_unused mx51_ecspi_intctrl(struct spi_imx_data *spi_imx, int static void __maybe_unused mx51_ecspi_trigger(struct spi_imx_data *spi_imx) { - u32 reg = readl(spi_imx->base + MX51_ECSPI_CTRL); + u32 reg; - if (!spi_imx->usedma) - reg |= MX51_ECSPI_CTRL_XCH; - else if (!spi_imx->dma_finished) - reg |= MX51_ECSPI_CTRL_SMC; - else - reg &= ~MX51_ECSPI_CTRL_SMC; + reg = readl(spi_imx->base + MX51_ECSPI_CTRL); + reg |= MX51_ECSPI_CTRL_XCH; writel(reg, spi_imx->base + MX51_ECSPI_CTRL); } @@ -371,6 +366,9 @@ static int __maybe_unused mx51_ecspi_config(struct spi_imx_data *spi_imx, if (config->mode & SPI_CS_HIGH) cfg |= MX51_ECSPI_CONFIG_SSBPOL(config->cs); + if (spi_imx->usedma) + ctrl |= MX51_ECSPI_CTRL_SMC; + /* CTRL register always go first to bring out controller from reset */ writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL); @@ -1010,9 +1008,6 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx, reinit_completion(&spi_imx->dma_rx_completion); reinit_completion(&spi_imx->dma_tx_completion); - /* Trigger the cspi module. */ - spi_imx->dma_finished = 0; - /* * Set these order to avoid potential RX overflow. The overflow may * happen if we enable SPI HW before starting RX DMA due to rescheduling @@ -1023,7 +1018,6 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx, */ dma_async_issue_pending(master->dma_rx); dma_async_issue_pending(master->dma_tx); - spi_imx->devtype_data->trigger(spi_imx); transfer_timeout = spi_imx_calculate_timeout(spi_imx, transfer->len); @@ -1044,9 +1038,6 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx, } } - spi_imx->dma_finished = 1; - spi_imx->devtype_data->trigger(spi_imx); - if (!timeout) ret = -ETIMEDOUT; else -- 2.7.0 -- 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: s.hauer@pengutronix.de (Sascha Hauer) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/12] spi: imx: set MX51_ECSPI_CTRL_SMC bit in setup function Date: Fri, 19 Feb 2016 08:43:11 +0100 [thread overview] Message-ID: <1455867792-26389-12-git-send-email-s.hauer@pengutronix.de> (raw) In-Reply-To: <1455867792-26389-1-git-send-email-s.hauer@pengutronix.de> Now that the config function knows whether we are doing DMA or not we can do the necessary register setup in the config function and no longer have to do this in the trigger function. With this the trigger function becomes a no-op for DMA, so instead of testing if we are doing DMA or not in the trigger function we simply no longer call it in the DMA case. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- drivers/spi/spi-imx.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index dee5e28..3512c2f 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c @@ -106,7 +106,6 @@ struct spi_imx_data { unsigned int txfifo; /* number of words pushed in tx FIFO */ /* DMA */ - unsigned int dma_finished; bool usedma; u32 wml; struct completion dma_rx_completion; @@ -324,14 +323,10 @@ static void __maybe_unused mx51_ecspi_intctrl(struct spi_imx_data *spi_imx, int static void __maybe_unused mx51_ecspi_trigger(struct spi_imx_data *spi_imx) { - u32 reg = readl(spi_imx->base + MX51_ECSPI_CTRL); + u32 reg; - if (!spi_imx->usedma) - reg |= MX51_ECSPI_CTRL_XCH; - else if (!spi_imx->dma_finished) - reg |= MX51_ECSPI_CTRL_SMC; - else - reg &= ~MX51_ECSPI_CTRL_SMC; + reg = readl(spi_imx->base + MX51_ECSPI_CTRL); + reg |= MX51_ECSPI_CTRL_XCH; writel(reg, spi_imx->base + MX51_ECSPI_CTRL); } @@ -371,6 +366,9 @@ static int __maybe_unused mx51_ecspi_config(struct spi_imx_data *spi_imx, if (config->mode & SPI_CS_HIGH) cfg |= MX51_ECSPI_CONFIG_SSBPOL(config->cs); + if (spi_imx->usedma) + ctrl |= MX51_ECSPI_CTRL_SMC; + /* CTRL register always go first to bring out controller from reset */ writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL); @@ -1010,9 +1008,6 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx, reinit_completion(&spi_imx->dma_rx_completion); reinit_completion(&spi_imx->dma_tx_completion); - /* Trigger the cspi module. */ - spi_imx->dma_finished = 0; - /* * Set these order to avoid potential RX overflow. The overflow may * happen if we enable SPI HW before starting RX DMA due to rescheduling @@ -1023,7 +1018,6 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx, */ dma_async_issue_pending(master->dma_rx); dma_async_issue_pending(master->dma_tx); - spi_imx->devtype_data->trigger(spi_imx); transfer_timeout = spi_imx_calculate_timeout(spi_imx, transfer->len); @@ -1044,9 +1038,6 @@ static int spi_imx_dma_transfer(struct spi_imx_data *spi_imx, } } - spi_imx->dma_finished = 1; - spi_imx->devtype_data->trigger(spi_imx); - if (!timeout) ret = -ETIMEDOUT; else -- 2.7.0
next prev parent reply other threads:[~2016-02-19 7:43 UTC|newest] Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-02-19 7:43 [PATCH v2] i.MX SPI DMA cleanup Sascha Hauer 2016-02-19 7:43 ` Sascha Hauer [not found] ` <1455867792-26389-1-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2016-02-19 7:43 ` [PATCH 01/12] spi: imx: allow only WML aligned transfers to use DMA Sascha Hauer 2016-02-19 7:43 ` Sascha Hauer 2016-02-19 7:43 ` [PATCH 02/12] spi: imx: use proper dev_* functions for driver messages Sascha Hauer 2016-02-19 7:43 ` Sascha Hauer 2016-02-19 7:43 ` [PATCH 03/12] spi: imx: replace fixed timeout with calculated Sascha Hauer 2016-02-19 7:43 ` Sascha Hauer 2016-02-19 7:43 ` [PATCH 04/12] spi: imx: drop fallback to PIO Sascha Hauer 2016-02-19 7:43 ` Sascha Hauer [not found] ` <1455867792-26389-5-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2016-02-19 15:51 ` Mark Brown 2016-02-19 15:51 ` Mark Brown 2016-02-19 7:43 ` [PATCH 05/12] spi: imx: initialize usedma earlier Sascha Hauer 2016-02-19 7:43 ` Sascha Hauer [not found] ` <1455867792-26389-6-git-send-email-s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2016-02-19 8:08 ` Lothar Waßmann 2016-02-19 8:08 ` Lothar Waßmann 2016-02-19 7:43 ` [PATCH 06/12] spi: imx: drop unnecessary read/modify/write Sascha Hauer 2016-02-19 7:43 ` Sascha Hauer 2016-02-19 7:43 ` [PATCH 07/12] spi: imx: drop unncessary dma_is_inited variable Sascha Hauer 2016-02-19 7:43 ` Sascha Hauer 2016-02-19 7:43 ` [PATCH 08/12] spi: imx: add support for all SPI word width for DMA Sascha Hauer 2016-02-19 7:43 ` Sascha Hauer 2016-02-19 7:43 ` [PATCH 09/12] spi: imx: remove unnecessary bit clearing in mx51_ecspi_config Sascha Hauer 2016-02-19 7:43 ` Sascha Hauer 2016-02-19 7:43 ` [PATCH 10/12] spi: imx: make some register defines simpler Sascha Hauer 2016-02-19 7:43 ` Sascha Hauer 2016-02-19 7:43 ` Sascha Hauer [this message] 2016-02-19 7:43 ` [PATCH 11/12] spi: imx: set MX51_ECSPI_CTRL_SMC bit in setup function Sascha Hauer 2016-02-19 7:43 ` [PATCH 12/12] spi: imx: drop bogus tests for rx/tx bufs in DMA transfer Sascha Hauer 2016-02-19 7:43 ` Sascha Hauer
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=1455867792-26389-12-git-send-email-s.hauer@pengutronix.de \ --to=s.hauer-bicnvbalz9megne8c9+irq@public.gmane.org \ --cc=anton.bondarenko.sama-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@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.