From patchwork Thu Jan 23 23:03:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 11349281 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 326FC921 for ; Thu, 23 Jan 2020 23:11:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0197F21734 for ; Thu, 23 Jan 2020 23:11:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Y3qaU3tS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729904AbgAWXLB (ORCPT ); Thu, 23 Jan 2020 18:11:01 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:53265 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729874AbgAWXK7 (ORCPT ); Thu, 23 Jan 2020 18:10:59 -0500 Received: by mail-wm1-f66.google.com with SMTP id m24so4371251wmc.3; Thu, 23 Jan 2020 15:10:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=B6wMVL4MgaqmuH24oIn0CqdaMc9DNNnI31yvKkdHqzg=; b=Y3qaU3tS1xLC3VsrkKZD0J7JYQ/rpOIRN2KpD1/CQxkw3Iela4QVBkvPvRMBKTKDnQ XeXpoDhwAj3rSTs2f6Dx38PUf5iQOrI4AJMn413DW8BVNPgqqxoj8fZgrOxGHQwcCzno lTXZsZsFGMhalq/4sfMnUZKbWrmxKUESYs+Kf03o89zt1whRjodH2IXIqBZz4Y+zqZ4v x6ZC6+vT+nTN/2xbJiHXgIpFlZnXFqAd1fP548fwClHJJ2lLoc1tEod2tWgiMdQQjRjW 7yHaQQl+Mfq8jwDuyVrOr41f4CuFgrchz5XQkcp7C9/jR0NZqiMR6xr2biV6qkYCMi5u Ax1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B6wMVL4MgaqmuH24oIn0CqdaMc9DNNnI31yvKkdHqzg=; b=riFB7V3LTf/NeasEFiw3iO9L113jCtwfDYTqXNt2h1qdHpo4qTrPZJMu1fI0yX5XhZ 0b0fpxXS5OqdlyKtuc8N1A/AtquUjslZnHkfE6sRLha7T2rgqsLAwg7bRjxElOvPXNfV abL/m8C3ddHNsWb2Tl+1JiVaQxHAYTUKRRIwYhLNXNw9JtMJofK6aHiYZ2WFz3oiGyvh rGxSu8agTUJ6nMbYLddN38tr6y3g3jli4JT6REd3YBOF+K+oha3TienWtM5YmnDrQ1Mb rQ49IU981gRE0mfATYL6YIG3Hi0puA6/cb/quldzHN8tmkeAN8PDMcXH5jG21T1ICbiJ vK9A== X-Gm-Message-State: APjAAAXagz2ekG441EnPTl/m3GtPifh8FdmkNUA9Yry/FNoMqCp0tFHs s339yvsIXiKyynmT9/qaHQo= X-Google-Smtp-Source: APXvYqxjd9/0NLp3pc7W1y90q1159BuXdggGNkcGGr4KxsRt0R/NVphrnENgFX3eW0Pu87YSj1ekwg== X-Received: by 2002:a1c:2394:: with SMTP id j142mr266489wmj.25.1579821056460; Thu, 23 Jan 2020 15:10:56 -0800 (PST) Received: from localhost.localdomain (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.gmail.com with ESMTPSA id z6sm5105552wrw.36.2020.01.23.15.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jan 2020 15:10:55 -0800 (PST) From: Dmitry Osipenko To: Laxman Dewangan , Vinod Koul , Dan Williams , Thierry Reding , Jonathan Hunter , =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Cc: dmaengine@vger.kernel.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 10/14] dmaengine: tegra-apb: Keep clock enabled only during of DMA transfer Date: Fri, 24 Jan 2020 02:03:21 +0300 Message-Id: <20200123230325.3037-11-digetx@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200123230325.3037-1-digetx@gmail.com> References: <20200123230325.3037-1-digetx@gmail.com> MIME-Version: 1.0 Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org It's a bit impractical to enable hardware's clock at the time of DMA channel's allocation because most of DMA client drivers allocate DMA channel at the time of the driver's probing and thus DMA clock is kept always-enabled in practice, defeating the whole purpose of runtime PM. Signed-off-by: Dmitry Osipenko --- drivers/dma/tegra20-apb-dma.c | 47 ++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c index 22b88ccff05d..0ee28d8e3c96 100644 --- a/drivers/dma/tegra20-apb-dma.c +++ b/drivers/dma/tegra20-apb-dma.c @@ -436,6 +436,8 @@ static void tegra_dma_stop(struct tegra_dma_channel *tdc) tdc_write(tdc, TEGRA_APBDMA_CHAN_STATUS, status); } tdc->busy = false; + + pm_runtime_put(tdc->tdma->dev); } static void tegra_dma_start(struct tegra_dma_channel *tdc, @@ -500,18 +502,25 @@ static void tegra_dma_configure_for_next(struct tegra_dma_channel *tdc, tegra_dma_resume(tdc); } -static void tdc_start_head_req(struct tegra_dma_channel *tdc) +static bool tdc_start_head_req(struct tegra_dma_channel *tdc) { struct tegra_dma_sg_req *sg_req; + int err; if (list_empty(&tdc->pending_sg_req)) - return; + return false; + + err = pm_runtime_get_sync(tdc->tdma->dev); + if (WARN_ON_ONCE(err < 0)) + return false; sg_req = list_first_entry(&tdc->pending_sg_req, typeof(*sg_req), node); tegra_dma_start(tdc, sg_req); sg_req->configured = true; sg_req->words_xferred = 0; tdc->busy = true; + + return true; } static void tdc_configure_next_head_desc(struct tegra_dma_channel *tdc) @@ -615,6 +624,8 @@ static void handle_once_dma_done(struct tegra_dma_channel *tdc, } list_add_tail(&sgreq->node, &tdc->free_sg_req); + pm_runtime_put(tdc->tdma->dev); + /* Do not start DMA if it is going to be terminate */ if (to_terminate || list_empty(&tdc->pending_sg_req)) return; @@ -730,9 +741,7 @@ static void tegra_dma_issue_pending(struct dma_chan *dc) dev_err(tdc2dev(tdc), "No DMA request\n"); goto end; } - if (!tdc->busy) { - tdc_start_head_req(tdc); - + if (!tdc->busy && tdc_start_head_req(tdc)) { /* Continuous single mode: Configure next req */ if (tdc->cyclic) { /* @@ -775,6 +784,13 @@ static int tegra_dma_terminate_all(struct dma_chan *dc) else wcount = status; + /* + * tegra_dma_stop() will drop the RPM's usage refcount, but + * tegra_dma_resume() touches hardware and thus we should keep + * the DMA clock active while it's needed. + */ + pm_runtime_get(tdc->tdma->dev); + was_busy = tdc->busy; tegra_dma_stop(tdc); @@ -786,6 +802,8 @@ static int tegra_dma_terminate_all(struct dma_chan *dc) } tegra_dma_resume(tdc); + pm_runtime_put(tdc->tdma->dev); + skip_dma_stop: tegra_dma_abort_all(tdc); @@ -1280,22 +1298,15 @@ tegra_dma_prep_dma_cyclic(struct dma_chan *dc, dma_addr_t buf_addr, static int tegra_dma_alloc_chan_resources(struct dma_chan *dc) { struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc); - struct tegra_dma *tdma = tdc->tdma; - int ret; dma_cookie_init(&tdc->dma_chan); - ret = pm_runtime_get_sync(tdma->dev); - if (ret < 0) - return ret; - return 0; } static void tegra_dma_free_chan_resources(struct dma_chan *dc) { struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc); - struct tegra_dma *tdma = tdc->tdma; struct tegra_dma_desc *dma_desc; struct tegra_dma_sg_req *sg_req; struct list_head dma_desc_list; @@ -1328,7 +1339,6 @@ static void tegra_dma_free_chan_resources(struct dma_chan *dc) list_del(&sg_req->node); kfree(sg_req); } - pm_runtime_put(tdma->dev); tdc->slave_id = TEGRA_APBDMA_SLAVE_ID_INVALID; } @@ -1428,6 +1438,11 @@ static int tegra_dma_probe(struct platform_device *pdev) spin_lock_init(&tdma->global_lock); + ret = clk_prepare(tdma->dma_clk); + if (ret) + return ret; + + pm_runtime_irq_safe(&pdev->dev); pm_runtime_enable(&pdev->dev); ret = pm_runtime_get_sync(&pdev->dev); @@ -1543,6 +1558,7 @@ static int tegra_dma_probe(struct platform_device *pdev) err_pm_disable: pm_runtime_disable(&pdev->dev); + clk_unprepare(tdma->dma_clk); return ret; } @@ -1553,6 +1569,7 @@ static int tegra_dma_remove(struct platform_device *pdev) dma_async_device_unregister(&tdma->dma_dev); pm_runtime_disable(&pdev->dev); + clk_unprepare(tdma->dma_clk); return 0; } @@ -1581,7 +1598,7 @@ static int tegra_dma_runtime_suspend(struct device *dev) TEGRA_APBDMA_CHAN_WCOUNT); } - clk_disable_unprepare(tdma->dma_clk); + clk_disable(tdma->dma_clk); return 0; } @@ -1592,7 +1609,7 @@ static int tegra_dma_runtime_resume(struct device *dev) unsigned int i; int ret; - ret = clk_prepare_enable(tdma->dma_clk); + ret = clk_enable(tdma->dma_clk); if (ret < 0) { dev_err(dev, "clk_enable failed: %d\n", ret); return ret;