On Wed, May 13, 2020 at 08:38:26AM +0000, Robin Gong wrote:

On 2020/05/13 Sascha Hauer [off-list ref] wrote:

quoted

This patch is the one bisecting will end up with when somebody uses an older
SDMA firmware or the ROM scripts. It should have a better description what
happens and what should be done about it.

Emm..That's true. Timeout will be caught in such case, hence, maybe we can fall back it to pio always.

With my patch applied sdma_load_context() will fail. I don't know how
exactly this hits into the SPI driver, but it won't be a timeout.

Sascha

quoted

quoted

Signed-off-by: Robin Gong <redacted>
Acked-by: Mark Brown <broonie@kernel.org>
---
 drivers/spi/spi-imx.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index

f4f28a4..70df8e6 100644

--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c

@@ -585,8 +585,8 @@ static int mx51_ecspi_prepare_transfer(struct

spi_imx_data *spi_imx,

quoted

 	ctrl |= mx51_ecspi_clkdiv(spi_imx, t->speed_hz, &clk);
 	spi_imx->spi_bus_clk = clk;

-	if (spi_imx->usedma)
-		ctrl |= MX51_ECSPI_CTRL_SMC;
+	/* ERR009165: work in XHC mode as PIO */
+	ctrl &= ~MX51_ECSPI_CTRL_SMC;

 	writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL);

@@ -617,7 +617,7 @@ static void mx51_setup_wml(struct spi_imx_data

*spi_imx)

quoted

 	 * and enable DMA request.
 	 */
 	writel(MX51_ECSPI_DMA_RX_WML(spi_imx->wml - 1) |
-		MX51_ECSPI_DMA_TX_WML(spi_imx->wml) |
+		MX51_ECSPI_DMA_TX_WML(0) |
 		MX51_ECSPI_DMA_RXT_WML(spi_imx->wml) |
 		MX51_ECSPI_DMA_TEDEN | MX51_ECSPI_DMA_RXDEN |
 		MX51_ECSPI_DMA_RXTDEN, spi_imx->base + MX51_ECSPI_DMA);

@@ -1171,7

quoted

+1171,11 @@ static int spi_imx_dma_configure(struct spi_master *master)
 	tx.direction = DMA_MEM_TO_DEV;
 	tx.dst_addr = spi_imx->base_phys + MXC_CSPITXDATA;
 	tx.dst_addr_width = buswidth;
-	tx.dst_maxburst = spi_imx->wml;
+	/*
+	 * For ERR009165 with tx_wml = 0 could enlarge burst size to fifo size
+	 * to speed up fifo filling as possible.
+	 */
+	tx.dst_maxburst = spi_imx->devtype_data->fifo_size;
 	ret = dmaengine_slave_config(master->dma_tx, &tx);
 	if (ret) {
 		dev_err(spi_imx->dev, "TX dma configuration failed with %d\n",
ret); @@ -1265,10 +1269,6 @@ static int spi_imx_sdma_init(struct
device *dev, struct spi_imx_data *spi_imx,  {
 	int ret;

-	/* use pio mode for i.mx6dl chip TKT238285 */
-	if (of_machine_is_compatible("fsl,imx6dl"))
-		return 0;
-
 	spi_imx->wml = spi_imx->devtype_data->fifo_size / 2;

 	/* Prepare for TX DMA: */
--
2.7.4

--
Pengutronix e.K.                           |
|
Steuerwalder Str. 21                       |
https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.pe
ngutronix.de%2F&data=02%7C01%7Cyibin.gong%40nxp.com%7C2f49309
819cc4c45418108d7f70e46fb%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0%
7C1%7C637249513003506970&sdata=RoLVnDaCfG20i88OmmlpbMH6lZu
qqW2CJv4VSSDkPcM%3D&reserved=0  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0
|
Amtsgericht Hildesheim, HRA 2686           | Fax:
+49-5121-206917-5555 |

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |