From: Jon Hunter <jonathanh@nvidia.com>
To: "Dmitry Osipenko" <digetx@gmail.com>,
"Laxman Dewangan" <ldewangan@nvidia.com>,
"Vinod Koul" <vkoul@kernel.org>,
"Dan Williams" <dan.j.williams@intel.com>,
"Thierry Reding" <thierry.reding@gmail.com>,
"Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: <dmaengine@vger.kernel.org>, <linux-tegra@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v8 12/19] dmaengine: tegra-apb: Keep clock enabled only during of DMA transfer
Date: Fri, 14 Feb 2020 14:15:08 +0000 [thread overview]
Message-ID: <e446d1b5-4aec-70fb-b0b8-5f2127c48cf8@nvidia.com> (raw)
In-Reply-To: <20200209163356.6439-13-digetx@gmail.com>
On 09/02/2020 16:33, Dmitry Osipenko wrote:
> 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 <digetx@gmail.com>
> ---
> drivers/dma/tegra20-apb-dma.c | 36 ++++++++++++++++++++++++-----------
> 1 file changed, 25 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
> index 049e98ae1240..6e057a9f0e46 100644
> --- a/drivers/dma/tegra20-apb-dma.c
> +++ b/drivers/dma/tegra20-apb-dma.c
> @@ -569,6 +569,7 @@ static bool handle_continuous_head_request(struct tegra_dma_channel *tdc,
> hsgreq = list_first_entry(&tdc->pending_sg_req, typeof(*hsgreq), node);
> if (!hsgreq->configured) {
> tegra_dma_stop(tdc);
> + pm_runtime_put(tdc->tdma->dev);
> dev_err(tdc2dev(tdc), "Error in DMA transfer, aborting DMA\n");
> tegra_dma_abort_all(tdc);
> return false;
> @@ -604,9 +605,14 @@ static void handle_once_dma_done(struct tegra_dma_channel *tdc,
> list_add_tail(&sgreq->node, &tdc->free_sg_req);
>
> /* Do not start DMA if it is going to be terminate */
> - if (to_terminate || list_empty(&tdc->pending_sg_req))
> + if (to_terminate)
> return;
>
> + if (list_empty(&tdc->pending_sg_req)) {
> + pm_runtime_put(tdc->tdma->dev);
> + return;
> + }
> +
> tdc_start_head_req(tdc);
> }
>
> @@ -712,6 +718,7 @@ static void tegra_dma_issue_pending(struct dma_chan *dc)
> {
> struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc);
> unsigned long flags;
> + int err;
>
> spin_lock_irqsave(&tdc->lock, flags);
> if (list_empty(&tdc->pending_sg_req)) {
> @@ -719,6 +726,12 @@ static void tegra_dma_issue_pending(struct dma_chan *dc)
> goto end;
> }
> if (!tdc->busy) {
> + err = pm_runtime_get_sync(tdc->tdma->dev);
> + if (err < 0) {
> + dev_err(tdc2dev(tdc), "Failed to enable DMA\n");
> + goto end;
> + }
> +
> tdc_start_head_req(tdc);
>
> /* Continuous single mode: Configure next req */
> @@ -774,6 +787,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);
>
> @@ -1268,22 +1283,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;
> @@ -1316,7 +1324,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;
> }
> @@ -1416,6 +1423,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);
> @@ -1531,6 +1543,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;
> }
> @@ -1541,6 +1554,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;
> }
> @@ -1569,7 +1583,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;
> }
> @@ -1580,7 +1594,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;
>
Acked-by: Jon Hunter <jonathanh@nvidia.com>
Thanks!
Jon
--
nvpublic
next prev parent reply other threads:[~2020-02-14 14:15 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-09 16:33 [PATCH v8 00/19] NVIDIA Tegra APB DMA driver fixes and improvements Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 01/19] dmaengine: tegra-apb: Fix use-after-free Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 02/19] dmaengine: tegra-apb: Prevent race conditions of tasklet vs free list Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 03/19] dmaengine: tegra-apb: Implement synchronization hook Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 04/19] dmaengine: tegra-apb: Prevent race conditions on channel's freeing Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 05/19] dmaengine: tegra-apb: Clean up tasklet releasing Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 06/19] dmaengine: tegra-apb: Use devm_platform_ioremap_resource Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 07/19] dmaengine: tegra-apb: Use devm_request_irq Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 08/19] dmaengine: tegra-apb: Fix coding style problems Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 09/19] dmaengine: tegra-apb: Remove unneeded initialization of tdc->config_init Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 10/19] dmaengine: tegra-apb: Remove assumptions about unavailable runtime PM Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 11/19] dmaengine: tegra-apb: Remove duplicated pending_sg_req checks Dmitry Osipenko
2020-02-14 14:13 ` Jon Hunter
2020-02-09 16:33 ` [PATCH v8 12/19] dmaengine: tegra-apb: Keep clock enabled only during of DMA transfer Dmitry Osipenko
2020-02-14 14:15 ` Jon Hunter [this message]
2020-02-09 16:33 ` [PATCH v8 13/19] dmaengine: tegra-apb: Clean up suspend-resume Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 14/19] dmaengine: tegra-apb: Add missing of_dma_controller_free Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 15/19] dmaengine: tegra-apb: Allow to compile as a loadable kernel module Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 16/19] dmaengine: tegra-apb: Remove MODULE_ALIAS Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 17/19] dmaengine: tegra-apb: Support COMPILE_TEST Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 18/19] dmaengine: tegra-apb: Remove unused function argument Dmitry Osipenko
2020-02-14 14:16 ` Jon Hunter
2020-02-14 16:54 ` Dmitry Osipenko
2020-02-17 11:15 ` Jon Hunter
2020-02-17 14:56 ` Dmitry Osipenko
2020-02-09 16:33 ` [PATCH v8 19/19] dmaengine: tegra-apb: Improve error message about DMA underflow Dmitry Osipenko
2020-02-14 14:16 ` Jon Hunter
2020-02-25 6:32 ` [PATCH v8 00/19] NVIDIA Tegra APB DMA driver fixes and improvements Vinod Koul
2020-02-25 7:05 ` Dmitry Osipenko
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=e446d1b5-4aec-70fb-b0b8-5f2127c48cf8@nvidia.com \
--to=jonathanh@nvidia.com \
--cc=dan.j.williams@intel.com \
--cc=digetx@gmail.com \
--cc=dmaengine@vger.kernel.org \
--cc=ldewangan@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mirq-linux@rere.qmqm.pl \
--cc=thierry.reding@gmail.com \
--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).