diff options
| author | Brian Swetland <swetland@google.com> | 2009-08-20 03:49:45 +0200 |
|---|---|---|
| committer | Daniel Walker <dwalker@codeaurora.org> | 2010-05-12 18:14:17 +0200 |
| commit | 9f68fcdb8f9b0f55830f58b02cecc5c26b0ba17b (patch) | |
| tree | e3b4bae4afbaeefe6352675e51d12a57623929c4 /arch/arm/mach-msm/dma.c | |
| parent | [ARM] msm: dma: Enable dma clock while dma is active (diff) | |
| download | linux-9f68fcdb8f9b0f55830f58b02cecc5c26b0ba17b.tar.xz linux-9f68fcdb8f9b0f55830f58b02cecc5c26b0ba17b.zip | |
msm: add dsb() syncronization to datamover driver
Avoids problems on the scorpion core.
Signed-off-by: Brian Swetland <swetland@google.com>
Diffstat (limited to 'arch/arm/mach-msm/dma.c')
| -rw-r--r-- | arch/arm/mach-msm/dma.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/dma.c b/arch/arm/mach-msm/dma.c index e80cad468925..3d725ae518e4 100644 --- a/arch/arm/mach-msm/dma.c +++ b/arch/arm/mach-msm/dma.c @@ -59,6 +59,7 @@ void msm_dmov_enqueue_cmd(unsigned id, struct msm_dmov_cmd *cmd) spin_lock_irqsave(&msm_dmov_lock, irq_flags); if (!channel_active) clk_enable(msm_dmov_clk); + dsb(); status = readl(DMOV_STATUS(id)); if (list_empty(&ready_commands[id]) && (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); if (cmd) { list_del(&cmd->list); + dsb(); 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]); if (cmd) { list_del(&cmd->list); + dsb(); 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]); if (cmd) { list_del(&cmd->list); + dsb(); cmd->complete_func(cmd, ch_result, &errdata); } /* this does not seem to work, once we get an error */ |