From: Robin Gong <yibin.gong@nxp.com>
To: mark.rutland@arm.com, broonie@kernel.org, robh+dt@kernel.org,
catalin.marinas@arm.com, vkoul@kernel.org, will.deacon@arm.com,
shawnguo@kernel.org, festevam@gmail.com, s.hauer@pengutronix.de,
martin.fuzzey@flowbird.group, u.kleine-koenig@pengutronix.de,
dan.j.williams@intel.com, matthias.schiffer@ew.tq-group.com
Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
kernel@pengutronix.de, linux-imx@nxp.com,
dmaengine@vger.kernel.org
Subject: [PATCH v9 06/14] spi: imx: add dma_sync_sg_for_device after fallback from dma
Date: Sat, 6 Jun 2020 05:32:27 +0800 [thread overview]
Message-ID: <1591392755-19136-7-git-send-email-yibin.gong@nxp.com> (raw)
In-Reply-To: <1591392755-19136-1-git-send-email-yibin.gong@nxp.com>
In case dma transfer failed and fallback to pio, tx_buf/rx_buf need to be
taken care cache since they have already been maintained by spi.c
Fixes: bcd8e7761ec9("spi: imx: fallback to PIO if dma setup failure")
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reported-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Link: https://lore.kernel.org/linux-arm-kernel/5d246dd81607bb6e5cb9af86ad4e53f7a7a99c50.camel@ew.tq-group.com/
---
drivers/spi/spi-imx.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index b7a85e3..c51cd3a 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -1456,6 +1456,13 @@ static int spi_imx_pio_transfer(struct spi_device *spi,
return -ETIMEDOUT;
}
+ if (transfer->rx_sg.sgl) {
+ struct device *rx_dev = spi->controller->dma_rx->device->dev;
+
+ dma_sync_sg_for_device(rx_dev, transfer->rx_sg.sgl,
+ transfer->rx_sg.nents, DMA_TO_DEVICE);
+ }
+
return transfer->len;
}
@@ -1521,10 +1528,15 @@ static int spi_imx_transfer(struct spi_device *spi,
* firmware may not be updated as ERR009165 required.
*/
if (spi_imx->usedma) {
+ struct device *tx_dev = spi->controller->dma_tx->device->dev;
+
ret = spi_imx_dma_transfer(spi_imx, transfer);
if (ret != -EINVAL)
return ret;
+ dma_sync_sg_for_cpu(tx_dev, transfer->tx_sg.sgl,
+ transfer->tx_sg.nents, DMA_FROM_DEVICE);
+
spi_imx->devtype_data->disable_dma(spi_imx);
spi_imx->usedma = false;
--
2.7.4
next prev parent reply other threads:[~2020-06-05 13:33 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-05 21:32 [PATCH v9 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
2020-06-05 21:32 ` [PATCH v9 01/14] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" Robin Gong
2020-06-05 21:32 ` [PATCH v9 02/14] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" Robin Gong
2020-06-05 21:32 ` [PATCH v9 03/14] Revert "dmaengine: imx-sdma: refine to load context only once" Robin Gong
2020-06-05 21:32 ` [PATCH v9 04/14] dmaengine: imx-sdma: remove duplicated sdma_load_context Robin Gong
2020-06-05 21:32 ` [PATCH v9 05/14] spi: imx: fallback to PIO if dma setup failure Robin Gong
2020-06-05 15:01 ` Mark Brown
2020-06-05 21:32 ` Robin Gong [this message]
2020-06-05 21:32 ` [PATCH v9 07/14] dmaengine: imx-sdma: add mcu_2_ecspi script Robin Gong
2020-06-05 21:32 ` [PATCH v9 08/14] spi: imx: fix ERR009165 Robin Gong
2020-06-05 21:32 ` [PATCH v9 09/14] spi: imx: remove ERR009165 workaround on i.mx6ul Robin Gong
2020-06-05 21:32 ` [PATCH v9 10/14] spi: imx: add new i.mx6ul compatible name in binding doc Robin Gong
2020-06-05 21:32 ` [PATCH v9 11/14] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul Robin Gong
2020-06-05 21:32 ` [PATCH v9 12/14] dma: imx-sdma: add i.mx6ul compatible name Robin Gong
2020-06-05 21:32 ` [PATCH v9 13/14] dmaengine: imx-sdma: fix ecspi1 rx dma not work on i.mx8mm Robin Gong
2020-06-05 21:32 ` [PATCH v9 14/14] dmaengine: imx-sdma: add uart rom script Robin Gong
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=1591392755-19136-7-git-send-email-yibin.gong@nxp.com \
--to=yibin.gong@nxp.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=dan.j.williams@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=martin.fuzzey@flowbird.group \
--cc=matthias.schiffer@ew.tq-group.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
--cc=vkoul@kernel.org \
--cc=will.deacon@arm.com \
/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).