GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-06 14:45:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

DMA: PL330: move filter function into driver

Browse source 
The dma channel selection filter function is moved from plat-samsung
into the pl330 driver. In additon to that, a check is added in the
filter function to ensure that the channel on which the filter has
been invoked is pl330 channel instance (and avoid any incorrect
access of chan->private in a system with multiple types of DMA
drivers).

Suggested-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Thomas Abraham 2011-10-24 11:43:02 +02:00 • committed by Kukjin Kim
parent a169a888bf
commit 3e2ec13a81
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/plat-samsung/dma-ops.c
View file

@ -18,12 +18,6 @@
#include <mach/dma.h> #include <mach/dma.h>
static inline bool pl330_filter(struct dma_chan *chan, void *param)
{
struct dma_pl330_peri *peri = chan->private;
return peri->peri_id == (unsigned)param;
}
static unsigned samsung_dmadev_request(enum dma_ch dma_ch, static unsigned samsung_dmadev_request(enum dma_ch dma_ch,
struct samsung_dma_info *info) struct samsung_dma_info *info)
{ {

15
drivers/dma/pl330.c
View file

@ -116,6 +116,9 @@ struct dma_pl330_desc {
struct dma_pl330_chan *pchan; struct dma_pl330_chan *pchan;
}; };
/* forward declaration */
static struct amba_driver pl330_driver;
static inline struct dma_pl330_chan * static inline struct dma_pl330_chan *
to_pchan(struct dma_chan *ch) to_pchan(struct dma_chan *ch)
{ {
@ -267,6 +270,18 @@ static void dma_pl330_rqcb(void *token, enum pl330_op_err err)
tasklet_schedule(&pch->task); tasklet_schedule(&pch->task);
} }
bool pl330_filter(struct dma_chan *chan, void *param)
{
struct dma_pl330_peri *peri;
if (chan->device->dev->driver != &pl330_driver.drv)
return false;
peri = chan->private;
return peri->peri_id == (unsigned)param;
}
EXPORT_SYMBOL(pl330_filter);
static int pl330_alloc_chan_resources(struct dma_chan *chan) static int pl330_alloc_chan_resources(struct dma_chan *chan)
{ {
struct dma_pl330_chan *pch = to_pchan(chan); struct dma_pl330_chan *pch = to_pchan(chan);

2
include/linux/amba/pl330.h
View file

@ -12,6 +12,7 @@
#ifndef __AMBA_PL330_H_ #ifndef __AMBA_PL330_H_
#define __AMBA_PL330_H_ #define __AMBA_PL330_H_
#include <linux/dmaengine.h>
#include <asm/hardware/pl330.h> #include <asm/hardware/pl330.h>
struct dma_pl330_peri { struct dma_pl330_peri {
@ -38,4 +39,5 @@ struct dma_pl330_platdata {
unsigned mcbuf_sz; unsigned mcbuf_sz;
}; };
extern bool pl330_filter(struct dma_chan *chan, void *param);
#endif /* __AMBA_PL330_H_ */ #endif /* __AMBA_PL330_H_ */