From: Jon Hunter <jonathanh@nvidia.com>
To: Laxman Dewangan <ldewangan@nvidia.com>,
Vinod Koul <vinod.koul@intel.com>,
Stephen Warren <swarren@wwwdotorg.org>,
Thierry Reding <thierry.reding@gmail.com>,
Alexandre Courbot <gnurou@gmail.com>
Cc: <dmaengine@vger.kernel.org>, <linux-tegra@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <andy.shevchenko@gmail.com>,
Jon Hunter <jonathanh@nvidia.com>
Subject: [PATCH V3 4/6] dmaengine: tegra-apb: Only save channel state for those in use
Date: Fri, 13 Nov 2015 16:39:41 +0000 [thread overview]
Message-ID: <1447432783-7466-5-git-send-email-jonathanh@nvidia.com> (raw)
In-Reply-To: <1447432783-7466-1-git-send-email-jonathanh@nvidia.com>
Currently the tegra-apb DMA driver suspend/resume helpers, save and
restore the registers for all channels regardless of whether they are
in use or not. Change this so that only channels that have been
allocated and configured are saved and restored.
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
---
V3 changes:
- Updated comment to be on a single line
drivers/dma/tegra20-apb-dma.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/dma/tegra20-apb-dma.c b/drivers/dma/tegra20-apb-dma.c
index 18a561376c63..d4cabd6931e5 100644
--- a/drivers/dma/tegra20-apb-dma.c
+++ b/drivers/dma/tegra20-apb-dma.c
@@ -1545,6 +1545,10 @@ static int tegra_dma_pm_suspend(struct device *dev)
struct tegra_dma_channel *tdc = &tdma->channels[i];
struct tegra_dma_channel_regs *ch_reg = &tdc->channel_reg;
+ /* Only save the state of DMA channels that are in use */
+ if (!tdc->config_init)
+ continue;
+
ch_reg->csr = tdc_read(tdc, TEGRA_APBDMA_CHAN_CSR);
ch_reg->ahb_ptr = tdc_read(tdc, TEGRA_APBDMA_CHAN_AHBPTR);
ch_reg->apb_ptr = tdc_read(tdc, TEGRA_APBDMA_CHAN_APBPTR);
@@ -1579,6 +1583,10 @@ static int tegra_dma_pm_resume(struct device *dev)
struct tegra_dma_channel *tdc = &tdma->channels[i];
struct tegra_dma_channel_regs *ch_reg = &tdc->channel_reg;
+ /* Only restore the state of DMA channels that are in use */
+ if (!tdc->config_init)
+ continue;
+
if (tdma->chip_data->support_separate_wcount_reg)
tdc_write(tdc, TEGRA_APBDMA_CHAN_WCOUNT,
ch_reg->wcount);
--
2.1.4
next prev parent reply other threads:[~2015-11-13 16:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-13 16:39 [PATCH V3 0/6] DMA: tegra-apb: Clean-up Jon Hunter
2015-11-13 16:39 ` [PATCH V3 1/6] dmaengine: tegra-apb: Correct runtime-pm usage Jon Hunter
2015-11-14 13:27 ` Andy Shevchenko
2015-11-16 9:34 ` Jon Hunter
2015-11-13 16:39 ` [PATCH V3 2/6] dmaengine: tegra-apb: Use dev_get_drvdata() Jon Hunter
2015-11-13 16:39 ` [PATCH V3 3/6] dmaengine: tegra-apb: Save and restore word count Jon Hunter
2015-11-13 16:39 ` Jon Hunter [this message]
2015-11-13 16:39 ` [PATCH V3 5/6] dmaengine: tegra-apb: Update driver to use GFP_NOWAIT Jon Hunter
2015-11-13 16:39 ` [PATCH V3 6/6] dmaengine: tegra-apb: Free interrupts before killing tasklets Jon Hunter
2015-11-30 16:45 ` [PATCH V3 0/6] DMA: tegra-apb: Clean-up Jon Hunter
2015-12-05 10:43 ` 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=1447432783-7466-5-git-send-email-jonathanh@nvidia.com \
--to=jonathanh@nvidia.com \
--cc=andy.shevchenko@gmail.com \
--cc=dmaengine@vger.kernel.org \
--cc=gnurou@gmail.com \
--cc=ldewangan@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=swarren@wwwdotorg.org \
--cc=thierry.reding@gmail.com \
--cc=vinod.koul@intel.com \
/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