Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1594270 > unrolled thread

Applied "spi: davinci: enable DMA when channels are defined in DT" to the spi tree

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Applied "spi: davinci: enable DMA when channels are defined in DT" to the spi tree Mark Brown <broonie@kernel.org> - 2017-03-07 15:30 +0100
    Re: Applied "spi: davinci: enable DMA when channels are defined in  DT" to the spi tree Frode Isaksen <fisaksen@baylibre.com> - 2017-03-08 11:40 +0100
      Re: Applied "spi: davinci: enable DMA when channels are defined in  DT" to the spi tree Mark Brown <broonie@kernel.org> - 2017-03-08 14:20 +0100
        Re: Applied "spi: davinci: enable DMA when channels are defined in  DT" to the spi tree Frode Isaksen <fisaksen@baylibre.com> - 2017-03-10 11:30 +0100
          Re: Applied "spi: davinci: enable DMA when channels are defined in  DT" to the spi tree Mark Brown <broonie@kernel.org> - 2017-03-13 18:10 +0100

#1594270 — Applied "spi: davinci: enable DMA when channels are defined in DT" to the spi tree

The patch

   spi: davinci: enable DMA when channels are defined in DT

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 3e2e1258443ea97e40dfb4a3cf15108d17939066 Mon Sep 17 00:00:00 2001
From: Fabien Parent <fparent@baylibre.com>
Date: Thu, 23 Feb 2017 19:01:57 +0100
Subject: [PATCH] spi: davinci: enable DMA when channels are defined in DT

When booting with DT the SPI driver is always using
the SPI_IO_TYPE_INTR mode to transfer data even if DMA channels are
defined in the DT.

This commit changes the behaviour to select the SPI_IO_TYPE_DMA mode
if DMA channels are defined in the DT and will keep SPI_IO_TYPE_INTR
if the channels are not defined in it.

Signed-off-by: Fabien Parent <fparent@baylibre.com>
Signed-off-by: Frode Isaksen <fisaksen@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 drivers/spi/spi-davinci.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 164cc719be54..1e24395a04f2 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -389,6 +389,7 @@ static int davinci_spi_of_setup(struct spi_device *spi)
 {
 	struct davinci_spi_config *spicfg = spi->controller_data;
 	struct device_node *np = spi->dev.of_node;
+	struct davinci_spi *dspi = spi_master_get_devdata(spi->master);
 	u32 prop;
 
 	if (spicfg == NULL && np) {
@@ -400,6 +401,9 @@ static int davinci_spi_of_setup(struct spi_device *spi)
 		if (!of_property_read_u32(np, "ti,spi-wdelay", &prop))
 			spicfg->wdelay = (u8)prop;
 		spi->controller_data = spicfg;
+
+		if (dspi->dma_rx && dspi->dma_tx)
+			spicfg->io_type = SPI_IO_TYPE_DMA;
 	}
 
 	return 0;
-- 
2.11.0

[toc] | [next] | [standalone]

#1595033 — Re: Applied "spi: davinci: enable DMA when channels are defined in DT" to the spi tree

Hello Mark,

To avoid data corruption issues with UBIFS volume over SPI NOR, DMA should not be used for vmalloc'ed buffers. The 5'th patch in my series fixes that:

0003-spi-davinci-use-rx-buffer-as-dummy-tx-buffer.patch
0004-spi-davinci-do-not-use-DMA-if-transfer-length-is-les.patch
0005-spi-davinci-do-not-use-DMA-for-vmalloc-ed-buffers.patch

Thanks,

Frode



On 07/03/2017 15:22, Mark Brown wrote:
> The patch
>
>    spi: davinci: enable DMA when channels are defined in DT
>
> 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 3e2e1258443ea97e40dfb4a3cf15108d17939066 Mon Sep 17 00:00:00 2001
> From: Fabien Parent <fparent@baylibre.com>
> Date: Thu, 23 Feb 2017 19:01:57 +0100
> Subject: [PATCH] spi: davinci: enable DMA when channels are defined in DT
>
> When booting with DT the SPI driver is always using
> the SPI_IO_TYPE_INTR mode to transfer data even if DMA channels are
> defined in the DT.
>
> This commit changes the behaviour to select the SPI_IO_TYPE_DMA mode
> if DMA channels are defined in the DT and will keep SPI_IO_TYPE_INTR
> if the channels are not defined in it.
>
> Signed-off-by: Fabien Parent <fparent@baylibre.com>
> Signed-off-by: Frode Isaksen <fisaksen@baylibre.com>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
>  drivers/spi/spi-davinci.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
> index 164cc719be54..1e24395a04f2 100644
> --- a/drivers/spi/spi-davinci.c
> +++ b/drivers/spi/spi-davinci.c
> @@ -389,6 +389,7 @@ static int davinci_spi_of_setup(struct spi_device *spi)
>  {
>  	struct davinci_spi_config *spicfg = spi->controller_data;
>  	struct device_node *np = spi->dev.of_node;
> +	struct davinci_spi *dspi = spi_master_get_devdata(spi->master);
>  	u32 prop;
>  
>  	if (spicfg == NULL && np) {
> @@ -400,6 +401,9 @@ static int davinci_spi_of_setup(struct spi_device *spi)
>  		if (!of_property_read_u32(np, "ti,spi-wdelay", &prop))
>  			spicfg->wdelay = (u8)prop;
>  		spi->controller_data = spicfg;
> +
> +		if (dspi->dma_rx && dspi->dma_tx)
> +			spicfg->io_type = SPI_IO_TYPE_DMA;
>  	}
>  
>  	return 0;

[toc] | [prev] | [next] | [standalone]

#1595160 — Re: Applied "spi: davinci: enable DMA when channels are defined in DT" to the spi tree

[Multipart message — attachments visible in raw view] — view raw

On Wed, Mar 08, 2017 at 11:35:02AM +0100, Frode Isaksen wrote:

> To avoid data corruption issues with UBIFS volume over SPI NOR, DMA should not be used for vmalloc'ed buffers. The 5'th patch in my series fixes that:

It's best to always try to ensure that your patch serieses are
bisectable...

[toc] | [prev] | [next] | [standalone]

#1597016 — Re: Applied "spi: davinci: enable DMA when channels are defined in DT" to the spi tree

On 08/03/2017 13:43, Mark Brown wrote:
> On Wed, Mar 08, 2017 at 11:35:02AM +0100, Frode Isaksen wrote:
>
>> To avoid data corruption issues with UBIFS volume over SPI NOR, DMA should not be used for vmalloc'ed buffers. The 5'th patch in my series fixes that:
> It's best to always try to ensure that your patch serieses are
> bisectable...
My wrong - do you want me to re-submit the patch series with the the last patch in the series that really enabled DMA ?

Thanks,
Frode

[toc] | [prev] | [next] | [standalone]

#1599638 — Re: Applied "spi: davinci: enable DMA when channels are defined in DT" to the spi tree

[Multipart message — attachments visible in raw view] — view raw

On Fri, Mar 10, 2017 at 11:24:43AM +0100, Frode Isaksen wrote:

Please fix your mail client to word wrap within paragraphs at something
substantially less than 80 columns.  Doing this makes your messages much
easier to read and reply to.

> My wrong - do you want me to re-submit the patch series with the the last patch in the series that really enabled DMA ?

I'm still reviewing the rest of the series.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web