* [PATCH v4 01/14] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core"
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
@ 2019-05-22 9:59 ` Robin Gong
2019-05-22 9:59 ` [PATCH v4 02/14] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" Robin Gong
` (13 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Robin Gong @ 2019-05-22 9:59 UTC (permalink / raw)
To: robh, broonie, shawnguo, s.hauer, festevam, mark.rutland, vkoul,
dan.j.williams, u.kleine-koenig, plyatov, catalin.marinas,
l.stach
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
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>
---
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 d038f41..7175898 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -172,7 +172,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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 02/14] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores"
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
2019-05-22 9:59 ` [PATCH v4 01/14] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" Robin Gong
@ 2019-05-22 9:59 ` Robin Gong
2019-05-22 9:59 ` [PATCH v4 03/14] Revert "dmaengine: imx-sdma: refine to load context only once" Robin Gong
` (12 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Robin Gong @ 2019-05-22 9:59 UTC (permalink / raw)
To: robh, broonie, shawnguo, s.hauer, festevam, mark.rutland, vkoul,
dan.j.williams, u.kleine-koenig, plyatov, catalin.marinas,
l.stach
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
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>
---
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 b3a77bc..a90f217 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -339,7 +339,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";
};
@@ -353,7 +353,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";
};
@@ -367,7 +367,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";
};
@@ -381,7 +381,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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 03/14] Revert "dmaengine: imx-sdma: refine to load context only once"
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
2019-05-22 9:59 ` [PATCH v4 01/14] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" Robin Gong
2019-05-22 9:59 ` [PATCH v4 02/14] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" Robin Gong
@ 2019-05-22 9:59 ` Robin Gong
2019-05-22 10:00 ` [PATCH v4 04/14] dmaengine: imx-sdma: remove dupilicated sdma_load_context Robin Gong
` (11 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Robin Gong @ 2019-05-22 9:59 UTC (permalink / raw)
To: robh, broonie, shawnguo, s.hauer, festevam, mark.rutland, vkoul,
dan.j.williams, u.kleine-koenig, plyatov, catalin.marinas,
l.stach
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
This reverts commit ad0d92d7ba6aecbe2705907c38ff8d8be4da1e9c, because
in spi-imx case, burst length may be changed dynamically.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
---
drivers/dma/imx-sdma.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 99d9f43..407a56e 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;
};
@@ -988,9 +987,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)
@@ -1033,8 +1029,6 @@ static int sdma_load_context(struct sdma_channel *sdmac)
spin_unlock_irqrestore(&sdma->channel_0_lock, flags);
- sdmac->context_loaded = true;
-
return ret;
}
@@ -1074,7 +1068,6 @@ static void sdma_channel_terminate_work(struct work_struct *work)
sdmac->desc = NULL;
spin_unlock_irqrestore(&sdmac->vc.lock, flags);
vchan_dma_desc_free_list(&sdmac->vc, &head);
- sdmac->context_loaded = false;
}
static int sdma_disable_channel_async(struct dma_chan *chan)
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 04/14] dmaengine: imx-sdma: remove dupilicated sdma_load_context
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
` (2 preceding siblings ...)
2019-05-22 9:59 ` [PATCH v4 03/14] Revert "dmaengine: imx-sdma: refine to load context only once" Robin Gong
@ 2019-05-22 10:00 ` Robin Gong
2019-05-22 10:00 ` [PATCH v4 05/14] dmaengine: imx-sdma: add mcu_2_ecspi script Robin Gong
` (10 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Robin Gong @ 2019-05-22 10:00 UTC (permalink / raw)
To: robh, broonie, shawnguo, s.hauer, festevam, mark.rutland, vkoul,
dan.j.williams, u.kleine-koenig, plyatov, catalin.marinas,
l.stach
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
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 407a56e..86a31b4 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1134,7 +1134,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);
@@ -1174,9 +1173,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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 05/14] dmaengine: imx-sdma: add mcu_2_ecspi script
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
` (3 preceding siblings ...)
2019-05-22 10:00 ` [PATCH v4 04/14] dmaengine: imx-sdma: remove dupilicated sdma_load_context Robin Gong
@ 2019-05-22 10:00 ` Robin Gong
2019-05-22 10:00 ` [PATCH v4 06/14] spi: imx: fix ERR009165 Robin Gong
` (9 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Robin Gong @ 2019-05-22 10:00 UTC (permalink / raw)
To: robh, broonie, shawnguo, s.hauer, festevam, mark.rutland, vkoul,
dan.j.williams, u.kleine-koenig, plyatov, catalin.marinas,
l.stach
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
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 | 3 +++
include/linux/platform_data/dma-imx-sdma.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 86a31b4..352b0d5 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -924,6 +924,9 @@ 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;
+ break;
case IMX_DMATYPE_EXT:
case IMX_DMATYPE_SSI:
case IMX_DMATYPE_SAI:
diff --git a/include/linux/platform_data/dma-imx-sdma.h b/include/linux/platform_data/dma-imx-sdma.h
index 6eaa53c..f794fee 100644
--- a/include/linux/platform_data/dma-imx-sdma.h
+++ b/include/linux/platform_data/dma-imx-sdma.h
@@ -51,6 +51,7 @@ struct sdma_script_start_addrs {
/* End of v2 array */
s32 zcanfd_2_mcu_addr;
s32 zqspi_2_mcu_addr;
+ s32 mcu_2_ecspi_addr;
/* End of v3 array */
};
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 06/14] spi: imx: fix ERR009165
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
` (4 preceding siblings ...)
2019-05-22 10:00 ` [PATCH v4 05/14] dmaengine: imx-sdma: add mcu_2_ecspi script Robin Gong
@ 2019-05-22 10:00 ` Robin Gong
2019-05-22 10:00 ` [PATCH v4 07/14] spi: imx: remove ERR009165 workaround on i.mx6ul Robin Gong
` (8 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Robin Gong @ 2019-05-22 10:00 UTC (permalink / raw)
To: robh, broonie, shawnguo, s.hauer, festevam, mark.rutland, vkoul,
dan.j.williams, u.kleine-koenig, plyatov, catalin.marinas,
l.stach
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
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 | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 09c9a1e..6795910 100644
--- a/drivers/spi/spi-imx.c
+++ b/drivers/spi/spi-imx.c
@@ -585,8 +585,9 @@ 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 */
if (spi_imx->usedma)
- ctrl |= MX51_ECSPI_CTRL_SMC;
+ ctrl &= ~MX51_ECSPI_CTRL_SMC;
writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL);
@@ -612,12 +613,14 @@ 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;
+
/*
* 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(spi_imx->wml) |
+ 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);
@@ -1171,7 +1174,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 +1272,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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 07/14] spi: imx: remove ERR009165 workaround on i.mx6ul
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
` (5 preceding siblings ...)
2019-05-22 10:00 ` [PATCH v4 06/14] spi: imx: fix ERR009165 Robin Gong
@ 2019-05-22 10:00 ` Robin Gong
2019-05-22 10:00 ` [PATCH v4 08/14] spi: imx: add new i.mx6ul compatible name in binding doc Robin Gong
` (7 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Robin Gong @ 2019-05-22 10:00 UTC (permalink / raw)
To: robh, broonie, shawnguo, s.hauer, festevam, mark.rutland, vkoul,
dan.j.williams, u.kleine-koenig, plyatov, catalin.marinas,
l.stach
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
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, 45 insertions(+), 5 deletions(-)
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 6795910..91660dc 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;
@@ -75,6 +76,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;
};
@@ -128,7 +134,8 @@ static inline int is_imx35_cspi(struct spi_imx_data *d)
static inline int is_imx51_ecspi(struct spi_imx_data *d)
{
- return d->devtype_data->devtype == IMX51_ECSPI;
+ return d->devtype_data->devtype == IMX51_ECSPI ||
+ d->devtype_data->devtype == IMX6UL_ECSPI;
}
static inline int is_imx53_ecspi(struct spi_imx_data *d)
@@ -585,9 +592,16 @@ 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 */
- if (spi_imx->usedma)
- 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) {
+ if (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);
@@ -615,6 +629,8 @@ 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.
@@ -1012,6 +1028,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",
@@ -1035,6 +1068,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 */
}
};
@@ -1047,6 +1083,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);
@@ -1178,7 +1215,10 @@ static int spi_imx_dma_configure(struct spi_master *master)
* 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;
+ if (spi_imx->devtype_data->tx_glitch_fixed)
+ tx.dst_maxburst = spi_imx->wml;
+ else
+ 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);
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 08/14] spi: imx: add new i.mx6ul compatible name in binding doc
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
` (6 preceding siblings ...)
2019-05-22 10:00 ` [PATCH v4 07/14] spi: imx: remove ERR009165 workaround on i.mx6ul Robin Gong
@ 2019-05-22 10:00 ` Robin Gong
2019-05-22 10:00 ` [PATCH v4 09/14] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul Robin Gong
` (6 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Robin Gong @ 2019-05-22 10:00 UTC (permalink / raw)
To: robh, broonie, shawnguo, s.hauer, festevam, mark.rutland, vkoul,
dan.j.williams, u.kleine-koenig, plyatov, catalin.marinas,
l.stach
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
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>
---
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 2d32641..b3d02a3 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.MX8M
- reg : Offset and length of the register set for the device
- interrupts : Should contain CSPI/eCSPI interrupt
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 09/14] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
` (7 preceding siblings ...)
2019-05-22 10:00 ` [PATCH v4 08/14] spi: imx: add new i.mx6ul compatible name in binding doc Robin Gong
@ 2019-05-22 10:00 ` Robin Gong
2019-05-22 10:00 ` [PATCH v4 10/14] dma: imx-sdma: add i.mx6ul/6sx compatible name Robin Gong
` (5 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Robin Gong @ 2019-05-22 10:00 UTC (permalink / raw)
To: robh, broonie, shawnguo, s.hauer, festevam, mark.rutland, vkoul,
dan.j.williams, u.kleine-koenig, plyatov, catalin.marinas,
l.stach
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
ECSPI issue fixed from i.mx6ul at hardware level, no need
ERR009165 anymore on those chips such as i.mx8mq. Add i.mx6sx
from where i.mx6ul source.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Acked-by: Vinod Koul <vkoul@kernel.org>
---
drivers/dma/imx-sdma.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 352b0d5..a495c7f 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -419,6 +419,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 {
@@ -539,6 +546,31 @@ static struct sdma_driver_data sdma_imx6q = {
.script_addrs = &sdma_script_imx6q,
};
+static struct sdma_script_start_addrs sdma_script_imx6sx = {
+ .ap_2_ap_addr = 642,
+ .uart_2_mcu_addr = 817,
+ .mcu_2_app_addr = 747,
+ .uartsh_2_mcu_addr = 1032,
+ .mcu_2_shp_addr = 960,
+ .app_2_mcu_addr = 683,
+ .shp_2_mcu_addr = 891,
+ .spdif_2_mcu_addr = 1100,
+ .mcu_2_spdif_addr = 1134,
+};
+
+static struct sdma_driver_data sdma_imx6sx = {
+ .chnenbl0 = SDMA_CHNENBL0_IMX35,
+ .num_events = 48,
+ .script_addrs = &sdma_script_imx6sx,
+};
+
+static struct sdma_driver_data sdma_imx6ul = {
+ .chnenbl0 = SDMA_CHNENBL0_IMX35,
+ .num_events = 48,
+ .script_addrs = &sdma_script_imx6sx,
+ .ecspi_fixed = true,
+};
+
static struct sdma_script_start_addrs sdma_script_imx7d = {
.ap_2_ap_addr = 644,
.uart_2_mcu_addr = 819,
@@ -584,9 +616,15 @@ static const struct platform_device_id sdma_devtypes[] = {
.name = "imx6q-sdma",
.driver_data = (unsigned long)&sdma_imx6q,
}, {
+ .name = "imx6sx-sdma",
+ .driver_data = (unsigned long)&sdma_imx6sx,
+ }, {
.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,
}, {
@@ -602,7 +640,9 @@ static const struct of_device_id sdma_dt_ids[] = {
{ .compatible = "fsl,imx35-sdma", .data = &sdma_imx35, },
{ .compatible = "fsl,imx31-sdma", .data = &sdma_imx31, },
{ .compatible = "fsl,imx25-sdma", .data = &sdma_imx25, },
+ { .compatible = "fsl,imx6sx-sdma", .data = &sdma_imx6sx, },
{ .compatible = "fsl,imx7d-sdma", .data = &sdma_imx7d, },
+ { .compatible = "fsl,imx6ul-sdma", .data = &sdma_imx6ul, },
{ .compatible = "fsl,imx8mq-sdma", .data = &sdma_imx8mq, },
{ /* sentinel */ }
};
@@ -1166,8 +1206,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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 10/14] dma: imx-sdma: add i.mx6ul/6sx compatible name
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
` (8 preceding siblings ...)
2019-05-22 10:00 ` [PATCH v4 09/14] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul Robin Gong
@ 2019-05-22 10:00 ` Robin Gong
2019-05-22 13:51 ` Rob Herring
2019-05-22 10:00 ` [PATCH v4 11/14] dmaengine: imx-sdma: fix ecspi1 rx dma not work on i.mx8mm Robin Gong
` (4 subsequent siblings)
14 siblings, 1 reply; 19+ messages in thread
From: Robin Gong @ 2019-05-22 10:00 UTC (permalink / raw)
To: robh, broonie, shawnguo, s.hauer, festevam, mark.rutland, vkoul,
dan.j.williams, u.kleine-koenig, plyatov, catalin.marinas,
l.stach
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
Add i.mx6ul and i.mx6sx compatible name in binding doc.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
---
Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
index 9d8bbac..d024a83 100644
--- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
+++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt
@@ -9,6 +9,8 @@ Required properties:
"fsl,imx53-sdma"
"fsl,imx6q-sdma"
"fsl,imx7d-sdma"
+ "fsl,imx6sx-sdma"
+ "fsl,imx6ul-sdma"
"fsl,imx8mq-sdma"
The -to variants should be preferred since they allow to determine the
correct ROM script addresses needed for the driver to work without additional
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v4 10/14] dma: imx-sdma: add i.mx6ul/6sx compatible name
2019-05-22 10:00 ` [PATCH v4 10/14] dma: imx-sdma: add i.mx6ul/6sx compatible name Robin Gong
@ 2019-05-22 13:51 ` Rob Herring
2019-05-23 2:08 ` [EXT] " Robin Gong
0 siblings, 1 reply; 19+ messages in thread
From: Rob Herring @ 2019-05-22 13:51 UTC (permalink / raw)
To: Robin Gong
Cc: mark.rutland, robh, catalin.marinas, devicetree, festevam,
s.hauer, plyatov, linux-kernel, linux-spi, vkoul, broonie,
dl-linux-imx, kernel, u.kleine-koenig, dmaengine, dan.j.williams,
shawnguo, linux-arm-kernel, l.stach
On Wed, 22 May 2019 10:00:38 +0000, Robin Gong wrote:
> Add i.mx6ul and i.mx6sx compatible name in binding doc.
>
> Signed-off-by: Robin Gong <yibin.gong@nxp.com>
> ---
> Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | 2 ++
> 1 file changed, 2 insertions(+)
>
Please add Acked-by/Reviewed-by tags when posting new versions. However,
there's no need to repost patches *only* to add the tags. The upstream
maintainer will do that for acks received on the version they apply.
If a tag was not added on purpose, please state why and what changed.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 19+ messages in thread
* RE: [EXT] Re: [PATCH v4 10/14] dma: imx-sdma: add i.mx6ul/6sx compatible name
2019-05-22 13:51 ` Rob Herring
@ 2019-05-23 2:08 ` Robin Gong
0 siblings, 0 replies; 19+ messages in thread
From: Robin Gong @ 2019-05-23 2:08 UTC (permalink / raw)
To: Rob Herring
Cc: mark.rutland, devicetree, catalin.marinas, shawnguo, s.hauer,
plyatov, linux-kernel, linux-spi, vkoul, broonie, dl-linux-imx,
kernel, u.kleine-koenig, dmaengine, dan.j.williams, festevam,
linux-arm-kernel, l.stach
Hi Rob,
Thank you for your reminding, I have added Acked-by tags gotten from Mark and Vinod in v4 patch set, but there is still one update (
remove checking 'event_id1' zero as 'event_id0'.) for Vinod's concern, so I sent new v4.
> -----Original Message-----
> From: Rob Herring <robh@kernel.org>
> Sent: 2019年5月22日 21:51>
> On Wed, 22 May 2019 10:00:38 +0000, Robin Gong wrote:
> > Add i.mx6ul and i.mx6sx compatible name in binding doc.
> >
> > Signed-off-by: Robin Gong <yibin.gong@nxp.com>
> > ---
> > Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | 2 ++
> > 1 file changed, 2 insertions(+)
> >
>
> Please add Acked-by/Reviewed-by tags when posting new versions. However,
> there's no need to repost patches *only* to add the tags. The upstream
> maintainer will do that for acks received on the version they apply.
>
> If a tag was not added on purpose, please state why and what changed.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v4 11/14] dmaengine: imx-sdma: fix ecspi1 rx dma not work on i.mx8mm
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
` (9 preceding siblings ...)
2019-05-22 10:00 ` [PATCH v4 10/14] dma: imx-sdma: add i.mx6ul/6sx compatible name Robin Gong
@ 2019-05-22 10:00 ` Robin Gong
2019-05-23 5:34 ` Vinod Koul
2019-05-22 10:00 ` [PATCH v4 12/14] ARM: dts: imx6ul: add dma support on ecspi Robin Gong
` (3 subsequent siblings)
14 siblings, 1 reply; 19+ messages in thread
From: Robin Gong @ 2019-05-22 10:00 UTC (permalink / raw)
To: robh, broonie, shawnguo, s.hauer, festevam, mark.rutland, vkoul,
dan.j.williams, u.kleine-koenig, plyatov, catalin.marinas,
l.stach
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
Because the number of ecspi1 rx event on i.mx8mm is 0, the condition
check ignore such special case without dma channel enabled, which caused
ecspi1 rx works failed. Actually, no need to check event_id0/event_id1
and replace checking 'event_id1' with 'DMA_DEV_TO_DEV', so that configure
event_id1 only in case DEV_TO_DEV.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
---
drivers/dma/imx-sdma.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index a495c7f..b692783 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -1202,7 +1202,7 @@ static int sdma_config_channel(struct dma_chan *chan)
if ((sdmac->peripheral_type != IMX_DMATYPE_MEMORY) &&
(sdmac->peripheral_type != IMX_DMATYPE_DSP)) {
/* Handle multiple event channels differently */
- if (sdmac->event_id1) {
+ if (sdmac->direction == DMA_DEV_TO_DEV) {
if (sdmac->peripheral_type == IMX_DMATYPE_ASRC_SP ||
sdmac->peripheral_type == IMX_DMATYPE_ASRC)
sdma_set_watermarklevel_for_p2p(sdmac);
@@ -1370,9 +1370,9 @@ static void sdma_free_chan_resources(struct dma_chan *chan)
sdma_channel_synchronize(chan);
- if (sdmac->event_id0)
- sdma_event_disable(sdmac, sdmac->event_id0);
- if (sdmac->event_id1)
+ sdma_event_disable(sdmac, sdmac->event_id0);
+
+ if (sdmac->direction == DMA_DEV_TO_DEV)
sdma_event_disable(sdmac, sdmac->event_id1);
sdmac->event_id0 = 0;
@@ -1670,13 +1670,11 @@ static int sdma_config(struct dma_chan *chan,
memcpy(&sdmac->slave_config, dmaengine_cfg, sizeof(*dmaengine_cfg));
/* Set ENBLn earlier to make sure dma request triggered after that */
- if (sdmac->event_id0) {
- if (sdmac->event_id0 >= sdmac->sdma->drvdata->num_events)
- return -EINVAL;
- sdma_event_enable(sdmac, sdmac->event_id0);
- }
+ if (sdmac->event_id0 >= sdmac->sdma->drvdata->num_events)
+ return -EINVAL;
+ sdma_event_enable(sdmac, sdmac->event_id0);
- if (sdmac->event_id1) {
+ if (sdmac->direction == DMA_DEV_TO_DEV) {
if (sdmac->event_id1 >= sdmac->sdma->drvdata->num_events)
return -EINVAL;
sdma_event_enable(sdmac, sdmac->event_id1);
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v4 11/14] dmaengine: imx-sdma: fix ecspi1 rx dma not work on i.mx8mm
2019-05-22 10:00 ` [PATCH v4 11/14] dmaengine: imx-sdma: fix ecspi1 rx dma not work on i.mx8mm Robin Gong
@ 2019-05-23 5:34 ` Vinod Koul
0 siblings, 0 replies; 19+ messages in thread
From: Vinod Koul @ 2019-05-23 5:34 UTC (permalink / raw)
To: Robin Gong
Cc: mark.rutland, robh, catalin.marinas, devicetree, festevam,
s.hauer, plyatov, linux-kernel, linux-spi, broonie, dl-linux-imx,
kernel, u.kleine-koenig, dmaengine, dan.j.williams, shawnguo,
linux-arm-kernel, l.stach
On 22-05-19, 10:00, Robin Gong wrote:
> Because the number of ecspi1 rx event on i.mx8mm is 0, the condition
> check ignore such special case without dma channel enabled, which caused
> ecspi1 rx works failed. Actually, no need to check event_id0/event_id1
> and replace checking 'event_id1' with 'DMA_DEV_TO_DEV', so that configure
> event_id1 only in case DEV_TO_DEV.
Acked-by: Vinod Koul <vkoul@kernel.org>
--
~Vinod
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v4 12/14] ARM: dts: imx6ul: add dma support on ecspi
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
` (10 preceding siblings ...)
2019-05-22 10:00 ` [PATCH v4 11/14] dmaengine: imx-sdma: fix ecspi1 rx dma not work on i.mx8mm Robin Gong
@ 2019-05-22 10:00 ` Robin Gong
2019-05-22 10:00 ` [PATCH v4 13/14] ARM: dts: imx6sll: correct sdma compatible Robin Gong
` (2 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Robin Gong @ 2019-05-22 10:00 UTC (permalink / raw)
To: robh, broonie, shawnguo, s.hauer, festevam, mark.rutland, vkoul,
dan.j.williams, u.kleine-koenig, plyatov, catalin.marinas,
l.stach
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
Add dma support on ecspi.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
---
arch/arm/boot/dts/imx6ul.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index bbf010c..880b9ee 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -226,6 +226,8 @@
clocks = <&clks IMX6UL_CLK_ECSPI1>,
<&clks IMX6UL_CLK_ECSPI1>;
clock-names = "ipg", "per";
+ dmas = <&sdma 3 7 1>, <&sdma 4 7 2>;
+ dma-names = "rx", "tx";
status = "disabled";
};
@@ -238,6 +240,8 @@
clocks = <&clks IMX6UL_CLK_ECSPI2>,
<&clks IMX6UL_CLK_ECSPI2>;
clock-names = "ipg", "per";
+ dmas = <&sdma 5 7 1>, <&sdma 6 7 2>;
+ dma-names = "rx", "tx";
status = "disabled";
};
@@ -250,6 +254,8 @@
clocks = <&clks IMX6UL_CLK_ECSPI3>,
<&clks IMX6UL_CLK_ECSPI3>;
clock-names = "ipg", "per";
+ dmas = <&sdma 7 7 1>, <&sdma 8 7 2>;
+ dma-names = "rx", "tx";
status = "disabled";
};
@@ -262,6 +268,8 @@
clocks = <&clks IMX6UL_CLK_ECSPI4>,
<&clks IMX6UL_CLK_ECSPI4>;
clock-names = "ipg", "per";
+ dmas = <&sdma 9 7 1>, <&sdma 10 7 2>;
+ dma-names = "rx", "tx";
status = "disabled";
};
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 13/14] ARM: dts: imx6sll: correct sdma compatible
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
` (11 preceding siblings ...)
2019-05-22 10:00 ` [PATCH v4 12/14] ARM: dts: imx6ul: add dma support on ecspi Robin Gong
@ 2019-05-22 10:00 ` Robin Gong
2019-05-22 10:01 ` [PATCH v4 14/14] arm64: defconfig: Enable SDMA on i.mx8mq/8mm Robin Gong
2019-05-22 10:10 ` [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Lucas Stach
14 siblings, 0 replies; 19+ messages in thread
From: Robin Gong @ 2019-05-22 10:00 UTC (permalink / raw)
To: robh, broonie, shawnguo, s.hauer, festevam, mark.rutland, vkoul,
dan.j.williams, u.kleine-koenig, plyatov, catalin.marinas,
l.stach
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
Correct sdma compatible since ecspi errata ERR009165 has been fixed
on i.mx6sll as i.mx6ul.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
---
arch/arm/boot/dts/imx6sll.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi
index 1b4899f..d810e10 100644
--- a/arch/arm/boot/dts/imx6sll.dtsi
+++ b/arch/arm/boot/dts/imx6sll.dtsi
@@ -619,7 +619,7 @@
};
sdma: dma-controller@20ec000 {
- compatible = "fsl,imx6sll-sdma", "fsl,imx35-sdma";
+ compatible = "fsl,imx6sll-sdma", "fsl,imx6ul-sdma";
reg = <0x020ec000 0x4000>;
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SLL_CLK_IPG>,
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v4 14/14] arm64: defconfig: Enable SDMA on i.mx8mq/8mm
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
` (12 preceding siblings ...)
2019-05-22 10:00 ` [PATCH v4 13/14] ARM: dts: imx6sll: correct sdma compatible Robin Gong
@ 2019-05-22 10:01 ` Robin Gong
2019-05-22 10:10 ` [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Lucas Stach
14 siblings, 0 replies; 19+ messages in thread
From: Robin Gong @ 2019-05-22 10:01 UTC (permalink / raw)
To: robh, broonie, shawnguo, s.hauer, festevam, mark.rutland, vkoul,
dan.j.williams, u.kleine-koenig, plyatov, catalin.marinas,
l.stach
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
Enable SDMA support on i.mx8mq/8mm chips, including enabling
CONFIG_FW_LOADER_USER_HELPER/CONFIG_FW_LOADER_USER_HELPER_FALLBACK
for firmware loaded by udev.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
---
arch/arm64/configs/defconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index c12c505..2ffea30 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -198,6 +198,8 @@ CONFIG_PCIE_HISI_STB=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_FW_LOADER_USER_HELPER=y
+CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
CONFIG_HISILICON_LPC=y
CONFIG_SIMPLE_PM_BUS=y
CONFIG_MTD=y
@@ -630,6 +632,7 @@ CONFIG_RTC_DRV_IMX_SC=m
CONFIG_RTC_DRV_XGENE=y
CONFIG_DMADEVICES=y
CONFIG_DMA_BCM2835=m
+CONFIG_IMX_SDMA=y
CONFIG_K3_DMA=y
CONFIG_MV_XOR=y
CONFIG_MV_XOR_V2=y
--
2.7.4
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family
2019-05-22 9:59 [PATCH v4 00/14] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
` (13 preceding siblings ...)
2019-05-22 10:01 ` [PATCH v4 14/14] arm64: defconfig: Enable SDMA on i.mx8mq/8mm Robin Gong
@ 2019-05-22 10:10 ` Lucas Stach
14 siblings, 0 replies; 19+ messages in thread
From: Lucas Stach @ 2019-05-22 10:10 UTC (permalink / raw)
To: Robin Gong, robh, broonie, shawnguo, s.hauer, festevam,
mark.rutland, vkoul, dan.j.williams, u.kleine-koenig, plyatov,
catalin.marinas
Cc: devicetree, linux-kernel, linux-spi, dl-linux-imx, kernel,
dmaengine, linux-arm-kernel
Hi Robin,
Am Mittwoch, den 22.05.2019, 09:59 +0000 schrieb Robin Gong:
> 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
I haven't tested this so asking the obvious question: what happens when
this series is applied without the RAM script being present on the
system? Will it render SPI unusable? I guess so since it changes the
flow between the SPI core and DMA controller. Can we somehow detect
that SDMA isn't using the correct RAM script and fall back to PIO mode
in the SPI driver in that case?
Currently using the RAM script is not an option in a lot of use-cases,
as it still breaks serial DMA support. The fix for the serial issue
really needs to be remove the broken serial script from the RAM
firmware, not change the serial driver to deal with the broken behavior
introduced by the RAM script.
Regards,
Lucas
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 19+ messages in thread