UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

intel_mid_dma: Allow IRQ sharing 

intel_mid_dma driver allows interrupt sharing. Thus it needs
to check whether IRQ source is the DMA controller and return
the appropriate IRQ return.

Signed-off-by: Yong Wang <yong.y.wang@intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Yong Wang 2010-10-04 10:37:02 +00:00 committed by Dan Williams
parent 53a61badf4
commit b306df5e92
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/dma/intel_mid_dma.c
View File

@ -817,9 +817,14 @@ static void dma_tasklet2(unsigned long data)
static irqreturn_t intel_mid_dma_interrupt(int irq, void *data) static irqreturn_t intel_mid_dma_interrupt(int irq, void *data)
{ {
struct middma_device *mid = data; struct middma_device *mid = data;
u32 status; u32 tfr_status, err_status;
int call_tasklet = 0; int call_tasklet = 0;
tfr_status = ioread32(mid->dma_base + RAW_TFR);
err_status = ioread32(mid->dma_base + RAW_ERR);
if (!tfr_status && !err_status)
return IRQ_NONE;
/*DMA Interrupt*/ /*DMA Interrupt*/
pr_debug("MDMA:Got an interrupt on irq %d\n", irq); pr_debug("MDMA:Got an interrupt on irq %d\n", irq);
if (!mid) { if (!mid) {
@ -827,19 +832,17 @@ static irqreturn_t intel_mid_dma_interrupt(int irq, void *data)
return -EINVAL; return -EINVAL;
} }
status = ioread32(mid->dma_base + RAW_TFR); pr_debug("MDMA: Status %x, Mask %x\n", tfr_status, mid->intr_mask);
pr_debug("MDMA: Status %x, Mask %x\n", status, mid->intr_mask); tfr_status &= mid->intr_mask;
status &= mid->intr_mask; if (tfr_status) {
if (status) {
/*need to disable intr*/ /*need to disable intr*/
iowrite32((status << 8), mid->dma_base + MASK_TFR); iowrite32((tfr_status << 8), mid->dma_base + MASK_TFR);
pr_debug("MDMA: Calling tasklet %x\n", status); pr_debug("MDMA: Calling tasklet %x\n", tfr_status);
call_tasklet = 1; call_tasklet = 1;
} }
status = ioread32(mid->dma_base + RAW_ERR); err_status &= mid->intr_mask;
status &= mid->intr_mask; if (err_status) {
if (status) { iowrite32(MASK_INTR_REG(err_status), mid->dma_base + MASK_ERR);
iowrite32(MASK_INTR_REG(status), mid->dma_base + MASK_ERR);
call_tasklet = 1; call_tasklet = 1;
} }
if (call_tasklet) if (call_tasklet)