From: yibin.gong@nxp.com
To: robh+dt@kernel.org, mark.rutland@arm.com, shawnguo@kernel.org,
s.hauer@pengutronix.de, kernel@pengutronix.de,
broonie@kernel.org, festevam@gmail.com, vkoul@kernel.org,
dan.j.williams@intel.com, u.kleine-koenig@pengutronix.de,
catalin.marinas@arm.com, l.stach@pengutronix.de,
will.deacon@arm.com
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-spi@vger.kernel.org, linux-imx@nxp.com,
dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 06/15] spi: imx: fix ERR009165
Date: Mon, 10 Jun 2019 16:17:44 +0800 [thread overview]
Message-ID: <20190610081753.11422-7-yibin.gong@nxp.com> (raw)
In-Reply-To: <20190610081753.11422-1-yibin.gong@nxp.com>
From: Robin Gong <yibin.gong@nxp.com>
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
next prev parent reply other threads:[~2019-06-10 8:18 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-10 8:17 [PATCH v5 00/15] add ecspi ERR009165 for i.mx6/7 soc family yibin.gong
2019-06-10 8:17 ` [PATCH v5 01/15] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" yibin.gong
2019-06-10 8:17 ` [PATCH v5 02/15] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" yibin.gong
2019-06-10 8:17 ` [PATCH v5 03/15] Revert "dmaengine: imx-sdma: refine to load context only once" yibin.gong
2019-06-10 8:17 ` [PATCH v5 04/15] dmaengine: imx-sdma: remove dupilicated sdma_load_context yibin.gong
2019-06-10 8:17 ` [PATCH v5 05/15] dmaengine: imx-sdma: add mcu_2_ecspi script yibin.gong
2019-06-10 8:17 ` yibin.gong [this message]
2019-06-10 8:17 ` [PATCH v5 07/15] spi: imx: remove ERR009165 workaround on i.mx6ul yibin.gong
2019-06-10 8:17 ` [PATCH v5 08/15] spi: imx: add new i.mx6ul compatible name in binding doc yibin.gong
2019-07-09 2:17 ` Rob Herring
2019-06-10 8:17 ` [PATCH v5 09/15] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul yibin.gong
2019-06-10 8:17 ` [PATCH v5 10/15] dma: imx-sdma: add i.mx6ul/6sx compatible name yibin.gong
2019-06-11 22:35 ` Rob Herring
2019-06-12 2:32 ` Robin Gong
2019-06-10 8:17 ` [PATCH v5 11/15] dmaengine: imx-sdma: fix ecspi1 rx dma not work on i.mx8mm yibin.gong
2019-09-24 13:27 ` Schrempf Frieder
2019-09-25 11:26 ` Robin Gong
2019-09-25 14:53 ` Schrempf Frieder
2019-09-27 1:55 ` Robin Gong
2020-02-06 10:17 ` Schrempf Frieder
2020-02-10 12:28 ` Robin Gong
2019-06-10 8:17 ` [PATCH v5 12/15] ARM: dts: imx6ul: add dma support on ecspi yibin.gong
2019-07-17 6:42 ` Shawn Guo
2019-07-23 9:39 ` Robin Gong
2019-07-24 0:48 ` Shawn Guo
2019-07-24 1:53 ` Robin Gong
2019-09-24 9:53 ` Robin Gong
2019-06-10 8:17 ` [PATCH v5 13/15] ARM: dts: imx6sll: correct sdma compatible yibin.gong
2019-07-17 6:42 ` Shawn Guo
2019-06-10 8:17 ` [PATCH v5 14/15] arm64: defconfig: Enable SDMA on i.mx8mq/8mm yibin.gong
2019-07-17 6:48 ` Shawn Guo
2019-06-10 8:17 ` [PATCH v5 15/15] dmaengine: imx-sdma: add uart rom script yibin.gong
2019-06-10 12:55 ` Vinod Koul
2019-06-11 3:04 ` Robin Gong
2019-06-11 4:37 ` Vinod Koul
2019-06-21 8:42 ` [PATCH v5 00/15] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
2019-06-24 0:16 ` Shawn Guo
2019-06-25 8:05 ` Robin Gong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190610081753.11422-7-yibin.gong@nxp.com \
--to=yibin.gong@nxp.com \
--cc=broonie@kernel.org \
--cc=catalin.marinas@arm.com \
--cc=dan.j.williams@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
--cc=vkoul@kernel.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).