lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msm: add dsb() syncronization to datamover driver

Browse Source 
Avoids problems on the scorpion core.

Signed-off-by: Brian Swetland <swetland@google.com>
This commit is contained in:
Brian Swetland
2009-08-19 18:49:45 -07:00
committed by Daniel Walker
parent c5541079da
commit 9f68fcdb8f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-msm/dma.c
View File

@@ -59,6 +59,7 @@ void msm_dmov_enqueue_cmd(unsigned id, struct msm_dmov_cmd *cmd)
spin_lock_irqsave(&msm_dmov_lock, irq_flags); spin_lock_irqsave(&msm_dmov_lock, irq_flags);
if (!channel_active) if (!channel_active)
clk_enable(msm_dmov_clk); clk_enable(msm_dmov_clk);
dsb();
status = readl(DMOV_STATUS(id)); status = readl(DMOV_STATUS(id));
if (list_empty(&ready_commands[id]) && if (list_empty(&ready_commands[id]) &&
(status & DMOV_STATUS_CMD_PTR_RDY)) { (status & DMOV_STATUS_CMD_PTR_RDY)) {
@@ -172,6 +173,7 @@ static irqreturn_t msm_datamover_irq_handler(int irq, void *dev_id)
"for %p, result %x\n", id, cmd, ch_result); "for %p, result %x\n", id, cmd, ch_result);
if (cmd) { if (cmd) {
list_del(&cmd->list); list_del(&cmd->list);
dsb();
cmd->complete_func(cmd, ch_result, NULL); cmd->complete_func(cmd, ch_result, NULL);
} }
} }
@@ -188,6 +190,7 @@ static irqreturn_t msm_datamover_irq_handler(int irq, void *dev_id)
PRINT_FLOW("msm_datamover_irq_handler id %d, flush, result %x, flush0 %x\n", id, ch_result, errdata.flush[0]); PRINT_FLOW("msm_datamover_irq_handler id %d, flush, result %x, flush0 %x\n", id, ch_result, errdata.flush[0]);
if (cmd) { if (cmd) {
list_del(&cmd->list); list_del(&cmd->list);
dsb();
cmd->complete_func(cmd, ch_result, &errdata); cmd->complete_func(cmd, ch_result, &errdata);
} }
} }
@@ -205,6 +208,7 @@ static irqreturn_t msm_datamover_irq_handler(int irq, void *dev_id)
PRINT_ERROR("msm_datamover_irq_handler id %d, error, result %x, flush0 %x\n", id, ch_result, errdata.flush[0]); PRINT_ERROR("msm_datamover_irq_handler id %d, error, result %x, flush0 %x\n", id, ch_result, errdata.flush[0]);
if (cmd) { if (cmd) {
list_del(&cmd->list); list_del(&cmd->list);
dsb();
cmd->complete_func(cmd, ch_result, &errdata); cmd->complete_func(cmd, ch_result, &errdata);
} }
/* this does not seem to work, once we get an error */ /* this does not seem to work, once we get an error */