From: "Angus Ainslie (Purism)" <angus@akkea.ca>
To: angus@akkea.ca
Cc: angus.ainslie@puri.sm, Vinod Koul <vkoul@kernel.org>,
dmaengine@vger.kernel.org, NXP Linux Team <linux-imx@nxp.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Lucas Stach <l.stach@pengutronix.de>,
Daniel Baluta <daniel.baluta@gmail.com>
Subject: [PATCH v6 1/3] dmaengine: imx-sdma: add clock ratio 1:1 check
Date: Mon, 28 Jan 2019 09:03:21 -0700 [thread overview]
Message-ID: <20190128160323.28170-2-angus@akkea.ca> (raw)
In-Reply-To: <20190128160323.28170-1-angus@akkea.ca>
On i.mx8 mscale B0 chip, AHB/SDMA clock ratio 2:1 can't be supportted,
since SDMA clock ratio has to be increased to 250Mhz, AHB can't reach
to 500Mhz, so use 1:1 instead.
Based on NXP commit MLK-16841-1 by Robin Gong <yibin.gong@nxp.com>
Signed-off-by: Angus Ainslie (Purism) <angus@akkea.ca>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
---
drivers/dma/imx-sdma.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 0b3a67ff8e82..757fad2fbfae 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -440,6 +440,8 @@ struct sdma_engine {
unsigned int irq;
dma_addr_t bd0_phys;
struct sdma_buffer_descriptor *bd0;
+ /* clock ratio for AHB:SDMA core. 1:1 is 1, 2:1 is 0*/
+ bool clk_ratio;
};
static int sdma_config_write(struct dma_chan *chan,
@@ -662,8 +664,11 @@ static int sdma_run_channel0(struct sdma_engine *sdma)
dev_err(sdma->dev, "Timeout waiting for CH0 ready\n");
/* Set bits of CONFIG register with dynamic context switching */
- if (readl(sdma->regs + SDMA_H_CONFIG) == 0)
- writel_relaxed(SDMA_H_CONFIG_CSM, sdma->regs + SDMA_H_CONFIG);
+ reg = readl(sdma->regs + SDMA_H_CONFIG);
+ if ((reg & SDMA_H_CONFIG_CSM) == 0) {
+ reg |= SDMA_H_CONFIG_CSM;
+ writel_relaxed(reg, sdma->regs + SDMA_H_CONFIG);
+ }
return ret;
}
@@ -1840,6 +1845,9 @@ static int sdma_init(struct sdma_engine *sdma)
if (ret)
goto disable_clk_ipg;
+ if (clk_get_rate(sdma->clk_ahb) == clk_get_rate(sdma->clk_ipg))
+ sdma->clk_ratio = 1;
+
/* Be sure SDMA has not started yet */
writel_relaxed(0, sdma->regs + SDMA_H_C0PTR);
@@ -1880,8 +1888,10 @@ static int sdma_init(struct sdma_engine *sdma)
writel_relaxed(0x4050, sdma->regs + SDMA_CHN0ADDR);
/* Set bits of CONFIG register but with static context switching */
- /* FIXME: Check whether to set ACR bit depending on clock ratios */
- writel_relaxed(0, sdma->regs + SDMA_H_CONFIG);
+ if (sdma->clk_ratio)
+ writel_relaxed(SDMA_H_CONFIG_ACR, sdma->regs + SDMA_H_CONFIG);
+ else
+ writel_relaxed(0, sdma->regs + SDMA_H_CONFIG);
writel_relaxed(ccb_phys, sdma->regs + SDMA_H_C0PTR);
--
2.17.1
next prev parent reply other threads:[~2019-01-28 17:20 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-20 2:31 [PATCH v2 0/3] dma: imx-sdma: add the sdma engine to the imx8mq Angus Ainslie (Purism)
2019-01-20 2:31 ` [PATCH v2 1/3] dma: imx-sdma: fix NULL pointer de-reference Angus Ainslie (Purism)
2019-01-20 9:54 ` Daniel Baluta
2019-01-20 15:04 ` Angus Ainslie
2019-01-20 2:31 ` [PATCH v2 2/3] dma: imx-sdma: add clock ratio 1:1 check Angus Ainslie (Purism)
2019-01-20 9:58 ` Daniel Baluta
2019-01-20 14:38 ` Angus Ainslie
2019-01-20 18:00 ` Daniel Baluta
2019-01-21 9:17 ` Lucas Stach
2019-01-21 14:43 ` Angus Ainslie
2019-01-20 2:31 ` [PATCH v2 3/3] imx8mq.dtsi: add the sdma nodes Angus Ainslie (Purism)
2019-01-23 15:23 ` [PATCH v3 0/5] dma: imx-sdma: add the sdma engine to the imx8mq Angus Ainslie (Purism)
2019-01-23 15:23 ` [PATCH v3 1/5] dma: imx-sdma: add clock ratio 1:1 check Angus Ainslie (Purism)
2019-01-23 15:43 ` Lucas Stach
2019-01-23 15:23 ` [PATCH v3 2/5] dma: imx-sdma: add imx8mq sdma compatible parts Angus Ainslie (Purism)
2019-01-23 15:23 ` [PATCH v3 3/5] dt-bindings: dma: fsl-imx-sdma: add imx8mq compatible string Angus Ainslie (Purism)
2019-01-23 15:23 ` [PATCH v3 4/5] dma: imx-sdma: add an index for imx8mq multi sdma devices Angus Ainslie (Purism)
2019-01-23 15:31 ` Lucas Stach
2019-01-23 15:42 ` Angus Ainslie
2019-01-23 15:55 ` Vinod Koul
2019-01-23 15:23 ` [PATCH v3 5/5] imx8mq.dtsi: add the sdma nodes Angus Ainslie (Purism)
2019-01-23 16:50 ` Lucas Stach
2019-01-25 2:55 ` [PATCH v4 0/5] dmaengine: imx-sdma: add the sdma engine to the imx8mq Angus Ainslie (Purism)
2019-01-25 2:55 ` [PATCH v4 1/5] dmaengine: imx-sdma: add clock ratio 1:1 check Angus Ainslie (Purism)
2019-01-25 9:42 ` Lucas Stach
2019-01-25 2:55 ` [PATCH v4 2/5] dmaengine: imx-sdma: add imx8mq sdma compatible parts Angus Ainslie (Purism)
2019-01-25 9:35 ` Lucas Stach
2019-01-25 2:55 ` [PATCH v4 3/5] dt-bindings: dma: fsl-imx-sdma: add fsl,imx8mq to the accepted compatible node Angus Ainslie (Purism)
2019-01-25 9:39 ` Lucas Stach
2019-01-25 2:55 ` [PATCH v4 4/5] dma: imx-sdma: add a test for imx8mq multi sdma devices Angus Ainslie (Purism)
2019-01-25 9:34 ` Lucas Stach
2019-01-25 2:55 ` [PATCH v4 5/5] imx8mq.dtsi: add the sdma nodes Angus Ainslie (Purism)
2019-01-25 9:38 ` Lucas Stach
2019-01-28 6:08 ` [PATCH v5 0/5] dmaengine: imx-sdma: add the sdma engine to the imx8mq Angus Ainslie (Purism)
2019-01-28 6:08 ` [PATCH v5 1/5] dmaengine: imx-sdma: add clock ratio 1:1 check Angus Ainslie (Purism)
2019-01-28 9:29 ` Lucas Stach
2019-01-28 6:08 ` [PATCH v5 2/5] dmaengine: imx-sdma: add imx8mq sdma compatible parts Angus Ainslie (Purism)
2019-01-28 9:32 ` Lucas Stach
2019-01-28 6:08 ` [PATCH v5 3/5] dt-bindings: dma: fsl-imx-sdma: add fsl,imx8mq to the accepted compatible node Angus Ainslie (Purism)
2019-01-28 6:08 ` [PATCH v5 4/5] dmaengine: imx-sdma: add a test for imx8mq multi sdma devices Angus Ainslie (Purism)
2019-01-28 9:33 ` Lucas Stach
2019-01-28 6:08 ` [PATCH v5 5/5] dmaengine: imx-sdma: fix consistent dma test failures Angus Ainslie (Purism)
2019-01-28 16:03 ` [PATCH v6 0/3] dmaengine: imx-sdma: add the sdma engine to the imx8mq Angus Ainslie (Purism)
2019-01-28 16:03 ` Angus Ainslie (Purism) [this message]
2019-01-28 16:03 ` [PATCH v6 2/3] dmaengine: imx-sdma: add a test for imx8mq multi sdma devices Angus Ainslie (Purism)
2019-02-25 13:31 ` Daniel Baluta
2019-01-28 16:03 ` [PATCH v6 3/3] dmaengine: imx-sdma: fix consistent dma test failures Angus Ainslie (Purism)
2019-02-25 17:56 ` [PATCH v6 0/3] dmaengine: imx-sdma: add the sdma engine to the imx8mq Vinod Koul
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=20190128160323.28170-2-angus@akkea.ca \
--to=angus@akkea.ca \
--cc=angus.ainslie@puri.sm \
--cc=daniel.baluta@gmail.com \
--cc=dmaengine@vger.kernel.org \
--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=vkoul@kernel.org \
/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).