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,09/15] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul Date: Fri, 26 Apr 2019 08:05:57 +0000 [thread overview] Message-ID: <1556265512-9130-10-git-send-email-yibin.gong@nxp.com> (raw) 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> --- drivers/dma/imx-sdma.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 352b0d5..3e912b6 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 be fixed in soc from i.mx6ul. + * please get more information from 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, @@ -562,6 +594,7 @@ static struct sdma_driver_data sdma_imx8mq = { .num_events = 48, .script_addrs = &sdma_script_imx7d, .check_ratio = 1, + .ecspi_fixed = true, }; static const struct platform_device_id sdma_devtypes[] = { @@ -584,9 +617,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 +641,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 +1207,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;
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 09/15] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul Date: Fri, 26 Apr 2019 08:05:57 +0000 [thread overview] Message-ID: <1556265512-9130-10-git-send-email-yibin.gong@nxp.com> (raw) Message-ID: <20190426080557.UjJKxEpH_cD7ChivAMEgNjOUh05yQHkvu8tVgOLZbgc@z> (raw) In-Reply-To: <1556265512-9130-1-git-send-email-yibin.gong@nxp.com> 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> --- drivers/dma/imx-sdma.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 352b0d5..3e912b6 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 be fixed in soc from i.mx6ul. + * please get more information from 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, @@ -562,6 +594,7 @@ static struct sdma_driver_data sdma_imx8mq = { .num_events = 48, .script_addrs = &sdma_script_imx7d, .check_ratio = 1, + .ecspi_fixed = true, }; static const struct platform_device_id sdma_devtypes[] = { @@ -584,9 +617,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 +641,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 +1207,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
next prev 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 ` [v2,06/15] spi: imx: fix ERR009165 Robin Gong 2019-04-26 8:05 ` [PATCH v2 06/15] " 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 ` Robin Gong [this message] 2019-04-26 8:05 ` [PATCH v2 09/15] dmaengine: imx-sdma: remove ERR009165 on i.mx6ul 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-10-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: linkBe 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).