dmaengine.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Robin Gong <yibin.gong@nxp.com>
To: "broonie@kernel.org" <broonie@kernel.org>,
	"shawnguo@kernel.org" <shawnguo@kernel.org>,
	"s.hauer@pengutronix.de" <s.hauer@pengutronix.de>,
	"festevam@gmail.com" <festevam@gmail.com>,
	"robh+dt@kernel.org" <robh+dt@kernel.org>,
	"mark.rutland@arm.com" <mark.rutland@arm.com>,
	"u.kleine-koenig@pengutronix.de" <u.kleine-koenig@pengutronix.de>,
	"plyatov@gmail.com" <plyatov@gmail.com>,
	"dan.j.williams@intel.com" <dan.j.williams@intel.com>,
	"catalin.marinas@arm.com" <catalin.marinas@arm.com>,
	"will.deacon@arm.com" <will.deacon@arm.com>
Cc: dl-linux-imx <linux-imx@nxp.com>,
	"linux-spi@vger.kernel.org" <linux-spi@vger.kernel.org>,
	"linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"dmaengine@vger.kernel.org" <dmaengine@vger.kernel.org>,
	"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
	"kernel@pengutronix.de" <kernel@pengutronix.de>
Subject: [v2,06/15] spi: imx: fix ERR009165
Date: Fri, 26 Apr 2019 08:05:40 +0000	[thread overview]
Message-ID: <1556265512-9130-7-git-send-email-yibin.gong@nxp.com> (raw)

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>
---
 drivers/spi/spi-imx.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

-- 
2.7.4

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 09c9a1e..eb56eac 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);
@@ -1265,10 +1268,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: */

WARNING: multiple messages have this Message-ID (diff)
From: Robin Gong <yibin.gong@nxp.com>
To: "broonie@kernel.org" <broonie@kernel.org>,
	"shawnguo@kernel.org" <shawnguo@kernel.org>,
	"s.hauer@pengutronix.de" <s.hauer@pengutronix.de>,
	"festevam@gmail.com" <festevam@gmail.com>,
	"robh+dt@kernel.org" <robh+dt@kernel.org>,
	"mark.rutland@arm.com" <mark.rutland@arm.com>,
	"u.kleine-koenig@pengutronix.de" <u.kleine-koenig@pengutronix.de>,
	"plyatov@gmail.com" <plyatov@gmail.com>,
	"dan.j.williams@intel.com" <dan.j.williams@intel.com>,
	"catalin.marinas@arm.com" <catalin.marinas@arm.com>,
	"will.deacon@arm.com" <will.deacon@arm.com>
Cc: dl-linux-imx <linux-imx@nxp.com>,
	"linux-spi@vger.kernel.org" <linux-spi@vger.kernel.org>,
	"linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"dmaengine@vger.kernel.org" <dmaengine@vger.kernel.org>,
	"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
	"kernel@pengutronix.de" <kernel@pengutronix.de>
Subject: [PATCH v2 06/15] spi: imx: fix ERR009165
Date: Fri, 26 Apr 2019 08:05:40 +0000	[thread overview]
Message-ID: <1556265512-9130-7-git-send-email-yibin.gong@nxp.com> (raw)
Message-ID: <20190426080540.pmYeSgCWR2f8BG_28yOO5GFhK0F7l59WN2hGohs06Tc@z> (raw)
In-Reply-To: <1556265512-9130-1-git-send-email-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>
---
 drivers/spi/spi-imx.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
