[PATCH] spi: spi-fsl-dspi: Fill actual_length when doing DMA transfer

[PATCH] spi: spi-fsl-dspi: Fill actual_length when doing DMA transfer

[Andrey Smirnov]

Users of SPI device drivers may rely on 'actual_length', so it is
important that information is correctly reported. One example would be
spi_mem_exec_op() which will fail if 'actual_length' doesn't match
requested transfer length. To fix the problem, add necessary code to
populate 'actual_length'.

Cc: Mark Brown <broonie@kernel.org>
Cc: Sanchayan Maity <maitysanchayan@gmail.com>
Cc: Stefan Agner <stefan@agner.ch>
Cc: cphealy@gmail.com
Cc: linux-spi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
 drivers/spi/spi-fsl-dspi.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 0630962ce442..8877dd1e18dc 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -327,6 +327,7 @@ static int dspi_dma_xfer(struct fsl_dspi *dspi)
 {
 	struct fsl_dspi_dma *dma = dspi->dma;
 	struct device *dev = &dspi->pdev->dev;
+	struct spi_message *message = dspi->cur_msg;
 	int curr_remaining_bytes;
 	int bytes_per_buffer;
 	int word = 1;
@@ -348,7 +349,10 @@ static int dspi_dma_xfer(struct fsl_dspi *dspi)
 			goto exit;
 
 		} else {
-			curr_remaining_bytes -= dma->curr_xfer_len * word;
+			const int len = dma->curr_xfer_len * word;
+
+			curr_remaining_bytes -= len;
+			message->actual_length += len;
 			if (curr_remaining_bytes < 0)
 				curr_remaining_bytes = 0;
 		}
-- 
2.17.1

Re: [PATCH] spi: spi-fsl-dspi: Fill actual_length when doing DMA transfer

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 440 bytes --]

On Sun, Jul 15, 2018 at 11:25:08PM -0700, Andrey Smirnov wrote:
> Users of SPI device drivers may rely on 'actual_length', so it is
> important that information is correctly reported. One example would be
> spi_mem_exec_op() which will fail if 'actual_length' doesn't match
> requested transfer length. To fix the problem, add necessary code to
> populate 'actual_length'.

This doesn't apply against current code, please check and resend.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] spi: spi-fsl-dspi: Fill actual_length when doing DMA transfer

[Andrey Smirnov]

On Mon, Jul 16, 2018 at 4:26 AM Mark Brown <broonie@kernel.org> wrote:
>
> On Sun, Jul 15, 2018 at 11:25:08PM -0700, Andrey Smirnov wrote:
> > Users of SPI device drivers may rely on 'actual_length', so it is
> > important that information is correctly reported. One example would be
> > spi_mem_exec_op() which will fail if 'actual_length' doesn't match
> > requested transfer length. To fix the problem, add necessary code to
> > populate 'actual_length'.
>
> This doesn't apply against current code, please check and resend.


Sorry about that. Will do in v2.

Thanks,
Andrey Smirnov