From: Sanchayan Maity <maitysanchayan@gmail.com>
To: broonie@kernel.org
Cc: Sanchayan Maity <maitysanchayan@gmail.com>,
linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
stefan@agner.ch, linux-kernel@vger.kernel.org
Subject: [PATCH 1/4] spi: spi-fsl-dspi: Fix SPI transfer issue when using multiple SPI_IOC_MESSAGE
Date: Thu, 17 Nov 2016 17:46:48 +0530 [thread overview]
Message-ID: <bbdbc8df434dd2af74eb351b799a2812a1c1967e.1479384571.git.maitysanchayan@gmail.com> (raw)
In-Reply-To: <cover.1479384571.git.maitysanchayan@gmail.com>
In-Reply-To: <cover.1479384571.git.maitysanchayan@gmail.com>
Current DMA implementation had a bug where the DMA transfer would
exit the loop in dspi_transfer_one_message after the completion of
a single transfer. This results in a multi message transfer submitted
with SPI_IOC_MESSAGE to terminate incorrectly without an error.
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
---
drivers/spi/spi-fsl-dspi.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index bc64700..b1ee1f5 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -714,7 +714,7 @@ static int dspi_transfer_one_message(struct spi_master *master,
SPI_RSER_TFFFE | SPI_RSER_TFFFD |
SPI_RSER_RFDFE | SPI_RSER_RFDFD);
status = dspi_dma_xfer(dspi);
- goto out;
+ break;
default:
dev_err(&dspi->pdev->dev, "unsupported trans_mode %u\n",
trans_mode);
@@ -722,9 +722,13 @@ static int dspi_transfer_one_message(struct spi_master *master,
goto out;
}
- if (wait_event_interruptible(dspi->waitq, dspi->waitflags))
- dev_err(&dspi->pdev->dev, "wait transfer complete fail!\n");
- dspi->waitflags = 0;
+ if (trans_mode != DSPI_DMA_MODE) {
+ if (wait_event_interruptible(dspi->waitq,
+ dspi->waitflags))
+ dev_err(&dspi->pdev->dev,
+ "wait transfer complete fail!\n");
+ dspi->waitflags = 0;
+ }
if (transfer->delay_usecs)
udelay(transfer->delay_usecs);
--
2.10.2
next prev parent reply other threads:[~2016-11-17 12:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-10 12:19 [PATCH v3] spi: spi-fsl-dspi: Add DMA support for Vybrid Sanchayan Maity
[not found] ` <836dd6a84fa149cafdbb0b53e792d305febf6207.1478778329.git.maitysanchayan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-11-11 12:20 ` Mark Brown
2016-11-17 12:16 ` [PATCH 0/4] Fixes for Vybrid SPI DMA implementation Sanchayan Maity
2016-11-17 12:16 ` Sanchayan Maity [this message]
[not found] ` <bbdbc8df434dd2af74eb351b799a2812a1c1967e.1479384571.git.maitysanchayan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-11-18 0:52 ` [PATCH 1/4] spi: spi-fsl-dspi: Fix SPI transfer issue when using multiple SPI_IOC_MESSAGE Stefan Agner
2016-11-21 19:20 ` Applied "spi: spi-fsl-dspi: Fix SPI transfer issue when using multiple SPI_IOC_MESSAGE" to the spi tree Mark Brown
2016-11-17 12:16 ` [PATCH 2/4] spi: spi-fsl-dspi: Fix incorrect DMA setup Sanchayan Maity
[not found] ` <d83f4896d77f577ca92fd70534f6198bb3288d8a.1479384571.git.maitysanchayan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-11-18 1:03 ` Stefan Agner
[not found] ` <bc8d9b808b99d3b217361df6fa8853ea-XLVq0VzYD2Y@public.gmane.org>
2016-11-18 8:04 ` maitysanchayan-Re5JQEeQqe8AvxtiuMwx3w
[not found] ` <20161118080403.GB1572-2b/appYahYDPUjlVagVGR1Kr0EmMEXJSn9A1Ff6Mc9Q@public.gmane.org>
2016-11-18 23:39 ` Stefan Agner
2016-11-17 12:16 ` [PATCH 3/4] spi: spi-fsl-dspi: Fix continuous selection format Sanchayan Maity
[not found] ` <c1e51fc92dbcc9c31dcdcdfab3eed40d7745308a.1479384571.git.maitysanchayan-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2016-11-18 1:07 ` Stefan Agner
[not found] ` <c1c4a3f3eac6d4e7378971431bd5f595-XLVq0VzYD2Y@public.gmane.org>
2016-11-18 7:59 ` maitysanchayan-Re5JQEeQqe8AvxtiuMwx3w
2016-11-17 12:16 ` [PATCH 4/4] spi: spi-fsl-dspi: Minor code cleanup and error path fixes Sanchayan Maity
2016-11-11 13:05 ` Applied "spi: spi-fsl-dspi: Add DMA support for Vybrid" to the spi tree 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=bbdbc8df434dd2af74eb351b799a2812a1c1967e.1479384571.git.maitysanchayan@gmail.com \
--to=maitysanchayan@gmail.com \
--cc=broonie@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=stefan@agner.ch \
/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).