From: Lucas Stach <l.stach@pengutronix.de>
To: Robin Gong <yibin.gong@nxp.com>,
vkoul@kernel.org, mark.rutland@arm.com, broonie@kernel.org,
robh+dt@kernel.org, catalin.marinas@arm.com, will.deacon@arm.com,
shawnguo@kernel.org, festevam@gmail.com, s.hauer@pengutronix.de,
martin.fuzzey@flowbird.group, u.kleine-koenig@pengutronix.de,
dan.j.williams@intel.com, matthias.schiffer@ew.tq-group.com,
frieder.schrempf@kontron.de, m.felsch@pengutronix.de,
xiaoning.wang@nxp.com
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-spi@vger.kernel.org, linux-imx@nxp.com,
kernel@pengutronix.de, dmaengine@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v14 08/12] spi: imx: remove ERR009165 workaround on i.mx6ul
Date: Fri, 09 Jul 2021 11:41:35 +0200 [thread overview]
Message-ID: <dfa12f89f112966197518aa8df25cb47d69b30f7.camel@pengutronix.de> (raw)
In-Reply-To: <1617809456-17693-9-git-send-email-yibin.gong@nxp.com>
Am Mittwoch, dem 07.04.2021 um 23:30 +0800 schrieb Robin Gong:
> 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 | 47 +++++++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 43 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c
> index cf235b9..d18ee25 100644
> --- a/drivers/spi/spi-imx.c
> +++ b/drivers/spi/spi-imx.c
> @@ -59,6 +59,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 */
This patch could be a lot smaller if you didn't introduce a new
devtype. You could just use the IMX51_ECSPI in
imx6ul_ecspi_devtype_data, as all you care about as a relevant
difference is the tx_glitch_fixed property, which isn't tied to the
devtype.
Regards,
Lucas
> };
>
> struct spi_imx_data;
> @@ -78,6 +79,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;
> };
>
> @@ -134,6 +140,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;
> @@ -593,8 +604,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);
>
> @@ -620,12 +637,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);
> @@ -1019,6 +1040,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 of_device_id spi_imx_dt_ids[] = {
> { .compatible = "fsl,imx1-cspi", .data = &imx1_cspi_devtype_data, },
> { .compatible = "fsl,imx21-cspi", .data = &imx21_cspi_devtype_data, },
> @@ -1027,6 +1065,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);
> @@ -1604,7 +1643,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;
next prev parent reply other threads:[~2021-07-09 9:41 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 15:30 [PATCH v14 00/12] add ecspi ERR009165 for i.mx6/7 soc family Robin Gong
2021-04-07 15:30 ` [PATCH v14 01/12] Revert "ARM: dts: imx6q: Use correct SDMA script for SPI5 core" Robin Gong
2021-04-07 15:30 ` [PATCH v14 02/12] Revert "ARM: dts: imx6: Use correct SDMA script for SPI cores" Robin Gong
2021-04-07 15:30 ` [PATCH v14 03/12] Revert "dmaengine: imx-sdma: refine to load context only once" Robin Gong
2021-04-07 15:30 ` [PATCH v14 04/12] dmaengine: imx-sdma: remove duplicated sdma_load_context Robin Gong
2021-04-07 15:30 ` [PATCH v14 05/12] dmaengine: dma: imx-sdma: add fw_loaded and is_ram_script Robin Gong
2021-07-09 9:24 ` Lucas Stach
2021-07-12 3:20 ` Robin Gong
2021-04-07 15:30 ` [PATCH v14 06/12] dmaengine: imx-sdma: add mcu_2_ecspi script Robin Gong
2021-07-09 9:32 ` Lucas Stach
2021-04-07 15:30 ` [PATCH v14 07/12] spi: imx: fix ERR009165 Robin Gong
2021-07-09 9:35 ` Lucas Stach
2021-04-07 15:30 ` [PATCH v14 08/12] spi: imx: remove ERR009165 workaround on i.mx6ul Robin Gong
2021-07-09 9:41 ` Lucas Stach [this message]
2021-07-12 3:48 ` Robin Gong
2021-07-12 9:30 ` Lucas Stach
2021-07-13 9:12 ` Robin Gong
2021-07-13 9:30 ` Lucas Stach
2021-04-07 15:30 ` [PATCH v14 09/12] dmaengine: imx-sdma: remove ERR009165 " Robin Gong
2021-07-09 9:44 ` Lucas Stach
2021-07-12 4:03 ` Robin Gong
2021-07-12 9:33 ` Lucas Stach
2021-07-13 9:14 ` Robin Gong
2021-04-07 15:30 ` [PATCH v14 10/12] dma: imx-sdma: add i.mx6ul compatible name Robin Gong
2021-04-07 15:30 ` [PATCH v14 11/12] dmaengine: imx-sdma: add uart rom script Robin Gong
2021-07-09 9:55 ` Lucas Stach
2021-04-07 15:30 ` [PATCH v14 12/12] dmaengine: imx-sdma: add terminated list for freed descriptor in worker Robin Gong
2021-04-12 9:39 ` Vinod Koul
2021-04-13 5:05 ` Robin Gong
2021-06-15 6:06 ` Vinod Koul
2021-07-09 9:55 ` Lucas Stach
2021-06-11 13:51 ` [PATCH v14 00/12] add ecspi ERR009165 for i.mx6/7 soc family Fabio Estevam
2021-06-15 1:55 ` Robin Gong
2021-06-15 6:07 ` Vinod Koul
2021-06-15 6:36 ` Robin Gong
2021-06-15 12:07 ` Vinod Koul
2021-06-15 14:10 ` Robin Gong
2021-06-16 10:16 ` Vinod Koul
2021-06-16 10:44 ` Robin Gong
2021-06-15 2:12 ` Fabio Estevam
2021-06-15 2:17 ` 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=dfa12f89f112966197518aa8df25cb47d69b30f7.camel@pengutronix.de \
--to=l.stach@pengutronix.de \
--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=frieder.schrempf@kontron.de \
--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=m.felsch@pengutronix.de \
--cc=mark.rutland@arm.com \
--cc=martin.fuzzey@flowbird.group \
--cc=matthias.schiffer@ew.tq-group.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 \
--cc=xiaoning.wang@nxp.com \
--cc=yibin.gong@nxp.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).