mmc: moxart-mmc: Fix accounting in DMA transfer

The whole scatterlist chain is submitted to the DMA engine,
but the code is written to just account for the length of
the first sg entry.

When the DMA transfer is finished, all the data in the
request has been transferred, account for this instead.

This only works because the moxart_request() function isn't
checking that all data was transferred and will
unconditionally issue mmc_request_done() after returning
successfully from moxart_transfer_dma().

Keep the assignment of accounted bytes in .bytes_xfered
but move it after the completion where we know it has
actually happened.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20240127-mmc-proper-kmap-v2-3-d8e732aa97d1@linaro.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/moxart-mmc.c b/drivers/mmc/host/moxart-mmc.c
index d12d7d79b19cea2633c5945dbc37d02ba404614a..8ede4ce9327149b87eef0df976081644d982b80c 100644 (file)
--- a/drivers/mmc/host/moxart-mmc.c
+++ b/drivers/mmc/host/moxart-mmc.c
@@ -296,11 +296,11 @@ static void moxart_transfer_dma(struct mmc_data *data, struct moxart_host *host)
                dma_async_issue_pending(dma_chan);
        }
 
-       data->bytes_xfered += host->data_remain;
-
        wait_for_completion_interruptible_timeout(&host->dma_complete,
                                                  host->timeout);
 
+       data->bytes_xfered = host->data_len;
+
        dma_unmap_sg(dma_chan->device->dev,
                     data->sg, data->sg_len,
                     mmc_get_dma_dir(data));