Re: [PATCH 1/2 v2] pch_dma: Fix suspend issue

From: Vinod Koul
Date: Tue Oct 11 2011 - 13:09:15 EST


On Tue, 2011-10-11 at 21:43 +0900, Tomoya MORINAGA wrote:
> Currently, executing suspend/hibernation,
> memory access violation occurs.
>
> In pch_dma_save_regs() called by suspend(),
> you can see the following code.
>
> static void pch_dma_save_regs(struct pch_dma *pd)
> {
> snip...
> list_for_each_entry_safe(chan, _c, &pd->dma.channels, device_node) {
> pd_chan = to_pd_chan(chan);
>
> pd->ch_regs[i].dev_addr = channel_readl(pd_chan, DEV_ADDR);
> pd->ch_regs[i].mem_addr = channel_readl(pd_chan, MEM_ADDR);
> pd->ch_regs[i].size = channel_readl(pd_chan, SIZE);
> pd->ch_regs[i].next = channel_readl(pd_chan, NEXT);
>
> i++;
> }
> }
>
> Max loop count is 12 defined at pci_table.
> So, this caused memory access violation.
>
> This patch fixes the issue
> - Modify array size (MAX_CHAN_NR)
>
> Signed-off-by: Tomoya MORINAGA <tomoya-linux@xxxxxxxxxxxxxxxxxx>
> ---
> drivers/dma/pch_dma.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/dma/pch_dma.c b/drivers/dma/pch_dma.c
> index ff5b38f..e72bfeb 100644
> --- a/drivers/dma/pch_dma.c
> +++ b/drivers/dma/pch_dma.c
> @@ -59,7 +59,7 @@
> #define DMA_DESC_FOLLOW_WITHOUT_IRQ 0x2
> #define DMA_DESC_FOLLOW_WITH_IRQ 0x3
>
> -#define MAX_CHAN_NR 8
> +#define MAX_CHAN_NR 12
>
> static unsigned int init_nr_desc_per_channel = 64;
> module_param(init_nr_desc_per_channel, uint, 0644);
Applied only 1/2. 2/2 needs modifications

Thanks

--
~Vinod

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/