Commit c58f7a1d authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 4781/1: S3C24XX: DMA suspend and resume support 



If an DMA channel was active at suspend, then ensure that
it is correctly reconfigured when the system resumes.

Note, the previous policy was for each driver to handle their
own reconfiguration on resume. The policy has been changed to
make the individual driver's job easier.

Signed-off-by: default avatarBen Dooks <ben-linux@flfuf.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c6709e8e

arch/arm/plat-s3c24xx/dma.c

+25 −1
Original line number Diff line number Diff line
@@ -1173,6 +1173,7 @@ int s3c2410_dma_devconfig(int channel, 


	chan->source = source;

	chan->dev_addr = devaddr;

	chan->hw_cfg = hwcfg;



	switch (source) {

	case S3C2410_DMASRC_HW:
@@ -1235,6 +1236,10 @@ int s3c2410_dma_getposition(dmach_t channel, dma_addr_t *src, dma_addr_t *dst) 


EXPORT_SYMBOL(s3c2410_dma_getposition);



static struct s3c2410_dma_chan *to_dma_chan(struct sys_device *dev)

{

	return container_of(dev, struct s3c2410_dma_chan, dev);

}



/* system device class */
@@ -1242,7 +1247,7 @@ EXPORT_SYMBOL(s3c2410_dma_getposition); 


static int s3c2410_dma_suspend(struct sys_device *dev, pm_message_t state)

{

	struct s3c2410_dma_chan *cp = container_of(dev, struct s3c2410_dma_chan, dev);

	struct s3c2410_dma_chan *cp = to_dma_chan(dev);



	printk(KERN_DEBUG "suspending dma channel %d\n", cp->number);
@@ -1264,6 +1269,24 @@ static int s3c2410_dma_suspend(struct sys_device *dev, pm_message_t state) 


static int s3c2410_dma_resume(struct sys_device *dev)

{

	struct s3c2410_dma_chan *cp = to_dma_chan(dev);

	unsigned int no = cp->number | DMACH_LOW_LEVEL;



	/* restore channel's hardware configuration */



	if (!cp->in_use)

		return 0;



	printk(KERN_INFO "dma%d: restoring configuration\n", cp->number);



	s3c2410_dma_config(no, cp->xfer_unit, cp->dcon);

	s3c2410_dma_devconfig(no, cp->source, cp->hw_cfg, cp->dev_addr);



	/* re-select the dma source for this channel */



	if (cp->map != NULL)

		dma_sel.select(cp, cp->map);



	return 0;

}
@@ -1453,6 +1476,7 @@ static struct s3c2410_dma_chan *s3c2410_dma_map_channel(int channel) 


 found:

	dmach = &s3c2410_chans[ch];

	dmach->map = ch_map;

	dma_chan_map[channel] = dmach;



	/* select the channel */

include/asm-arm/arch-s3c2410/dma.h

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ struct s3c2410_dma_chan { 
	unsigned long		 dev_addr;

	unsigned long		 load_timeout;

	unsigned int		 flags;		/* channel flags */

	unsigned int		 hw_cfg;	/* last hw config */



	struct s3c24xx_dma_map	*map;		/* channel hw maps */

CRA Git | Maintained and supported by SUSTech CRA and CCSE