Linux-SPI Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v11 00/12] add ecspi ERR009165 for i.mx6/7 soc family
@ 2020-07-24 18:51 Robin Gong
  2020-07-24 18:51 ` [PATCH v11 01/12] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" Robin Gong
                   ` (11 more replies)
  0 siblings, 12 replies; 17+ messages in thread
From: Robin Gong @ 2020-07-24 18:51 UTC (permalink / raw)
  To: mark.rutland, broonie, robh+dt, catalin.marinas, vkoul,
	will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer,
	frieder.schrempf
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, linux-imx

There is ecspi ERR009165 on i.mx6/7 soc family, which cause FIFO
transfer to be send twice in DMA mode. Please get more information from:
https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf. The workaround is adding
new sdma ram script which works in XCH  mode as PIO inside sdma instead
of SMC mode, meanwhile, 'TX_THRESHOLD' should be 0. The issue should be
exist on all legacy i.mx6/7 soc family before i.mx6ul.
NXP fix this design issue from i.mx6ul, so newer chips including i.mx6ul/
6ull/6sll do not need this workaroud anymore. All other i.mx6/7/8 chips
still need this workaroud. This patch set add new 'fsl,imx6ul-ecspi'
for ecspi driver and 'ecspi_fixed' in sdma driver to choose if need errata
or not.
The first two reverted patches should be the same issue, though, it
seems 'fixed' by changing to other shp script. Hope Sean or Sascha could
have the chance to test this patch set if could fix their issues.
Besides, enable sdma support for i.mx8mm/8mq and fix ecspi1 not work
on i.mx8mm because the event id is zero.

PS:
   Please get sdma firmware from below linux-firmware and copy it to your
local rootfs /lib/firmware/imx/sdma.
https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/tree/imx/sdma

v2:
  1.Add commit log for reverted patches.
  2.Add comment for 'ecspi_fixed' in sdma driver.
  3.Add 'fsl,imx6sll-ecspi' compatible instead of 'fsl,imx6ul-ecspi'
    rather than remove.
v3:
  1.Confirm with design team make sure ERR009165 fixed on i.mx6ul/i.mx6ull
    /i.mx6sll, not fixed on i.mx8m/8mm and other i.mx6/7 legacy chips.
    Correct dts related dts patch in v2.
  2.Clean eratta information in binding doc and new 'tx_glitch_fixed' flag
    in spi-imx driver to state ERR009165 fixed or not.
  3.Enlarge burst size to fifo size for tx since tx_wml set to 0 in the
    errata workaroud, thus improve performance as possible.
v4:
  1.Add Ack tag from Mark and Vinod
  2.Remove checking 'event_id1' zero as 'event_id0'.
v5:
  1.Add the last patch for compatible with the current uart driver which
    using rom script, so both uart ram script and rom script supported
    in latest firmware, by default uart rom script used. UART driver
    will be broken without this patch.
v6:
  1.Resend after rebase the latest next branch.
  2.Remove below No.13~No.15 patches of v5 because they were mergered.
  	ARM: dts: imx6ul: add dma support on ecspi
  	ARM: dts: imx6sll: correct sdma compatible
  	arm64: defconfig: Enable SDMA on i.mx8mq/8mm
  3.Revert "dmaengine: imx-sdma: fix context cache" since
    'context_loaded' removed.
v7:
  1.Put the last patch 13/13 'Revert "dmaengine: imx-sdma: fix context
    cache"' to the ahead of 03/13 'Revert "dmaengine: imx-sdma: refine
    to load context only once" so that no building waring during comes out
    during bisect.
  2.Address Sascha's comments, including eliminating any i.mx6sx in this
    series, adding new 'is_imx6ul_ecspi()' instead imx in imx51 and taking
    care SMC bit for PIO.
  3.Add back missing 'Reviewed-by' tag on 08/15(v5):09/13(v7)
   'spi: imx: add new i.mx6ul compatible name in binding doc'
v8:
  1.remove 0003-Revert-dmaengine-imx-sdma-fix-context-cache.patch and merge
    it into 04/13 of v7
  2.add 0005-spi-imx-fallback-to-PIO-if-dma-setup-failure.patch for no any
    ecspi function broken even if sdma firmware not updated.
  3.merge 'tx.dst_maxburst' changes in the two continous patches into one
    patch to avoid confusion.
  4.fix typo 'duplicated'.