index 09c9a1e..eb56eac 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);
@@ -1265,10 +1268,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


         reply	other threads:[~2019-04-26  8:05 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-26  8:05 [PATCH v2 00/15] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
2019-04-26  8:05 ` [v2,01/15] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" Robin Gong
2019-04-26  8:05   ` [PATCH v2 01/15] " Robin Gong
2019-04-26  8:05 ` [v2,02/15] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" Robin Gong
2019-04-26  8:05   ` [PATCH v2 02/15] " Robin Gong
2019-04-26  8:05 ` [v2,03/15] Revert "dmaengine: imx-sdma: refine to load context only once" Robin Gong
2019-04-26  8:05   ` [PATCH v2 03/15] " Robin Gong
2019-04-26  8:05 ` [v2,04/15] dmaengine: imx-sdma: remove dupilicated sdma_load_context Robin Gong
2019-04-26  8:05   ` [PATCH v2 04/15] " Robin Gong
2019-04-26  8:05 ` [v2,05/15] dmaengine: imx-sdma: add mcu_2_ecspi script Robin Gong
2019-04-26  8:05   ` [PATCH v2 05/15] " Robin Gong
2019-04-26  8:05 ` Robin Gong [this message]
2019-04-26  8:05   ` [PATCH v2 06/15] spi: imx: fix ERR009165 Robin Gong
2019-04-26  9:07   ` [v2,06/15] " Lucas Stach
2019-04-26  9:07     ` [PATCH v2 06/15] " Lucas Stach
2019-04-26  9:22     ` [v2,06/15] " Robin Gong
2019-04-26  9:22       ` [EXT] Re: [PATCH v2 06/15] " Robin Gong
2019-04-26  9:37       ` [v2,06/15] " Lucas Stach
2019-04-26  9:37         ` [EXT] Re: [PATCH v2 06/15] " Lucas Stach
2019-04-26  9:53         ` [v2,06/15] " Robin Gong
2019-04-26  9:53           ` [EXT] Re: [PATCH v2 06/15] " Robin Gong
2019-04-26  8:05 ` [v2,07/15] spi: imx: remove ERR009165 workaround on i.mx6ul Robin Gong
2019-04-26  8:05   ` [PATCH v2 07/15] " Robin Gong
2019-04-26  9:09   ` [v2,07/15] " Lucas Stach
2019-04-26  9:09     ` [PATCH v2 07/15] " Lucas Stach
2019-04-26  9:32     ` [v2,07/15] " Robin Gong
2019-04-26  9:32       ` [EXT] Re: [PATCH v2 07/15] " Robin Gong
2019-04-26  8:05 ` [v2,08/15] dt-bindings: spi: imx: add i.mx6ul to state errata fixed Robin Gong
2019-04-26  8:05   ` [PATCH v2 08/15] " Robin Gong
2019-05-01 20:07   ` [v2,08/15] " Rob Herring
2019-05-01 20:07     ` [PATCH v2 08/15] " Rob Herring
2019-05-05  8:55     ` [EXT] " Robin Gong
2019-05-02  6:59   ` [v2,08/15] " Uwe Kleine-König
2019-05-02  6:59     ` [PATCH v2 08/15] " Uwe Kleine-König
2019-05-05  8:47     ` [EXT] " Robin Gong
2019-04-26  8:05 ` [v2,09/15] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul Robin Gong
2019-04-26  8:05   ` [PATCH v2 09/15] " Robin Gong
2019-04-26  8:06 ` [v2,10/15] dt-bindings: dma: imx-sdma: add i.mx6ul/6sx compatible name Robin Gong
2019-04-26  8:06   ` [PATCH v2 10/15] " Robin Gong
2019-05-01 20:07   ` [v2,10/15] " Rob Herring
2019-05-01 20:07     ` [PATCH v2 10/15] " Rob Herring
2019-04-26  8:06 ` [v2,11/15] dmaengine: imx-sdma: fix ecspi1 rx dma not work on i.mx8mm Robin Gong
2019-04-26  8:06   ` [PATCH v2 11/15] " Robin Gong
2019-04-26  8:06 ` [v2,12/15] ARM64: dts: freescale: imx8mm/8mq: update new compatible name for ecspi and sdma Robin Gong
2019-04-26  8:06   ` [PATCH v2 12/15] " Robin Gong
2019-04-26  8:06 ` [v2,13/15] ARM: dts: imx6ul: add dma support on ecspi Robin Gong
2019-04-26  8:06   ` [PATCH v2 13/15] " Robin Gong
2019-04-26  8:06 ` [v2,14/15] ARM: dts: imx6sll: correct ecspi/sdma compatible Robin Gong
2019-04-26  8:06   ` [PATCH v2 14/15] " Robin Gong
2019-04-26  8:06 ` [v2,15/15] arm64: defconfig: Enable SDMA on i.mx8mq/8mm Robin Gong
2019-04-26  8:06   ` [PATCH v2 15/15] " Robin Gong
2019-04-26  8:19 ` [PATCH v2 00/15] add ecspi ERR009165 for i.mx6/7 soc family Lucas Stach
2019-04-26  8:47   ` [EXT] " Robin Gong
2019-04-26  9:06     ` Lucas Stach

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=1556265512-9130-7-git-send-email-yibin.gong@nxp.com \
    --to=yibin.gong@nxp.com \
    --cc=broonie@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=dan.j.williams@intel.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmaengine@vger.kernel.org \
    --cc=festevam@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-spi@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=plyatov@gmail.com \
    --cc=robh+dt@kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=shawnguo@kernel.org \
    --cc=u.kleine-koenig@pengutronix.de \
    --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).