From: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> To: Frode Isaksen <fisaksen-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> Cc: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, nsekhar-l0cyMroinI0@public.gmane.org, khilman-rdvid1DuHRBWk0Htik3J/w@public.gmane.org, ptitiano-rdvid1DuHRBWk0Htik3J/w@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: Applied "spi: davinci: do not use DMA if transfer length is less than 16" to the spi tree Date: Wed, 15 Mar 2017 19:37:16 +0000 [thread overview] Message-ID: <E1coEjU-0004gr-QX@debutante> (raw) In-Reply-To: <1487872921-26628-5-git-send-email-fisaksen-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> The patch spi: davinci: do not use DMA if transfer length is less than 16 has been applied to the spi tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 0718b764880434ac7a5b7c0f5cb2c805c589a807 Mon Sep 17 00:00:00 2001 From: Frode Isaksen <fisaksen-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> Date: Thu, 23 Feb 2017 19:01:59 +0100 Subject: [PATCH] spi: davinci: do not use DMA if transfer length is less than 16 Higher bitrate and lower CPU load if using PIO in this case. Signed-off-by: Frode Isaksen <fisaksen-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> Signed-off-by: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> --- drivers/spi/spi-davinci.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index ca122165a3c6..75c658e4e487 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c @@ -109,6 +109,8 @@ #define SPIDEF 0x4c #define SPIFMT0 0x50 +#define DMA_MIN_BYTES 16 + /* SPI Controller driver's private data. */ struct davinci_spi { struct spi_bitbang bitbang; @@ -479,7 +481,8 @@ static bool davinci_spi_can_dma(struct spi_master *master, bool can_dma = false; if (spicfg) - can_dma = spicfg->io_type == SPI_IO_TYPE_DMA; + can_dma = (spicfg->io_type == SPI_IO_TYPE_DMA) && + (xfer->len >= DMA_MIN_BYTES); return can_dma; } @@ -620,10 +623,9 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t) reinit_completion(&dspi->done); - if (spicfg->io_type == SPI_IO_TYPE_INTR) - set_io_bits(dspi->base + SPIINT, SPIINT_MASKINT); - - if (spicfg->io_type != SPI_IO_TYPE_DMA) { + if (!davinci_spi_can_dma(spi->master, spi, t)) { + if (spicfg->io_type != SPI_IO_TYPE_POLL) + set_io_bits(dspi->base + SPIINT, SPIINT_MASKINT); /* start the transfer */ dspi->wcount--; tx_data = dspi->get_tx(dspi); @@ -698,7 +700,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t) } clear_io_bits(dspi->base + SPIINT, SPIINT_MASKALL); - if (spicfg->io_type == SPI_IO_TYPE_DMA) + if (davinci_spi_can_dma(spi->master, spi, t)) clear_io_bits(dspi->base + SPIINT, SPIINT_DMA_REQ_EN); clear_io_bits(dspi->base + SPIGCR1, SPIGCR1_SPIENA_MASK); -- 2.11.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: broonie@kernel.org (Mark Brown) To: linux-arm-kernel@lists.infradead.org Subject: Applied "spi: davinci: do not use DMA if transfer length is less than 16" to the spi tree Date: Wed, 15 Mar 2017 19:37:16 +0000 [thread overview] Message-ID: <E1coEjU-0004gr-QX@debutante> (raw) In-Reply-To: <1487872921-26628-5-git-send-email-fisaksen@baylibre.com> The patch spi: davinci: do not use DMA if transfer length is less than 16 has been applied to the spi tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 0718b764880434ac7a5b7c0f5cb2c805c589a807 Mon Sep 17 00:00:00 2001 From: Frode Isaksen <fisaksen@baylibre.com> Date: Thu, 23 Feb 2017 19:01:59 +0100 Subject: [PATCH] spi: davinci: do not use DMA if transfer length is less than 16 Higher bitrate and lower CPU load if using PIO in this case. Signed-off-by: Frode Isaksen <fisaksen@baylibre.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/spi/spi-davinci.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c index ca122165a3c6..75c658e4e487 100644 --- a/drivers/spi/spi-davinci.c +++ b/drivers/spi/spi-davinci.c @@ -109,6 +109,8 @@ #define SPIDEF 0x4c #define SPIFMT0 0x50 +#define DMA_MIN_BYTES 16 + /* SPI Controller driver's private data. */ struct davinci_spi { struct spi_bitbang bitbang; @@ -479,7 +481,8 @@ static bool davinci_spi_can_dma(struct spi_master *master, bool can_dma = false; if (spicfg) - can_dma = spicfg->io_type == SPI_IO_TYPE_DMA; + can_dma = (spicfg->io_type == SPI_IO_TYPE_DMA) && + (xfer->len >= DMA_MIN_BYTES); return can_dma; } @@ -620,10 +623,9 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t) reinit_completion(&dspi->done); - if (spicfg->io_type == SPI_IO_TYPE_INTR) - set_io_bits(dspi->base + SPIINT, SPIINT_MASKINT); - - if (spicfg->io_type != SPI_IO_TYPE_DMA) { + if (!davinci_spi_can_dma(spi->master, spi, t)) { + if (spicfg->io_type != SPI_IO_TYPE_POLL) + set_io_bits(dspi->base + SPIINT, SPIINT_MASKINT); /* start the transfer */ dspi->wcount--; tx_data = dspi->get_tx(dspi); @@ -698,7 +700,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t) } clear_io_bits(dspi->base + SPIINT, SPIINT_MASKALL); - if (spicfg->io_type == SPI_IO_TYPE_DMA) + if (davinci_spi_can_dma(spi->master, spi, t)) clear_io_bits(dspi->base + SPIINT, SPIINT_DMA_REQ_EN); clear_io_bits(dspi->base + SPIGCR1, SPIGCR1_SPIENA_MASK); -- 2.11.0
next prev parent reply other threads:[~2017-03-15 19:37 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-02-23 18:01 [PATCH v3 0/6] Enable DMA for daVinci SPI controller Frode Isaksen 2017-02-23 18:01 ` Frode Isaksen [not found] ` <1487872921-26628-1-git-send-email-fisaksen-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> 2017-02-23 18:01 ` [PATCH v3 1/6] spi: davinci: Use SPI framework to handle DMA mapping Frode Isaksen 2017-02-23 18:01 ` Frode Isaksen 2017-03-07 14:22 ` Applied "spi: davinci: Use SPI framework to handle DMA mapping" to the spi tree Mark Brown 2017-03-07 14:22 ` Mark Brown 2017-02-23 18:01 ` [PATCH v3 2/6] spi: davinci: enable DMA when channels are defined in DT Frode Isaksen 2017-02-23 18:01 ` Frode Isaksen 2017-02-23 18:01 ` [PATCH v3 3/6] spi: davinci: use rx buffer as dummy tx buffer Frode Isaksen 2017-02-23 18:01 ` Frode Isaksen [not found] ` <1487872921-26628-4-git-send-email-fisaksen-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> 2017-03-15 19:35 ` Mark Brown 2017-03-15 19:35 ` Mark Brown 2017-02-23 18:01 ` [PATCH v3 4/6] spi: davinci: do not use DMA if transfer length is less than 16 Frode Isaksen 2017-02-23 18:01 ` Frode Isaksen [not found] ` <1487872921-26628-5-git-send-email-fisaksen-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> 2017-03-15 19:37 ` Mark Brown [this message] 2017-03-15 19:37 ` Applied "spi: davinci: do not use DMA if transfer length is less than 16" to the spi tree Mark Brown 2017-02-23 18:02 ` [PATCH v3 5/6] spi: davinci: do not use DMA for vmalloc'ed buffers Frode Isaksen 2017-02-23 18:02 ` Frode Isaksen [not found] ` <1487872921-26628-6-git-send-email-fisaksen-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> 2017-03-15 19:37 ` Applied "spi: davinci: do not use DMA for vmalloc'ed buffers" to the spi tree Mark Brown 2017-03-15 19:37 ` Mark Brown 2017-02-23 18:02 ` [PATCH v3 6/6] spi: loopback-test: add option to use vmalloc'ed buffers Frode Isaksen 2017-02-23 18:02 ` Frode Isaksen [not found] ` <1487872921-26628-7-git-send-email-fisaksen-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> 2017-03-16 14:11 ` Applied "spi: loopback-test: add option to use vmalloc'ed buffers" to the spi tree Mark Brown 2017-03-16 14:11 ` 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=E1coEjU-0004gr-QX@debutante \ --to=broonie-dgejt+ai2ygdnm+yrofe0a@public.gmane.org \ --cc=fisaksen-rdvid1DuHRBWk0Htik3J/w@public.gmane.org \ --cc=khilman-rdvid1DuHRBWk0Htik3J/w@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=nsekhar-l0cyMroinI0@public.gmane.org \ --cc=ptitiano-rdvid1DuHRBWk0Htik3J/w@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.