v9:
  1. add "spi: imx: add dma_sync_sg_for_device after fallback from dma"
     to fix the potential issue brought by commit bcd8e7761ec9("spi: imx:
     fallback to PIO if dma setup failure") which is the only one patch
     of v8 merged. Thanks Matthias for reporting:
     https://lore.kernel.org/linux-arm-kernel/5d246dd81607bb6e5cb9af86ad4e53f7a7a99c50.camel@ew.tq-group.com/
  2. remove 05/13 of v8 "spi: imx:fallback to PIO if dma setup failure"
     since it's been merged.
v10:
  1. remove 01/13 "spi: imx: add dma_sync_sg_for_device after fallback from dma"
     since there is another independent patch merged:
     -- commit 809b1b04df898 ("spi: introduce fallback to pio")
  2. add "dmaengine: dma: imx-sdma: add fw_loaded and is_ram_script" which
     is used to fix the potential dma_alloc_coherent() failure while this
     patchset applied but sdma firmware may not be ready for long time.
  3. burst size change back from fifo size to normal wml to align with nxp
     internal tree which has been test for years. Overnight with loopback
     test with spidev failed with fifo size, but pass with wml(half of fifo
     size).Seems the whole fifo size fed may cause rxfifo overflow during
     tx shift out while rx shift in.
     "spi: imx: remove ERR009165 workaround on i.mx6ul"
  4. remove 12/13 'dmaengine: imx-sdma: fix ecspi1 rx dma not work on i.mx8mm'
     since below two similar patches merged:
     -- commit 25962e1a7f1d ("dmaengine: imx-sdma: Fix the event id check to
     include RX event for UART6")
     -- commit 2f57b8d57673 ("dmaengine: imx-sdma: Fix: Remove 'always true'
     comparison")
v11:
  1. change dev_err() to dev_warn_once() in case sdma firmware not loaded to
     eliminate meaningless duplicate log print.

Robin Gong (12):
  Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core"
  Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores"
  Revert "dmaengine: imx-sdma: refine to load context only once"
  dmaengine: imx-sdma: remove duplicated sdma_load_context
  dmaengine: dma: imx-sdma: add fw_loaded and is_ram_script
  dmaengine: imx-sdma: add mcu_2_ecspi script
  spi: imx: fix ERR009165
  spi: imx: remove ERR009165 workaround on i.mx6ul
  spi: imx: add new i.mx6ul compatible name in binding doc
  dmaengine: imx-sdma: remove ERR009165 on i.mx6ul
  dma: imx-sdma: add i.mx6ul compatible name
  dmaengine: imx-sdma: add uart rom script

 .../devicetree/bindings/dma/fsl-imx-sdma.txt       |  1 +
 .../devicetree/bindings/spi/fsl-imx-cspi.txt       |  1 +
 arch/arm/boot/dts/imx6q.dtsi                       |  2 +-
 arch/arm/boot/dts/imx6qdl.dtsi                     |  8 +--
 drivers/dma/imx-sdma.c                             | 63 ++++++++++++++++------
 drivers/spi/spi-imx.c                              | 52 +++++++++++++++---
 include/linux/platform_data/dma-imx-sdma.h         |  8 ++-
 7 files changed, 106 insertions(+), 29 deletions(-)

-- 
2.7.4


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v11 01/12] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core"
  2020-07-24 18:51 [PATCH v11 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
@ 2020-07-24 18:51 ` Robin Gong
  2020-07-24 18:51 ` [PATCH v11 02/12] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" Robin Gong
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 17+ messages in thread
From: Robin Gong @ 2020-07-24 18:51 UTC (permalink / raw)
  To: mark.rutland, broonie, robh+dt, catalin.marinas, vkoul,
	will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer,
	frieder.schrempf
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, linux-imx

  There are two ways for SDMA accessing SPBA devices: one is SDMA->AIPS
->SPBA(masterA port), another is SDMA->SPBA(masterC port). Please refer
to the 'Figure 58-1. i.MX 6Dual/6Quad SPBA connectivity' of i.mx6DQ
Reference Manual. SDMA provide the corresponding app_2_mcu/mcu_2_app and
shp_2_mcu/mcu_2_shp script for such two options. So both AIPS and SPBA
scripts should keep the same behaviour, the issue only caught in AIPS
script sounds not solide.
  The issue is more likely as the ecspi errata
ERR009165(http://www.nxp.com/docs/en/errata/IMX6DQCE.pdf):
eCSPI: TXFIFO empty flag glitch can cause the current FIFO transfer to
       be sent twice
So revert commit 'df07101e1c4a' firstly.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boot/dts/imx6q.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 78a4d64..afdd9eb 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -177,7 +177,7 @@
 					clocks = <&clks IMX6Q_CLK_ECSPI5>,
 						 <&clks IMX6Q_CLK_ECSPI5>;
 					clock-names = "ipg", "per";
-					dmas = <&sdma 11 8 1>, <&sdma 12 8 2>;
+					dmas = <&sdma 11 7 1>, <&sdma 12 7 2>;
 					dma-names = "rx", "tx";
 					status = "disabled";
 				};
-- 
2.7.4


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v11 02/12] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores"
  2020-07-24 18:51 [PATCH v11 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
  2020-07-24 18:51 ` [PATCH v11 01/12] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" Robin Gong
@ 2020-07-24 18:51 ` Robin Gong
  2020-07-24 18:51 ` [PATCH v11 03/12] Revert "dmaengine: imx-sdma: refine to load context only once" Robin Gong
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 17+ messages in thread
From: Robin Gong @ 2020-07-24 18:51 UTC (permalink / raw)
  To: mark.rutland, broonie, robh+dt, catalin.marinas, vkoul,
	will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer,
	frieder.schrempf
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, linux-imx

There are two ways for SDMA accessing SPBA devices: one is SDMA->AIPS
->SPBA(masterA port), another is SDMA->SPBA(masterC port). Please refer
to the 'Figure 58-1. i.MX 6Dual/6Quad SPBA connectivity' of i.mx6DQ
Reference Manual. SDMA provide the corresponding app_2_mcu/mcu_2_app and
shp_2_mcu/mcu_2_shp script for such two options. So both AIPS and SPBA
scripts should keep the same behaviour, the issue only caught in AIPS
script sounds not solide.
The issue is more likely as the ecspi errata
ERR009165(http://www.nxp.com/docs/en/errata/IMX6DQCE.pdf):
eCSPI: TXFIFO empty flag glitch can cause the current FIFO transfer to
           be sent twice
So revert commit 'dd4b487b32a3' firstly.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boot/dts/imx6qdl.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 346a52f..a8dedeb 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -327,7 +327,7 @@
 					clocks = <&clks IMX6QDL_CLK_ECSPI1>,
 						 <&clks IMX6QDL_CLK_ECSPI1>;
 					clock-names = "ipg", "per";
-					dmas = <&sdma 3 8 1>, <&sdma 4 8 2>;
+					dmas = <&sdma 3 7 1>, <&sdma 4 7 2>;
 					dma-names = "rx", "tx";
 					status = "disabled";
 				};
@@ -341,7 +341,7 @@
 					clocks = <&clks IMX6QDL_CLK_ECSPI2>,
 						 <&clks IMX6QDL_CLK_ECSPI2>;
 					clock-names = "ipg", "per";
-					dmas = <&sdma 5 8 1>, <&sdma 6 8 2>;
+					dmas = <&sdma 5 7 1>, <&sdma 6 7 2>;
 					dma-names = "rx", "tx";
 					status = "disabled";
 				};
@@ -355,7 +355,7 @@
 					clocks = <&clks IMX6QDL_CLK_ECSPI3>,
 						 <&clks IMX6QDL_CLK_ECSPI3>;
 					clock-names = "ipg", "per";
-					dmas = <&sdma 7 8 1>, <&sdma 8 8 2>;
+					dmas = <&sdma 7 7 1>, <&sdma 8 7 2>;
 					dma-names = "rx", "tx";
 					status = "disabled";
 				};
@@ -369,7 +369,7 @@
 					clocks = <&clks IMX6QDL_CLK_ECSPI4>,
 						 <&clks IMX6QDL_CLK_ECSPI4>;
 					clock-names = "ipg", "per";
-					dmas = <&sdma 9 8 1>, <&sdma 10 8 2>;
+					dmas = <&sdma 9 7 1>, <&sdma 10 7 2>;
 					dma-names = "rx", "tx";
 					status = "disabled";
 				};
-- 
2.7.4


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v11 03/12] Revert "dmaengine: imx-sdma: refine to load context only once"
  2020-07-24 18:51 [PATCH v11 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
  2020-07-24 18:51 ` [PATCH v11 01/12] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" Robin Gong
  2020-07-24 18:51 ` [PATCH v11 02/12] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" Robin Gong
@ 2020-07-24 18:51 ` Robin Gong
  2020-07-24 18:51 ` [PATCH v11 04/12] dmaengine: imx-sdma: remove duplicated sdma_load_context Robin Gong
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 17+ messages in thread
From: Robin Gong @ 2020-07-24 18:51 UTC (permalink / raw)
  To: mark.rutland, broonie, robh+dt, catalin.marinas, vkoul,
	will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer,
	frieder.schrempf
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, linux-imx

This reverts commit ad0d92d7ba6aecbe2705907c38ff8d8be4da1e9c, because
in spi-imx case, burst length may be changed dynamically.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/dma/imx-sdma.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 270992c..d305b80 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -377,7 +377,6 @@ struct sdma_channel {
 	unsigned long			watermark_level;
 	u32				shp_addr, per_addr;
 	enum dma_status			status;
-	bool				context_loaded;
 	struct imx_dma_data		data;
 	struct work_struct		terminate_worker;
 };
@@ -984,9 +983,6 @@ static int sdma_load_context(struct sdma_channel *sdmac)
 	int ret;
 	unsigned long flags;
 
-	if (sdmac->context_loaded)
-		return 0;
-
 	if (sdmac->direction == DMA_DEV_TO_MEM)
 		load_address = sdmac->pc_from_device;
 	else if (sdmac->direction == DMA_DEV_TO_DEV)
@@ -1029,8 +1025,6 @@ static int sdma_load_context(struct sdma_channel *sdmac)
 
 	spin_unlock_irqrestore(&sdma->channel_0_lock, flags);
 
-	sdmac->context_loaded = true;
-
 	return ret;
 }
 
@@ -1069,7 +1063,6 @@ static void sdma_channel_terminate_work(struct work_struct *work)
 	vchan_get_all_descriptors(&sdmac->vc, &head);
 	spin_unlock_irqrestore(&sdmac->vc.lock, flags);
 	vchan_dma_desc_free_list(&sdmac->vc, &head);
-	sdmac->context_loaded = false;
 }
 
 static int sdma_terminate_all(struct dma_chan *chan)
@@ -1337,7 +1330,6 @@ static void sdma_free_chan_resources(struct dma_chan *chan)
 
 	sdmac->event_id0 = 0;
 	sdmac->event_id1 = 0;
-	sdmac->context_loaded = false;
 
 	sdma_set_channel_priority(sdmac, 0);
 
-- 
2.7.4


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v11 04/12] dmaengine: imx-sdma: remove duplicated sdma_load_context
  2020-07-24 18:51 [PATCH v11 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
                   ` (2 preceding siblings ...)
  2020-07-24 18:51 ` [PATCH v11 03/12] Revert "dmaengine: imx-sdma: refine to load context only once" Robin Gong
@ 2020-07-24 18:51 ` Robin Gong
  2020-07-24 18:51 ` [PATCH v11 05/12] dmaengine: dma: imx-sdma: add fw_loaded and is_ram_script Robin Gong
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 17+ messages in thread
From: Robin Gong @ 2020-07-24 18:51 UTC (permalink / raw)
  To: mark.rutland, broonie, robh+dt, catalin.marinas, vkoul,
	will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer,
	frieder.schrempf
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, linux-imx

Since sdma_transfer_init() will do sdma_load_context before any
sdma transfer, no need once more in sdma_config_channel().

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Vinod Koul <vkoul@kernel.org>
---
 drivers/dma/imx-sdma.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index d305b80..5411e01e 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1137,7 +1137,6 @@ static void sdma_set_watermarklevel_for_p2p(struct sdma_channel *sdmac)
 static int sdma_config_channel(struct dma_chan *chan)
 {
 	struct sdma_channel *sdmac = to_sdma_chan(chan);
-	int ret;
 
 	sdma_disable_channel(chan);
 
@@ -1177,9 +1176,7 @@ static int sdma_config_channel(struct dma_chan *chan)
 		sdmac->watermark_level = 0; /* FIXME: M3_BASE_ADDRESS */
 	}
 
-	ret = sdma_load_context(sdmac);
-
-	return ret;
+	return 0;
 }
 
 static int sdma_set_channel_priority(struct sdma_channel *sdmac,
-- 
2.7.4


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v11 05/12] dmaengine: dma: imx-sdma: add fw_loaded and is_ram_script
  2020-07-24 18:51 [PATCH v11 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
                   ` (3 preceding siblings ...)
  2020-07-24 18:51 ` [PATCH v11 04/12] dmaengine: imx-sdma: remove duplicated sdma_load_context Robin Gong
@ 2020-07-24 18:51 ` Robin Gong
  2020-07-24 18:51 ` [PATCH v11 06/12] dmaengine: imx-sdma: add mcu_2_ecspi script Robin Gong
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 17+ messages in thread
From: Robin Gong @ 2020-07-24 18:51 UTC (permalink / raw)
  To: mark.rutland, broonie, robh+dt, catalin.marinas, vkoul,
	will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer,
	frieder.schrempf
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, linux-imx

Add 'fw_loaded' and 'is_ram_script' to check if the script used by channel
is ram script and it's loaded or not, so that could prevent meaningless
following malloc dma descriptor and bd allocate in sdma_transfer_init(),
otherwise memory may be consumed out potentially without free in case
that spi fallback into pio while dma transfer failed by sdma firmware not
ready(next ERR009165 patch depends on sdma RAM scripts/firmware).

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-By: Vinod Koul <vkoul@kernel.org>
---
 drivers/dma/imx-sdma.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 5411e01e..cf02c3e 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -379,6 +379,7 @@ struct sdma_channel {
 	enum dma_status			status;
 	struct imx_dma_data		data;
 	struct work_struct		terminate_worker;
+	bool				is_ram_script;
 };
 
 #define IMX_DMA_SG_LOOP		BIT(0)
@@ -443,6 +444,7 @@ struct sdma_engine {
 	struct sdma_buffer_descriptor	*bd0;
 	/* clock ratio for AHB:SDMA core. 1:1 is 1, 2:1 is 0*/
 	bool				clk_ratio;
+	bool                            fw_loaded;
 };
 
 static int sdma_config_write(struct dma_chan *chan,
@@ -929,6 +931,7 @@ static void sdma_get_pc(struct sdma_channel *sdmac,
 	case IMX_DMATYPE_SSI_DUAL:
 		per_2_emi = sdma->script_addrs->ssish_2_mcu_addr;
 		emi_2_per = sdma->script_addrs->mcu_2_ssish_addr;
+		sdmac->is_ram_script = true;
 		break;
 	case IMX_DMATYPE_SSI_SP:
 	case IMX_DMATYPE_MMC:
@@ -943,6 +946,7 @@ static void sdma_get_pc(struct sdma_channel *sdmac,
 		per_2_emi = sdma->script_addrs->asrc_2_mcu_addr;
 		emi_2_per = sdma->script_addrs->asrc_2_mcu_addr;
 		per_2_per = sdma->script_addrs->per_2_per_addr;
+		sdmac->is_ram_script = true;
 		break;
 	case IMX_DMATYPE_ASRC_SP:
 		per_2_emi = sdma->script_addrs->shp_2_mcu_addr;
@@ -1339,6 +1343,11 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac,
 {
 	struct sdma_desc *desc;
 
+	if (!sdmac->sdma->fw_loaded && sdmac->is_ram_script) {
+		dev_warn_once(sdmac->sdma->dev, "sdma firmware not ready!\n");
+		goto err_out;
+	}
+
 	desc = kzalloc((sizeof(*desc)), GFP_NOWAIT);
 	if (!desc)
 		goto err_out;
@@ -1589,6 +1598,8 @@ static int sdma_config_write(struct dma_chan *chan,
 {
 	struct sdma_channel *sdmac = to_sdma_chan(chan);
 
+	sdmac->is_ram_script = false;
+
 	if (direction == DMA_DEV_TO_MEM) {
 		sdmac->per_address = dmaengine_cfg->src_addr;
 		sdmac->watermark_level = dmaengine_cfg->src_maxburst *
@@ -1768,6 +1779,8 @@ static void sdma_load_firmware(const struct firmware *fw, void *context)
 
 	sdma_add_scripts(sdma, addr);
 
+	sdma->fw_loaded = true;
+
 	dev_info(sdma->dev, "loaded firmware %d.%d\n",
 			header->version_major,
 			header->version_minor);
-- 
2.7.4


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v11 06/12] dmaengine: imx-sdma: add mcu_2_ecspi script
  2020-07-24 18:51 [PATCH v11 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
                   ` (4 preceding siblings ...)
  2020-07-24 18:51 ` [PATCH v11 05/12] dmaengine: dma: imx-sdma: add fw_loaded and is_ram_script Robin Gong
@ 2020-07-24 18:51 ` Robin Gong
  2020-07-24 18:51 ` [PATCH v11 07/12] spi: imx: fix ERR009165 Robin Gong
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 17+ messages in thread
From: Robin Gong @ 2020-07-24 18:51 UTC (permalink / raw)
  To: mark.rutland, broonie, robh+dt, catalin.marinas, vkoul,
	will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer,
	frieder.schrempf
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, linux-imx

Add mcu_2_ecspi script to fix ecspi errata ERR009165.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Vinod Koul <vkoul@kernel.org>
---
 drivers/dma/imx-sdma.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index cf02c3e..d5d5d40 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -922,6 +922,10 @@ static void sdma_get_pc(struct sdma_channel *sdmac,
 		emi_2_per = sdma->script_addrs->mcu_2_ata_addr;
 		break;
 	case IMX_DMATYPE_CSPI:
+		per_2_emi = sdma->script_addrs->app_2_mcu_addr;
+		emi_2_per = sdma->script_addrs->mcu_2_ecspi_addr;
+		sdmac->is_ram_script = true;
+		break;
 	case IMX_DMATYPE_EXT:
 	case IMX_DMATYPE_SSI:
 	case IMX_DMATYPE_SAI:
-- 
2.7.4


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v11 07/12] spi: imx: fix ERR009165
  2020-07-24 18:51 [PATCH v11 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
                   ` (5 preceding siblings ...)
  2020-07-24 18:51 ` [PATCH v11 06/12] dmaengine: imx-sdma: add mcu_2_ecspi script Robin Gong
@ 2020-07-24 18:51 ` Robin Gong
  2020-07-24 18:51 ` [PATCH v11 08/12] spi: imx: remove ERR009165 workaround on i.mx6ul Robin Gong
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 17+ messages in thread
From: Robin Gong @ 2020-07-24 18:51 UTC (permalink / raw)
  To: mark.rutland, broonie, robh+dt, catalin.marinas, vkoul,
	will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer,
	frieder.schrempf
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, linux-imx

Change to XCH  mode even in dma mode, please refer to the below
errata:
https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Mark Brown <broonie@kernel.org>
---
 drivers/spi/spi-imx.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 2b8d339..873be5e 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -591,8 +591,8 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx,
 	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);
 
@@ -623,7 +623,7 @@ static void mx51_setup_wml(struct spi_imx_data *spi_imx)
 	 * 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);
@@ -1273,10 +1273,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


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v11 08/12] spi: imx: remove ERR009165 workaround on i.mx6ul
  2020-07-24 18:51 [PATCH v11 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
                   ` (6 preceding siblings ...)
  2020-07-24 18:51 ` [PATCH v11 07/12] spi: imx: fix ERR009165 Robin Gong
@ 2020-07-24 18:51 ` Robin Gong
  2020-07-24 18:51 ` [PATCH v11 09/12] spi: imx: add new i.mx6ul compatible name in binding doc Robin Gong
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 17+ messages in thread
From: Robin Gong @ 2020-07-24 18:51 UTC (permalink / raw)
  To: mark.rutland, broonie, robh+dt, catalin.marinas, vkoul,
	will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer,
	frieder.schrempf
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, linux-imx

ERR009165 fixed on i.mx6ul/6ull/6sll. All other i.mx6/7 and
i.mx8m/8mm still need this errata. Please refer to nxp official
errata document from https://www.nxp.com/ .

For removing workaround on those chips. Add new i.mx6ul type.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Mark Brown <broonie@kernel.org>
---
 drivers/spi/spi-imx.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 873be5e..f3049c7 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -57,6 +57,7 @@ enum spi_imx_devtype {
 	IMX35_CSPI,	/* CSPI on all i.mx except above */
 	IMX51_ECSPI,	/* ECSPI on i.mx51 */
 	IMX53_ECSPI,	/* ECSPI on i.mx53 and later */
+	IMX6UL_ECSPI,	/* ERR009165 fix from i.mx6ul */
 };
 
 struct spi_imx_data;
@@ -76,6 +77,11 @@ struct spi_imx_devtype_data {
 	bool has_slavemode;
 	unsigned int fifo_size;
 	bool dynamic_burst;
+	/*
+	 * ERR009165 fixed or not:
+	 * https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf
+	 */
+	bool tx_glitch_fixed;
 	enum spi_imx_devtype devtype;
 };
 
@@ -132,6 +138,11 @@ static inline int is_imx51_ecspi(struct spi_imx_data *d)
 	return d->devtype_data->devtype == IMX51_ECSPI;
 }
 
+static inline int is_imx6ul_ecspi(struct spi_imx_data *d)
+{
+	return d->devtype_data->devtype == IMX6UL_ECSPI;
+}
+
 static inline int is_imx53_ecspi(struct spi_imx_data *d)
 {
 	return d->devtype_data->devtype == IMX53_ECSPI;
@@ -591,8 +602,14 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx,
 	ctrl |= mx51_ecspi_clkdiv(spi_imx, t->speed_hz, &clk);
 	spi_imx->spi_bus_clk = clk;
 
-	/* ERR009165: work in XHC mode as PIO */
-	ctrl &= ~MX51_ECSPI_CTRL_SMC;
+	/*
+	 * ERR009165: work in XHC mode instead of SMC as PIO on the chips
+	 * before i.mx6ul.
+	 */
+	if (spi_imx->usedma && spi_imx->devtype_data->tx_glitch_fixed)
+		ctrl |= MX51_ECSPI_CTRL_SMC;
+	else
+		ctrl &= ~MX51_ECSPI_CTRL_SMC;
 
 	writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL);
 
@@ -618,12 +635,16 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx,
 
 static void mx51_setup_wml(struct spi_imx_data *spi_imx)
 {
+	u32 tx_wml = 0;
+
+	if (spi_imx->devtype_data->tx_glitch_fixed)
+		tx_wml = spi_imx->wml;
 	/*
 	 * Configure the DMA register: setup the watermark
 	 * and enable DMA request.
 	 */
 	writel(MX51_ECSPI_DMA_RX_WML(spi_imx->wml - 1) |
-		MX51_ECSPI_DMA_TX_WML(0) |
+		MX51_ECSPI_DMA_TX_WML(tx_wml) |
 		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);
@@ -1017,6 +1038,23 @@ static struct spi_imx_devtype_data imx53_ecspi_devtype_data = {
 	.devtype = IMX53_ECSPI,
 };
 
+static struct spi_imx_devtype_data imx6ul_ecspi_devtype_data = {
+	.intctrl = mx51_ecspi_intctrl,
+	.prepare_message = mx51_ecspi_prepare_message,
+	.prepare_transfer = mx51_ecspi_prepare_transfer,
+	.trigger = mx51_ecspi_trigger,
+	.rx_available = mx51_ecspi_rx_available,
+	.reset = mx51_ecspi_reset,
+	.setup_wml = mx51_setup_wml,
+	.fifo_size = 64,
+	.has_dmamode = true,
+	.dynamic_burst = true,
+	.has_slavemode = true,
+	.tx_glitch_fixed = true,
+	.disable = mx51_ecspi_disable,
+	.devtype = IMX6UL_ECSPI,
+};
+
 static const struct platform_device_id spi_imx_devtype[] = {
 	{
 		.name = "imx1-cspi",
@@ -1040,6 +1078,9 @@ static const struct platform_device_id spi_imx_devtype[] = {
 		.name = "imx53-ecspi",
 		.driver_data = (kernel_ulong_t) &imx53_ecspi_devtype_data,
 	}, {
+		.name = "imx6ul-ecspi",
+		.driver_data = (kernel_ulong_t) &imx6ul_ecspi_devtype_data,
+	}, {
 		/* sentinel */
 	}
 };
@@ -1052,6 +1093,7 @@ static const struct of_device_id spi_imx_dt_ids[] = {
 	{ .compatible = "fsl,imx35-cspi", .data = &imx35_cspi_devtype_data, },
 	{ .compatible = "fsl,imx51-ecspi", .data = &imx51_ecspi_devtype_data, },
 	{ .compatible = "fsl,imx53-ecspi", .data = &imx53_ecspi_devtype_data, },
+	{ .compatible = "fsl,imx6ul-ecspi", .data = &imx6ul_ecspi_devtype_data, },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, spi_imx_dt_ids);
@@ -1671,7 +1713,7 @@ static int spi_imx_probe(struct platform_device *pdev)
 	spi_imx->bitbang.master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH \
 					     | SPI_NO_CS;
 	if (is_imx35_cspi(spi_imx) || is_imx51_ecspi(spi_imx) ||
-	    is_imx53_ecspi(spi_imx))
+	    is_imx53_ecspi(spi_imx) || is_imx6ul_ecspi(spi_imx))
 		spi_imx->bitbang.master->mode_bits |= SPI_LOOP | SPI_READY;
 
 	spi_imx->spi_drctl = spi_drctl;
-- 
2.7.4


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v11 09/12] spi: imx: add new i.mx6ul compatible name in binding doc
  2020-07-24 18:51 [PATCH v11 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
                   ` (7 preceding siblings ...)
  2020-07-24 18:51 ` [PATCH v11 08/12] spi: imx: remove ERR009165 workaround on i.mx6ul Robin Gong
@ 2020-07-24 18:51 ` Robin Gong
  2020-07-24 18:51 ` [PATCH v11 10/12] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul Robin Gong
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 17+ messages in thread
From: Robin Gong @ 2020-07-24 18:51 UTC (permalink / raw)
  To: mark.rutland, broonie, robh+dt, catalin.marinas, vkoul,
	will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer,
	frieder.schrempf
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, linux-imx

ERR009165 fixed from i.mx6ul, add its compatible name in binding doc.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Rob Herring <robh@kernel.org>
---
 Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt b/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt
index 33bc58f..0a529ba 100644
--- a/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt
+++ b/Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt
@@ -10,6 +10,7 @@ Required properties:
   - "fsl,imx35-cspi" for SPI compatible with the one integrated on i.MX35
   - "fsl,imx51-ecspi" for SPI compatible with the one integrated on i.MX51
   - "fsl,imx53-ecspi" for SPI compatible with the one integrated on i.MX53 and later Soc
+  - "fsl,imx6ul-ecspi" for SPI compatible with the one integrated on i.MX6UL and later Soc
   - "fsl,imx8mq-ecspi" for SPI compatible with the one integrated on i.MX8MQ
   - "fsl,imx8mm-ecspi" for SPI compatible with the one integrated on i.MX8MM
   - "fsl,imx8mn-ecspi" for SPI compatible with the one integrated on i.MX8MN
-- 
2.7.4


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v11 10/12] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul
  2020-07-24 18:51 [PATCH v11 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
                   ` (8 preceding siblings ...)
  2020-07-24 18:51 ` [PATCH v11 09/12] spi: imx: add new i.mx6ul compatible name in binding doc Robin Gong
@ 2020-07-24 18:51 ` Robin Gong
  2020-07-24 18:51 ` [PATCH v11 11/12] dma: imx-sdma: add i.mx6ul compatible name Robin Gong
  2020-07-24 18:51 ` [PATCH v11 12/12] dmaengine: imx-sdma: add uart rom script Robin Gong
  11 siblings, 0 replies; 17+ messages in thread
From: Robin Gong @ 2020-07-24 18:51 UTC (permalink / raw)
  To: mark.rutland, broonie, robh+dt, catalin.marinas, vkoul,
	will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer,
	frieder.schrempf
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, linux-imx

ECSPI issue fixed from i.mx6ul at hardware level, no need
ERR009165 anymore on those chips such as i.mx8mq.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Vinod Koul <vkoul@kernel.org>
---
 drivers/dma/imx-sdma.c | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index d5d5d40..8735606 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -420,6 +420,13 @@ struct sdma_driver_data {
 	int num_events;
 	struct sdma_script_start_addrs	*script_addrs;
 	bool check_ratio;
+	/*
+	 * ecspi ERR009165 fixed should be done in sdma script
+	 * and it has been fixed in soc from i.mx6ul.
+	 * please get more information from the below link:
+	 * https://www.nxp.com/docs/en/errata/IMX6DQCE.pdf
+	 */
+	bool ecspi_fixed;
 };
 
 struct sdma_engine {
@@ -541,6 +548,13 @@ static struct sdma_driver_data sdma_imx6q = {
 	.script_addrs = &sdma_script_imx6q,
 };
 
+static struct sdma_driver_data sdma_imx6ul = {
+	.chnenbl0 = SDMA_CHNENBL0_IMX35,
+	.num_events = 48,
+	.script_addrs = &sdma_script_imx6q,
+	.ecspi_fixed = true,
+};
+
 static struct sdma_script_start_addrs sdma_script_imx7d = {
 	.ap_2_ap_addr = 644,
 	.uart_2_mcu_addr = 819,
@@ -589,6 +603,9 @@ static const struct platform_device_id sdma_devtypes[] = {
 		.name = "imx7d-sdma",
 		.driver_data = (unsigned long)&sdma_imx7d,
 	}, {
+		.name = "imx6ul-sdma",
+		.driver_data = (unsigned long)&sdma_imx6ul,
+	}, {
 		.name = "imx8mq-sdma",
 		.driver_data = (unsigned long)&sdma_imx8mq,
 	}, {
@@ -605,6 +622,7 @@ static const struct of_device_id sdma_dt_ids[] = {
 	{ .compatible = "fsl,imx31-sdma", .data = &sdma_imx31, },
 	{ .compatible = "fsl,imx25-sdma", .data = &sdma_imx25, },
 	{ .compatible = "fsl,imx7d-sdma", .data = &sdma_imx7d, },
+	{ .compatible = "fsl,imx6ul-sdma", .data = &sdma_imx6ul, },
 	{ .compatible = "fsl,imx8mq-sdma", .data = &sdma_imx8mq, },
 	{ /* sentinel */ }
 };
@@ -1174,8 +1192,17 @@ static int sdma_config_channel(struct dma_chan *chan)
 			if (sdmac->peripheral_type == IMX_DMATYPE_ASRC_SP ||
 			    sdmac->peripheral_type == IMX_DMATYPE_ASRC)
 				sdma_set_watermarklevel_for_p2p(sdmac);
-		} else
+		} else {
+			/*
+			 * ERR009165 fixed from i.mx6ul, no errata need,
+			 * set bit31 to let sdma script skip the errata.
+			 */
+			if (sdmac->peripheral_type == IMX_DMATYPE_CSPI &&
+			    sdmac->direction == DMA_MEM_TO_DEV &&
+			    sdmac->sdma->drvdata->ecspi_fixed)
+				__set_bit(31, &sdmac->watermark_level);
 			__set_bit(sdmac->event_id0, sdmac->event_mask);
+		}
 
 		/* Address */
 		sdmac->shp_addr = sdmac->per_address;
-- 
2.7.4


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v11 11/12] dma: imx-sdma: add i.mx6ul compatible name
  2020-07-24 18:51 [PATCH v11 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
                   ` (9 preceding siblings ...)
  2020-07-24 18:51 ` [PATCH v11 10/12] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul Robin Gong
@ 2020-07-24 18:51 ` Robin Gong
  2020-07-24 18:51 ` [PATCH v11 12/12] dmaengine: imx-sdma: add uart rom script Robin Gong
  11 siblings, 0 replies; 17+ messages in thread
From: Robin Gong @ 2020-07-24 18:51 UTC (permalink / raw)
  To: mark.rutland, broonie, robh+dt, catalin.marinas, vkoul,
	will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer,
	frieder.schrempf
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, linux-imx

Add i.mx6ul compatible name in binding doc.

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Reviewed-by: Rob Herring <robh@kernel.org>
---
 Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
index c9e9740..12c316f 100644
--- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
+++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
@@ -9,6 +9,7 @@ Required properties:
       "fsl,imx53-sdma"
       "fsl,imx6q-sdma"
       "fsl,imx7d-sdma"
+      "fsl,imx6ul-sdma"
       "fsl,imx8mq-sdma"
       "fsl,imx8mm-sdma"
       "fsl,imx8mn-sdma"
-- 
2.7.4


^ permalink raw reply	[flat|nested] 17+ messages in thread

* [PATCH v11 12/12] dmaengine: imx-sdma: add uart rom script
  2020-07-24 18:51 [PATCH v11 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
                   ` (10 preceding siblings ...)
  2020-07-24 18:51 ` [PATCH v11 11/12] dma: imx-sdma: add i.mx6ul compatible name Robin Gong
@ 2020-07-24 18:51 ` Robin Gong
  2020-08-10  7:32   ` Frieder Schrempf
  11 siblings, 1 reply; 17+ messages in thread
From: Robin Gong @ 2020-07-24 18:51 UTC (permalink / raw)
  To: mark.rutland, broonie, robh+dt, catalin.marinas, vkoul,
	will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer,
	frieder.schrempf
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, linux-imx

For the compatibility of NXP internal legacy kernel before 4.19 which
is based on uart ram script and upstreaming kernel based on uart rom
script, add both uart ram/rom script in latest sdma firmware. By default
uart rom script used.
Besides, add two multi-fifo scripts for SAI/PDM on i.mx8m/8mm and add
back qspi script miss for v4(i.mx7d/8m/8mm family, but v3 is for i.mx6).

rom script:
        uart_2_mcu_addr
	uartsh_2_mcu_addr /* through spba bus */
am script:
	uart_2_mcu_ram_addr
	uartsh_2_mcu_ram_addr /* through spba bus */

Please get latest sdma firmware from the below and put them into the path
(/lib/firmware/imx/sdma/):
https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
/tree/imx/sdma

Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Vinod Koul <vkoul@kernel.org>
---
 drivers/dma/imx-sdma.c                     | 4 ++--
 include/linux/platform_data/dma-imx-sdma.h | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 8735606..5900e32 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1729,8 +1729,8 @@ static void sdma_issue_pending(struct dma_chan *chan)
 
 #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1	34
 #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2	38
-#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3	41
-#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V4	42
+#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3	45
+#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V4	46
 
 static void sdma_add_scripts(struct sdma_engine *sdma,
 		const struct sdma_script_start_addrs *addr)
diff --git a/include/linux/platform_data/dma-imx-sdma.h b/include/linux/platform_data/dma-imx-sdma.h
index 30e676b..e12d2e8 100644
--- a/include/linux/platform_data/dma-imx-sdma.h
+++ b/include/linux/platform_data/dma-imx-sdma.h
@@ -20,12 +20,12 @@ struct sdma_script_start_addrs {
 	s32 per_2_firi_addr;
 	s32 mcu_2_firi_addr;
 	s32 uart_2_per_addr;
-	s32 uart_2_mcu_addr;
+	s32 uart_2_mcu_ram_addr;
 	s32 per_2_app_addr;
 	s32 mcu_2_app_addr;
 	s32 per_2_per_addr;
 	s32 uartsh_2_per_addr;
-	s32 uartsh_2_mcu_addr;
+	s32 uartsh_2_mcu_ram_addr;
 	s32 per_2_shp_addr;
 	s32 mcu_2_shp_addr;
 	s32 ata_2_mcu_addr;
@@ -52,6 +52,10 @@ struct sdma_script_start_addrs {
 	s32 zcanfd_2_mcu_addr;
 	s32 zqspi_2_mcu_addr;
 	s32 mcu_2_ecspi_addr;
+	s32 mcu_2_sai_addr;
+	s32 sai_2_mcu_addr;
+	s32 uart_2_mcu_addr;
+	s32 uartsh_2_mcu_addr;
 	/* End of v3 array */
 	s32 mcu_2_zqspi_addr;
 	/* End of v4 array */
-- 
2.7.4


^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH v11 12/12] dmaengine: imx-sdma: add uart rom script
  2020-07-24 18:51 ` [PATCH v11 12/12] dmaengine: imx-sdma: add uart rom script Robin Gong
@ 2020-08-10  7:32   ` Frieder Schrempf
  2020-08-10 10:57     ` Robin Gong
  0 siblings, 1 reply; 17+ messages in thread
From: Frieder Schrempf @ 2020-08-10  7:32 UTC (permalink / raw)
  To: Robin Gong, mark.rutland, broonie, robh+dt, catalin.marinas,
	vkoul, will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, linux-imx

Hi Robin,

On 24.07.20 20:51, Robin Gong wrote:
> For the compatibility of NXP internal legacy kernel before 4.19 which
> is based on uart ram script and upstreaming kernel based on uart rom
> script, add both uart ram/rom script in latest sdma firmware. By default
> uart rom script used.
> Besides, add two multi-fifo scripts for SAI/PDM on i.mx8m/8mm and add
> back qspi script miss for v4(i.mx7d/8m/8mm family, but v3 is for i.mx6).
> 
> rom script:
>          uart_2_mcu_addr
> 	uartsh_2_mcu_addr /* through spba bus */
> am script:
> 	uart_2_mcu_ram_addr
> 	uartsh_2_mcu_ram_addr /* through spba bus */
> 
> Please get latest sdma firmware from the below and put them into the path
> (/lib/firmware/imx/sdma/):
> https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgit.kernel.org%2Fpub%2Fscm%2Flinux%2Fkernel%2Fgit%2Ffirmware%2Flinux-firmware.git&amp;data=02%7C01%7Cfrieder.schrempf%40kontron.de%7Caa98331fadca476ca15c08d82fbdaf32%7C8c9d3c973fd941c8a2b1646f3942daf1%7C0%7C0%7C637311839017457806&amp;sdata=cbM33k4fdr0IAni1njQWgIrzxbEJ%2BQBkxN10fnagO6k%3D&amp;reserved=0
> /tree/imx/sdma
> 
> Signed-off-by: Robin Gong <yibin.gong@nxp.com>
> Acked-by: Vinod Koul <vkoul@kernel.org>

This patch seems to break UART DMA in case the ROM firmware is used. In 
that case sdma->script_number is set to SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1, 
so the ROM scripts at uart_2_mcu_addr and uartsh_2_mcu_addr will never 
be added in sdma_add_scripts() as they are now moved beyond the V1 max 
index.

Reverting this patch fixes UART DMA with ROM firmware.
Can you please find a way to fix this or just drop this change?

Thanks,
Frieder

> ---
>   drivers/dma/imx-sdma.c                     | 4 ++--
>   include/linux/platform_data/dma-imx-sdma.h | 8 ++++++--
>   2 files changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index 8735606..5900e32 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -1729,8 +1729,8 @@ static void sdma_issue_pending(struct dma_chan *chan)
>   
>   #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1	34
>   #define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2	38
> -#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3	41
> -#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V4	42
> +#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3	45
> +#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V4	46
>   
>   static void sdma_add_scripts(struct sdma_engine *sdma,
>   		const struct sdma_script_start_addrs *addr)
> diff --git a/include/linux/platform_data/dma-imx-sdma.h b/include/linux/platform_data/dma-imx-sdma.h
> index 30e676b..e12d2e8 100644
> --- a/include/linux/platform_data/dma-imx-sdma.h
> +++ b/include/linux/platform_data/dma-imx-sdma.h
> @@ -20,12 +20,12 @@ struct sdma_script_start_addrs {
>   	s32 per_2_firi_addr;
>   	s32 mcu_2_firi_addr;
>   	s32 uart_2_per_addr;
> -	s32 uart_2_mcu_addr;
> +	s32 uart_2_mcu_ram_addr;
>   	s32 per_2_app_addr;
>   	s32 mcu_2_app_addr;
>   	s32 per_2_per_addr;
>   	s32 uartsh_2_per_addr;
> -	s32 uartsh_2_mcu_addr;
> +	s32 uartsh_2_mcu_ram_addr;
>   	s32 per_2_shp_addr;
>   	s32 mcu_2_shp_addr;
>   	s32 ata_2_mcu_addr;
> @@ -52,6 +52,10 @@ struct sdma_script_start_addrs {
>   	s32 zcanfd_2_mcu_addr;
>   	s32 zqspi_2_mcu_addr;
>   	s32 mcu_2_ecspi_addr;
> +	s32 mcu_2_sai_addr;
> +	s32 sai_2_mcu_addr;
> +	s32 uart_2_mcu_addr;
> +	s32 uartsh_2_mcu_addr;
>   	/* End of v3 array */
>   	s32 mcu_2_zqspi_addr;
>   	/* End of v4 array */
> 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* RE: [PATCH v11 12/12] dmaengine: imx-sdma: add uart rom script
  2020-08-10  7:32   ` Frieder Schrempf
@ 2020-08-10 10:57     ` Robin Gong
  2020-08-10 13:06       ` Robert Schwebel
  2020-08-11  7:10       ` Frieder Schrempf
  0 siblings, 2 replies; 17+ messages in thread
From: Robin Gong @ 2020-08-10 10:57 UTC (permalink / raw)
  To: Frieder Schrempf, mark.rutland, broonie, robh+dt,
	catalin.marinas, vkoul, will.deacon, shawnguo, festevam, s.hauer,
	martin.fuzzey, u.kleine-koenig, dan.j.williams,
	matthias.schiffer
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, dl-linux-imx

On 2020/08/10 15:33 Frieder Schrempf <frieder.schrempf@kontron.de> wrote:
> Hi Robin,
> 
> This patch seems to break UART DMA in case the ROM firmware is used. In that
> case sdma->script_number is set to SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1, so
> the ROM scripts at uart_2_mcu_addr and uartsh_2_mcu_addr will never be
> added in sdma_add_scripts() as they are now moved beyond the V1 max index.
> 
> Reverting this patch fixes UART DMA with ROM firmware.
> Can you please find a way to fix this or just drop this change?
> 
Hi Frieder,
	Thanks for your report, could you try with the additional below patch?
If that works, I'll merge it into next version.

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 5900e32..4db55b9 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1754,6 +1754,19 @@ static void sdma_add_scripts(struct sdma_engine *sdma,
        for (i = 0; i < sdma->script_number; i++)
                if (addr_arr[i] > 0)
                        saddr_arr[i] = addr_arr[i];
+
+       /*
+        * get uart_2_mcu_addr/uartsh_2_mcu_addr rom script specially because
+        * they are now replaced by uart_2_mcu_ram_addr/uartsh_2_mcu_ram_addr
+        * to be compatible with legacy freescal/nxp sdma firmware, and they
+        * are located in the bottom part of sdma_script_start_addrs which are
+        * beyond the SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1.
+        */
+       if (addr->uart_2_mcu_addr)
+               sdma->script_addrs->uart_2_mcu_addr = addr->uart_2_mcu_addr;
+       if (addr->uartsh_2_mcu_addr)
+               sdma->script_addrs->uartsh_2_mcu_addr = addr->uartsh_2_mcu_addr;
+
 }



^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH v11 12/12] dmaengine: imx-sdma: add uart rom script
  2020-08-10 10:57     ` Robin Gong
@ 2020-08-10 13:06       ` Robert Schwebel
  2020-08-11  7:10       ` Frieder Schrempf
  1 sibling, 0 replies; 17+ messages in thread
From: Robert Schwebel @ 2020-08-10 13:06 UTC (permalink / raw)
  To: Robin Gong
  Cc: Frieder Schrempf, mark.rutland, broonie, robh+dt,
	catalin.marinas, vkoul, will.deacon, shawnguo, festevam, s.hauer,
	martin.fuzzey, u.kleine-koenig, dan.j.williams,
	matthias.schiffer, devicetree, linux-kernel, linux-spi,
	dl-linux-imx, kernel, dmaengine, linux-arm-kernel

On Mon, Aug 10, 2020 at 10:57:42AM +0000, Robin Gong wrote:
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index 5900e32..4db55b9 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -1754,6 +1754,19 @@ static void sdma_add_scripts(struct sdma_engine *sdma,
>         for (i = 0; i < sdma->script_number; i++)
>                 if (addr_arr[i] > 0)
>                         saddr_arr[i] = addr_arr[i];
> +
> +       /*
> +        * get uart_2_mcu_addr/uartsh_2_mcu_addr rom script specially because
> +        * they are now replaced by uart_2_mcu_ram_addr/uartsh_2_mcu_ram_addr
> +        * to be compatible with legacy freescal/nxp sdma firmware, and they

freescale

> +        * are located in the bottom part of sdma_script_start_addrs which are
> +        * beyond the SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1.
> +        */

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PATCH v11 12/12] dmaengine: imx-sdma: add uart rom script
  2020-08-10 10:57     ` Robin Gong
  2020-08-10 13:06       ` Robert Schwebel
@ 2020-08-11  7:10       ` Frieder Schrempf
  1 sibling, 0 replies; 17+ messages in thread
From: Frieder Schrempf @ 2020-08-11  7:10 UTC (permalink / raw)
  To: Robin Gong, mark.rutland, broonie, robh+dt, catalin.marinas,
	vkoul, will.deacon, shawnguo, festevam, s.hauer, martin.fuzzey,
	u.kleine-koenig, dan.j.williams, matthias.schiffer
  Cc: linux-spi, linux-kernel, devicetree, linux-arm-kernel, kernel,
	dmaengine, dl-linux-imx

On 10.08.20 12:57, Robin Gong wrote:
> On 2020/08/10 15:33 Frieder Schrempf <frieder.schrempf@kontron.de> wrote:
>> Hi Robin,
>>
>> This patch seems to break UART DMA in case the ROM firmware is used. In that
>> case sdma->script_number is set to SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1, so
>> the ROM scripts at uart_2_mcu_addr and uartsh_2_mcu_addr will never be
>> added in sdma_add_scripts() as they are now moved beyond the V1 max index.
>>
>> Reverting this patch fixes UART DMA with ROM firmware.
>> Can you please find a way to fix this or just drop this change?
>>
> Hi Frieder,
> 	Thanks for your report, could you try with the additional below patch?
> If that works, I'll merge it into next version.

Sorry, I can't promise to find the time to spin up a test for this 
anytime soon. But the diff looks like it would work.

It would be nice if we could get this patchset merged soon, as it also 
seems to provide fixes for SPI on i.MX8MM. So any help with reviewing 
and testing is appreciated.

> 
> diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
> index 5900e32..4db55b9 100644
> --- a/drivers/dma/imx-sdma.c
> +++ b/drivers/dma/imx-sdma.c
> @@ -1754,6 +1754,19 @@ static void sdma_add_scripts(struct sdma_engine *sdma,
>          for (i = 0; i < sdma->script_number; i++)
>                  if (addr_arr[i] > 0)
>                          saddr_arr[i] = addr_arr[i];
> +
> +       /*
> +        * get uart_2_mcu_addr/uartsh_2_mcu_addr rom script specially because
> +        * they are now replaced by uart_2_mcu_ram_addr/uartsh_2_mcu_ram_addr
> +        * to be compatible with legacy freescal/nxp sdma firmware, and they
> +        * are located in the bottom part of sdma_script_start_addrs which are
> +        * beyond the SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1.
> +        */
> +       if (addr->uart_2_mcu_addr)
> +               sdma->script_addrs->uart_2_mcu_addr = addr->uart_2_mcu_addr;
> +       if (addr->uartsh_2_mcu_addr)
> +               sdma->script_addrs->uartsh_2_mcu_addr = addr->uartsh_2_mcu_addr;
> +
>   }
> 
> 

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, back to index

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-24 18:51 [PATCH v11 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
2020-07-24 18:51 ` [PATCH v11 01/12] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" Robin Gong
2020-07-24 18:51 ` [PATCH v11 02/12] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" Robin Gong
2020-07-24 18:51 ` [PATCH v11 03/12] Revert "dmaengine: imx-sdma: refine to load context only once" Robin Gong
2020-07-24 18:51 ` [PATCH v11 04/12] dmaengine: imx-sdma: remove duplicated sdma_load_context Robin Gong
2020-07-24 18:51 ` [PATCH v11 05/12] dmaengine: dma: imx-sdma: add fw_loaded and is_ram_script Robin Gong
2020-07-24 18:51 ` [PATCH v11 06/12] dmaengine: imx-sdma: add mcu_2_ecspi script Robin Gong
2020-07-24 18:51 ` [PATCH v11 07/12] spi: imx: fix ERR009165 Robin Gong
2020-07-24 18:51 ` [PATCH v11 08/12] spi: imx: remove ERR009165 workaround on i.mx6ul Robin Gong
2020-07-24 18:51 ` [PATCH v11 09/12] spi: imx: add new i.mx6ul compatible name in binding doc Robin Gong
2020-07-24 18:51 ` [PATCH v11 10/12] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul Robin Gong
2020-07-24 18:51 ` [PATCH v11 11/12] dma: imx-sdma: add i.mx6ul compatible name Robin Gong
2020-07-24 18:51 ` [PATCH v11 12/12] dmaengine: imx-sdma: add uart rom script Robin Gong
2020-08-10  7:32   ` Frieder Schrempf
2020-08-10 10:57     ` Robin Gong
2020-08-10 13:06       ` Robert Schwebel
2020-08-11  7:10       ` Frieder Schrempf

Linux-SPI Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-spi/0 linux-spi/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-spi linux-spi/ https://lore.kernel.org/linux-spi \
		linux-spi@vger.kernel.org
	public-inbox-index linux-spi

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-spi


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git