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: [v4,1/5] dmaengine: imx-sdma: add clock ratio 1:1 check From: Angus Ainslie Message-Id: <20190125025528.15645-2-angus@akkea.ca> Date: Thu, 24 Jan 2019 19:55:24 -0700 To: angus@akkea.ca 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, Lucas Stach , Daniel Baluta List-ID: T24gaS5teDggbXNjYWxlIEIwIGNoaXAsIEFIQi9TRE1BIGNsb2NrIHJhdGlvIDI6MSBjYW4ndCBi ZSBzdXBwb3J0dGVkLApzaW5jZSBTRE1BIGNsb2NrIHJhdGlvIGhhcyB0byBiZSBpbmNyZWFzZWQg dG8gMjUwTWh6LCBBSEIgY2FuJ3QgcmVhY2gKdG8gNTAwTWh6LCBzbyB1c2UgMToxIGluc3RlYWQu CgpCYXNlZCBvbiBOWFAgY29tbWl0IE1MSy0xNjg0MS0xIGJ5IFJvYmluIEdvbmcgPHlpYmluLmdv bmdAbnhwLmNvbT4KClNpZ25lZC1vZmYtYnk6IEFuZ3VzIEFpbnNsaWUgKFB1cmlzbSkgPGFuZ3Vz QGFra2VhLmNhPgotLS0KIGRyaXZlcnMvZG1hL2lteC1zZG1hLmMgfCAyMSArKysrKysrKysrKysr KysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZG1hL2lteC1zZG1hLmMgYi9kcml2ZXJzL2RtYS9pbXgt c2RtYS5jCmluZGV4IDBiM2E2N2ZmOGU4Mi4uNWU1ZWYwYjVhOTczIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2RtYS9pbXgtc2RtYS5jCisrKyBiL2RyaXZlcnMvZG1hL2lteC1zZG1hLmMKQEAgLTQ0MCw2 ICs0NDAsOCBAQCBzdHJ1Y3Qgc2RtYV9lbmdpbmUgewogCXVuc2lnbmVkIGludAkJCWlycTsKIAlk bWFfYWRkcl90CQkJYmQwX3BoeXM7CiAJc3RydWN0IHNkbWFfYnVmZmVyX2Rlc2NyaXB0b3IJKmJk MDsKKwkvKiBjbG9jayByYXRpbyBmb3IgQUhCOlNETUEgY29yZS4gMToxIGlzIDEsIDI6MSBpcyAw Ki8KKwlib29sCQkJCWNsa19yYXRpbzsKIH07CiAKIHN0YXRpYyBpbnQgc2RtYV9jb25maWdfd3Jp dGUoc3RydWN0IGRtYV9jaGFuICpjaGFuLApAQCAtNjYyLDggKzY2NCwxNCBAQCBzdGF0aWMgaW50 IHNkbWFfcnVuX2NoYW5uZWwwKHN0cnVjdCBzZG1hX2VuZ2luZSAqc2RtYSkKIAkJZGV2X2Vycihz ZG1hLT5kZXYsICJUaW1lb3V0IHdhaXRpbmcgZm9yIENIMCByZWFkeVxuIik7CiAKIAkvKiBTZXQg Yml0cyBvZiBDT05GSUcgcmVnaXN0ZXIgd2l0aCBkeW5hbWljIGNvbnRleHQgc3dpdGNoaW5nICov Ci0JaWYgKHJlYWRsKHNkbWEtPnJlZ3MgKyBTRE1BX0hfQ09ORklHKSA9PSAwKQotCQl3cml0ZWxf cmVsYXhlZChTRE1BX0hfQ09ORklHX0NTTSwgc2RtYS0+cmVncyArIFNETUFfSF9DT05GSUcpOwor CWlmICgocmVhZGwoc2RtYS0+cmVncyArIFNETUFfSF9DT05GSUcpICYgflNETUFfSF9DT05GSUdf QUNSKSA9PSAwKSB7CisJCXJlZyA9IFNETUFfSF9DT05GSUdfQ1NNOworCisJCWlmIChzZG1hLT5j bGtfcmF0aW8pCisJCQlyZWcgfD0gU0RNQV9IX0NPTkZJR19BQ1I7CisKKwkJd3JpdGVsX3JlbGF4 ZWQocmVnLCBzZG1hLT5yZWdzICsgU0RNQV9IX0NPTkZJRyk7CisJfQogCiAJcmV0dXJuIHJldDsK IH0KQEAgLTE4NDAsNiArMTg0OCw5IEBAIHN0YXRpYyBpbnQgc2RtYV9pbml0KHN0cnVjdCBzZG1h X2VuZ2luZSAqc2RtYSkKIAlpZiAocmV0KQogCQlnb3RvIGRpc2FibGVfY2xrX2lwZzsKIAorCWlm IChjbGtfZ2V0X3JhdGUoc2RtYS0+Y2xrX2FoYikgPT0gY2xrX2dldF9yYXRlKHNkbWEtPmNsa19p cGcpKQorCQlzZG1hLT5jbGtfcmF0aW8gPSAxOworCiAJLyogQmUgc3VyZSBTRE1BIGhhcyBub3Qg c3RhcnRlZCB5ZXQgKi8KIAl3cml0ZWxfcmVsYXhlZCgwLCBzZG1hLT5yZWdzICsgU0RNQV9IX0Mw UFRSKTsKIApAQCAtMTg4MCw4ICsxODkxLDEwIEBAIHN0YXRpYyBpbnQgc2RtYV9pbml0KHN0cnVj dCBzZG1hX2VuZ2luZSAqc2RtYSkKIAl3cml0ZWxfcmVsYXhlZCgweDQwNTAsIHNkbWEtPnJlZ3Mg KyBTRE1BX0NITjBBRERSKTsKIAogCS8qIFNldCBiaXRzIG9mIENPTkZJRyByZWdpc3RlciBidXQg d2l0aCBzdGF0aWMgY29udGV4dCBzd2l0Y2hpbmcgKi8KLQkvKiBGSVhNRTogQ2hlY2sgd2hldGhl ciB0byBzZXQgQUNSIGJpdCBkZXBlbmRpbmcgb24gY2xvY2sgcmF0aW9zICovCi0Jd3JpdGVsX3Jl bGF4ZWQoMCwgc2RtYS0+cmVncyArIFNETUFfSF9DT05GSUcpOworCWlmIChzZG1hLT5jbGtfcmF0 aW8pCisJCXdyaXRlbF9yZWxheGVkKFNETUFfSF9DT05GSUdfQUNSLCBzZG1hLT5yZWdzICsgU0RN QV9IX0NPTkZJRyk7CisJZWxzZQorCQl3cml0ZWxfcmVsYXhlZCgwLCBzZG1hLT5yZWdzICsgU0RN QV9IX0NPTkZJRyk7CiAKIAl3cml0ZWxfcmVsYXhlZChjY2JfcGh5cywgc2RtYS0+cmVncyArIFNE TUFfSF9DMFBUUik7CiAK 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=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 7A1DDC282C3 for ; Fri, 25 Jan 2019 02:55:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4AB2B217D7 for ; Fri, 25 Jan 2019 02:55:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="S/T368i0"; dkim=pass (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="S/T368i0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728770AbfAYCzl (ORCPT ); Thu, 24 Jan 2019 21:55:41 -0500 Received: from node.akkea.ca ([192.155.83.177]:52092 "EHLO node.akkea.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726147AbfAYCzi (ORCPT ); Thu, 24 Jan 2019 21:55:38 -0500 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id 941FC4E2051; Fri, 25 Jan 2019 02:55:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1548384937; bh=+JXGIVucnYCY0cluddvyVeHVzItz/VTc2jupzPlE5mk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S/T368i0EE27Nh6XHcxhO1cbGHBeLDfxuHZ5N8hx6l+DAEHXkNUG6vShI91PFEH7c fY2Q6hN0bu9dtF7QyKs+brb281XIiCsHYKwnp6xT7gLLuVOupR6Bb0GjzZnF1WjIQ/ CLbrNz2JEkVOPgIILCjns859Z4HZn2A+GGi1/Tcw= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yz-2hxMqnySQ; Fri, 25 Jan 2019 02:55:37 +0000 (UTC) Received: from localhost.localdomain (198-48-167-13.cpe.pppoe.ca [198.48.167.13]) by node.akkea.ca (Postfix) with ESMTPSA id 8ADFE4E204D; Fri, 25 Jan 2019 02:55:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1548384937; bh=+JXGIVucnYCY0cluddvyVeHVzItz/VTc2jupzPlE5mk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S/T368i0EE27Nh6XHcxhO1cbGHBeLDfxuHZ5N8hx6l+DAEHXkNUG6vShI91PFEH7c fY2Q6hN0bu9dtF7QyKs+brb281XIiCsHYKwnp6xT7gLLuVOupR6Bb0GjzZnF1WjIQ/ CLbrNz2JEkVOPgIILCjns859Z4HZn2A+GGi1/Tcw= From: "Angus Ainslie (Purism)" To: angus@akkea.ca 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, Lucas Stach , Daniel Baluta Subject: [PATCH v4 1/5] dmaengine: imx-sdma: add clock ratio 1:1 check Date: Thu, 24 Jan 2019 19:55:24 -0700 Message-Id: <20190125025528.15645-2-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190125025528.15645-1-angus@akkea.ca> References: <20190120023150.17138-1-angus@akkea.ca> <20190125025528.15645-1-angus@akkea.ca> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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) --- drivers/dma/imx-sdma.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 0b3a67ff8e82..5e5ef0b5a973 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,14 @@ 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); + if ((readl(sdma->regs + SDMA_H_CONFIG) & ~SDMA_H_CONFIG_ACR) == 0) { + reg = SDMA_H_CONFIG_CSM; + + if (sdma->clk_ratio) + reg |= SDMA_H_CONFIG_ACR; + + writel_relaxed(reg, sdma->regs + SDMA_H_CONFIG); + } return ret; } @@ -1840,6 +1848,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 +1891,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 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=-10.1 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,USER_AGENT_GIT 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 59AAEC282C6 for ; Fri, 25 Jan 2019 02:56:44 +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 2A50D218D9 for ; Fri, 25 Jan 2019 02:56:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dGyDWD4Z"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="S/T368i0"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=akkea.ca header.i=@akkea.ca header.b="S/T368i0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2A50D218D9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=akkea.ca 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Ti9NZVFU5dhhu3q9a32vQb+o3Cx8/aAD1lS8m4FnDro=; b=dGyDWD4ZHItTGbArDwklt9ecmW J16cDi4xu3CBIH5CPQNTGOYk5hf1QXbAuTbrPr5m6VfFvUS8gGzMYP7uHtOcCUa4Phr6/2EDNLnj3 V5NjznuCyhGedOxzMWSQrezXyhiDn5yc+hNKgn0tFvquL/Rzor7XVKwWk4CDVZQegsa5P5mVZpqL2 JC65anvAfI/lKls9CUIis3UjloXyAptK8t8WkgUTXBuQ3jEh2ghrmGoWG3dbAmMBBMWQICTjz9UUF PtQkSsVwA6p8DhXy1y2K0ilD7FG57vf9EOotri2rUn4WVbiaQsG4LjPB8zdL4eLxP6NLpFQllK8Vy 4VyzTzTA==; 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 1gmrfb-0006Mg-W8; Fri, 25 Jan 2019 02:56:40 +0000 Received: from node.akkea.ca ([192.155.83.177]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gmrec-0005a2-Gr for linux-arm-kernel@lists.infradead.org; Fri, 25 Jan 2019 02:55:41 +0000 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id 941FC4E2051; Fri, 25 Jan 2019 02:55:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1548384937; bh=+JXGIVucnYCY0cluddvyVeHVzItz/VTc2jupzPlE5mk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S/T368i0EE27Nh6XHcxhO1cbGHBeLDfxuHZ5N8hx6l+DAEHXkNUG6vShI91PFEH7c fY2Q6hN0bu9dtF7QyKs+brb281XIiCsHYKwnp6xT7gLLuVOupR6Bb0GjzZnF1WjIQ/ CLbrNz2JEkVOPgIILCjns859Z4HZn2A+GGi1/Tcw= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id yz-2hxMqnySQ; Fri, 25 Jan 2019 02:55:37 +0000 (UTC) Received: from localhost.localdomain (198-48-167-13.cpe.pppoe.ca [198.48.167.13]) by node.akkea.ca (Postfix) with ESMTPSA id 8ADFE4E204D; Fri, 25 Jan 2019 02:55:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1548384937; bh=+JXGIVucnYCY0cluddvyVeHVzItz/VTc2jupzPlE5mk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S/T368i0EE27Nh6XHcxhO1cbGHBeLDfxuHZ5N8hx6l+DAEHXkNUG6vShI91PFEH7c fY2Q6hN0bu9dtF7QyKs+brb281XIiCsHYKwnp6xT7gLLuVOupR6Bb0GjzZnF1WjIQ/ CLbrNz2JEkVOPgIILCjns859Z4HZn2A+GGi1/Tcw= From: "Angus Ainslie (Purism)" To: angus@akkea.ca Subject: [PATCH v4 1/5] dmaengine: imx-sdma: add clock ratio 1:1 check Date: Thu, 24 Jan 2019 19:55:24 -0700 Message-Id: <20190125025528.15645-2-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190125025528.15645-1-angus@akkea.ca> References: <20190120023150.17138-1-angus@akkea.ca> <20190125025528.15645-1-angus@akkea.ca> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190124_185538_563642_78F0BA4D X-CRM114-Status: GOOD ( 10.48 ) 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, Lucas Stach MIME-Version: 1.0 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 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) --- drivers/dma/imx-sdma.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 0b3a67ff8e82..5e5ef0b5a973 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,14 @@ 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); + if ((readl(sdma->regs + SDMA_H_CONFIG) & ~SDMA_H_CONFIG_ACR) == 0) { + reg = SDMA_H_CONFIG_CSM; + + if (sdma->clk_ratio) + reg |= SDMA_H_CONFIG_ACR; + + writel_relaxed(reg, sdma->regs + SDMA_H_CONFIG); + } return ret; } @@ -1840,6 +1848,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 +1891,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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel