From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v5,1/5] dmaengine: imx-sdma: add clock ratio 1:1 check From: Lucas Stach Message-Id: <3e5e2026e98a3e4ae74541c0e09e1ca4120209de.camel@pengutronix.de> Date: Mon, 28 Jan 2019 10:29:07 +0100 To: "Angus Ainslie (Purism)" Cc: angus.ainslie@puri.sm, Vinod Koul , dmaengine@vger.kernel.org, NXP Linux Team , Pengutronix Kernel Team , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Baluta List-ID: QW0gU29ubnRhZywgZGVuIDI3LjAxLjIwMTksIDIzOjA4IC0wNzAwIHNjaHJpZWIgQW5ndXMgQWlu c2xpZSAoUHVyaXNtKToKPiBPbiBpLm14OCBtc2NhbGUgQjAgY2hpcCwgQUhCL1NETUEgY2xvY2sg cmF0aW8gMjoxIGNhbid0IGJlIHN1cHBvcnR0ZWQsCj4gc2luY2UgU0RNQSBjbG9jayByYXRpbyBo YXMgdG8gYmUgaW5jcmVhc2VkIHRvIDI1ME1oeiwgQUhCIGNhbid0IHJlYWNoCj4gdG8gNTAwTWh6 LCBzbyB1c2UgMToxIGluc3RlYWQuCj4gCj4gQmFzZWQgb24gTlhQIGNvbW1pdCBNTEstMTY4NDEt MSBieSBSb2JpbiBHb25nIDx5aWJpbi5nb25nQG54cC5jb20+Cj4gCj4gU2lnbmVkLW9mZi1ieTog QW5ndXMgQWluc2xpZSAoUHVyaXNtKSA8YW5ndXNAYWtrZWEuY2E+CgpSZXZpZXdlZC1ieTogTHVj YXMgU3RhY2ggPGwuc3RhY2hAcGVuZ3V0cm9uaXguZGU+Cgo+IC0tLQo+ICBkcml2ZXJzL2RtYS9p bXgtc2RtYS5jIHwgMTggKysrKysrKysrKysrKystLS0tCj4gIDEgZmlsZSBjaGFuZ2VkLCAxNCBp bnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2Rt YS9pbXgtc2RtYS5jIGIvZHJpdmVycy9kbWEvaW14LXNkbWEuYwo+IGluZGV4IDBiM2E2N2ZmOGU4 Mi4uNzU3ZmFkMmZiZmFlIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMvZG1hL2lteC1zZG1hLmMKPiAr KysgYi9kcml2ZXJzL2RtYS9pbXgtc2RtYS5jCj4gQEAgLTQ0MCw2ICs0NDAsOCBAQCBzdHJ1Y3Qg c2RtYV9lbmdpbmUgewo+ICAJdW5zaWduZWQgaW50CQkJaXJxOwo+ICAJZG1hX2FkZHJfdAkJCWJk MF9waHlzOwo+ICAJc3RydWN0IHNkbWFfYnVmZmVyX2Rlc2NyaXB0b3IJKmJkMDsKPiArCS8qIGNs b2NrIHJhdGlvIGZvciBBSEI6U0RNQSBjb3JlLiAxOjEgaXMgMSwgMjoxIGlzIDAqLwo+ICsJYm9v bAkJCQljbGtfcmF0aW87Cj4gIH07Cj4gIAo+ICBzdGF0aWMgaW50IHNkbWFfY29uZmlnX3dyaXRl KHN0cnVjdCBkbWFfY2hhbiAqY2hhbiwKPiBAQCAtNjYyLDggKzY2NCwxMSBAQCBzdGF0aWMgaW50 IHNkbWFfcnVuX2NoYW5uZWwwKHN0cnVjdCBzZG1hX2VuZ2luZSAqc2RtYSkKPiAgCQlkZXZfZXJy KHNkbWEtPmRldiwgIlRpbWVvdXQgd2FpdGluZyBmb3IgQ0gwIHJlYWR5XG4iKTsKPiAgCj4gIAkv KiBTZXQgYml0cyBvZiBDT05GSUcgcmVnaXN0ZXIgd2l0aCBkeW5hbWljIGNvbnRleHQgc3dpdGNo aW5nICovCj4gLQlpZiAocmVhZGwoc2RtYS0+cmVncyArIFNETUFfSF9DT05GSUcpID09IDApCj4g LQkJd3JpdGVsX3JlbGF4ZWQoU0RNQV9IX0NPTkZJR19DU00sIHNkbWEtPnJlZ3MgKyBTRE1BX0hf Q09ORklHKTsKPiArCXJlZyA9IHJlYWRsKHNkbWEtPnJlZ3MgKyBTRE1BX0hfQ09ORklHKTsKPiAr CWlmICgocmVnICYgU0RNQV9IX0NPTkZJR19DU00pID09IDApIHsKPiArCQlyZWcgfD0gU0RNQV9I X0NPTkZJR19DU007Cj4gKwkJd3JpdGVsX3JlbGF4ZWQocmVnLCBzZG1hLT5yZWdzICsgU0RNQV9I X0NPTkZJRyk7Cj4gKwl9Cj4gIAo+ICAJcmV0dXJuIHJldDsKPiAgfQo+IEBAIC0xODQwLDYgKzE4 NDUsOSBAQCBzdGF0aWMgaW50IHNkbWFfaW5pdChzdHJ1Y3Qgc2RtYV9lbmdpbmUgKnNkbWEpCj4g IAlpZiAocmV0KQo+ICAJCWdvdG8gZGlzYWJsZV9jbGtfaXBnOwo+ICAKPiArCWlmIChjbGtfZ2V0 X3JhdGUoc2RtYS0+Y2xrX2FoYikgPT0gY2xrX2dldF9yYXRlKHNkbWEtPmNsa19pcGcpKQo+ICsJ CXNkbWEtPmNsa19yYXRpbyA9IDE7Cj4gKwo+ICAJLyogQmUgc3VyZSBTRE1BIGhhcyBub3Qgc3Rh cnRlZCB5ZXQgKi8KPiAgCXdyaXRlbF9yZWxheGVkKDAsIHNkbWEtPnJlZ3MgKyBTRE1BX0hfQzBQ VFIpOwo+ICAKPiBAQCAtMTg4MCw4ICsxODg4LDEwIEBAIHN0YXRpYyBpbnQgc2RtYV9pbml0KHN0 cnVjdCBzZG1hX2VuZ2luZSAqc2RtYSkKPiAgCXdyaXRlbF9yZWxheGVkKDB4NDA1MCwgc2RtYS0+ cmVncyArIFNETUFfQ0hOMEFERFIpOwo+ICAKPiAgCS8qIFNldCBiaXRzIG9mIENPTkZJRyByZWdp c3RlciBidXQgd2l0aCBzdGF0aWMgY29udGV4dCBzd2l0Y2hpbmcgKi8KPiAtCS8qIEZJWE1FOiBD aGVjayB3aGV0aGVyIHRvIHNldCBBQ1IgYml0IGRlcGVuZGluZyBvbiBjbG9jayByYXRpb3MgKi8K PiAtCXdyaXRlbF9yZWxheGVkKDAsIHNkbWEtPnJlZ3MgKyBTRE1BX0hfQ09ORklHKTsKPiArCWlm IChzZG1hLT5jbGtfcmF0aW8pCj4gKwkJd3JpdGVsX3JlbGF4ZWQoU0RNQV9IX0NPTkZJR19BQ1Is IHNkbWEtPnJlZ3MgKyBTRE1BX0hfQ09ORklHKTsKPiArCWVsc2UKPiArCQl3cml0ZWxfcmVsYXhl ZCgwLCBzZG1hLT5yZWdzICsgU0RNQV9IX0NPTkZJRyk7Cj4gIAo+ICAJd3JpdGVsX3JlbGF4ZWQo Y2NiX3BoeXMsIHNkbWEtPnJlZ3MgKyBTRE1BX0hfQzBQVFIpOwo+Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F164DC282C8 for ; Mon, 28 Jan 2019 09:29:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C820720880 for ; Mon, 28 Jan 2019 09:29:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726867AbfA1J3S (ORCPT ); Mon, 28 Jan 2019 04:29:18 -0500 Received: from metis.ext.pengutronix.de ([85.220.165.71]:58881 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726369AbfA1J3S (ORCPT ); Mon, 28 Jan 2019 04:29:18 -0500 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=localhost) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1go3E6-0007PO-Ds; Mon, 28 Jan 2019 10:29:10 +0100 Message-ID: <3e5e2026e98a3e4ae74541c0e09e1ca4120209de.camel@pengutronix.de> Subject: Re: [PATCH v5 1/5] dmaengine: imx-sdma: add clock ratio 1:1 check From: Lucas Stach To: "Angus Ainslie (Purism)" Cc: angus.ainslie@puri.sm, Vinod Koul , dmaengine@vger.kernel.org, NXP Linux Team , Pengutronix Kernel Team , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Daniel Baluta Date: Mon, 28 Jan 2019 10:29:07 +0100 In-Reply-To: <20190128060840.31695-2-angus@akkea.ca> References: <20190120023150.17138-1-angus@akkea.ca> <20190128060840.31695-1-angus@akkea.ca> <20190128060840.31695-2-angus@akkea.ca> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.30.4 (3.30.4-1.fc29) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am Sonntag, den 27.01.2019, 23:08 -0700 schrieb Angus Ainslie (Purism): > 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 > > Signed-off-by: Angus Ainslie (Purism) Reviewed-by: Lucas Stach > --- > 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); > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5C529C282C8 for ; Mon, 28 Jan 2019 09:29:35 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2A64520880 for ; Mon, 28 Jan 2019 09:29:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="vAWo2XEM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2A64520880 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Mime-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3uPPiSzCQNcUiYb2yIGLyOu/uRDiozxOBnMB1p9wWEM=; b=vAWo2XEMyf4qeQ kKWSKk4Q+T/rhek/ilqpx1bu+EpVbmq3f29Vbq01DoYx8Q/KTRlCjGZsm9W0UoAbHmbdVQbQBTW9k i7CqOIm7UuFfB06WbVVpfMdnwnMMnGzCZBE067quyRqi68i9cH9ncXZXH514tgNpvWA0mIElH6Mjl SZKN/2eVzkDtLKhpFheFAOdye6eXaE/PXP+DYiAFwsjVmrYhJQvObPrYErYh6KpCYh3m1MMmGFNzb DQBFInDzS7iu4J5p8zvWqh3+VtS/r0zupWsRfjRbpT2R0sseCD8xmJzXrbXEBwwFnEtxEZnuyXEiW 50QWxeRAXZb3YEOSGE0w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1go3EJ-0003qI-Ff; Mon, 28 Jan 2019 09:29:23 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1go3EF-0003pc-68 for linux-arm-kernel@lists.infradead.org; Mon, 28 Jan 2019 09:29:20 +0000 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=localhost) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1go3E6-0007PO-Ds; Mon, 28 Jan 2019 10:29:10 +0100 Message-ID: <3e5e2026e98a3e4ae74541c0e09e1ca4120209de.camel@pengutronix.de> Subject: Re: [PATCH v5 1/5] dmaengine: imx-sdma: add clock ratio 1:1 check From: Lucas Stach To: "Angus Ainslie (Purism)" Date: Mon, 28 Jan 2019 10:29:07 +0100 In-Reply-To: <20190128060840.31695-2-angus@akkea.ca> References: <20190120023150.17138-1-angus@akkea.ca> <20190128060840.31695-1-angus@akkea.ca> <20190128060840.31695-2-angus@akkea.ca> User-Agent: Evolution 3.30.4 (3.30.4-1.fc29) Mime-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190128_012919_386101_2C5D0D05 X-CRM114-Status: GOOD ( 15.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Baluta , linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, Vinod Koul , NXP Linux Team , Pengutronix Kernel Team , angus.ainslie@puri.sm, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Am Sonntag, den 27.01.2019, 23:08 -0700 schrieb Angus Ainslie (Purism): > 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 > > Signed-off-by: Angus Ainslie (Purism) Reviewed-by: Lucas Stach > --- > 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); > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel