Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4aad5be0 authored by Jon Hunter's avatar Jon Hunter Committed by Vinod Koul
Browse files

dmaengine: tegra-apb: Only save channel state for those in use 



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: default avatarJon Hunter <jonathanh@nvidia.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 68ae7a93

drivers/dma/tegra20-apb-dma.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -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 *tdc = &tdma->channels[i];

		struct tegra_dma_channel_regs *ch_reg = &tdc->channel_reg;

		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->csr = tdc_read(tdc, TEGRA_APBDMA_CHAN_CSR);

		ch_reg->ahb_ptr = tdc_read(tdc, TEGRA_APBDMA_CHAN_AHBPTR);

		ch_reg->ahb_ptr = tdc_read(tdc, TEGRA_APBDMA_CHAN_AHBPTR);

		ch_reg->apb_ptr = tdc_read(tdc, TEGRA_APBDMA_CHAN_APBPTR);

		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 *tdc = &tdma->channels[i];

		struct tegra_dma_channel_regs *ch_reg = &tdc->channel_reg;

		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)

		if (tdma->chip_data->support_separate_wcount_reg)

			tdc_write(tdc, TEGRA_APBDMA_CHAN_WCOUNT,

			tdc_write(tdc, TEGRA_APBDMA_CHAN_WCOUNT,

				  ch_reg->wcount);

				  ch_reg->wcount);