Merge remote-tracking branch 'slave-dma/next'

[linux] / drivers / dma / imx-sdma.c

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 86708fb..12e03a9 100644 (file)
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -377,6 +377,7 @@ struct sdma_channel {
        unsigned long                   watermark_level;
        u32                             shp_addr, per_addr;
        enum dma_status                 status;
+       bool                            context_loaded;
        struct imx_dma_data             data;
        struct work_struct              terminate_worker;
 };
@@ -677,7 +678,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size,
        int ret;
        unsigned long flags;
 
-       buf_virt = dma_alloc_coherent(NULL, size, &buf_phys, GFP_KERNEL);
+       buf_virt = dma_alloc_coherent(sdma->dev, size, &buf_phys, GFP_KERNEL);
        if (!buf_virt) {
                return -ENOMEM;
        }
@@ -696,7 +697,7 @@ static int sdma_load_script(struct sdma_engine *sdma, void *buf, int size,
 
        spin_unlock_irqrestore(&sdma->channel_0_lock, flags);
 
-       dma_free_coherent(NULL, size, buf_virt, buf_phys);
+       dma_free_coherent(sdma->dev, size, buf_virt, buf_phys);
 
        return ret;
 }
@@ -970,6 +971,9 @@ static int sdma_load_context(struct sdma_channel *sdmac)
        int ret;
        unsigned long flags;
 
+       if (sdmac->context_loaded)
+               return 0;
+
        if (sdmac->direction == DMA_DEV_TO_MEM)
                load_address = sdmac->pc_from_device;
        else if (sdmac->direction == DMA_DEV_TO_DEV)
@@ -1012,6 +1016,8 @@ static int sdma_load_context(struct sdma_channel *sdmac)
 
        spin_unlock_irqrestore(&sdma->channel_0_lock, flags);
 
+       sdmac->context_loaded = true;
+
        return ret;
 }
 
@@ -1051,6 +1057,7 @@ static void sdma_channel_terminate_work(struct work_struct *work)
        sdmac->desc = NULL;
        spin_unlock_irqrestore(&sdmac->vc.lock, flags);
        vchan_dma_desc_free_list(&sdmac->vc, &head);
+       sdmac->context_loaded = false;
 }
 
 static int sdma_disable_channel_async(struct dma_chan *chan)
@@ -1182,7 +1189,7 @@ static int sdma_request_channel0(struct sdma_engine *sdma)
 {
        int ret = -EBUSY;
 
-       sdma->bd0 = dma_alloc_coherent(NULL, PAGE_SIZE, &sdma->bd0_phys,
+       sdma->bd0 = dma_alloc_coherent(sdma->dev, PAGE_SIZE, &sdma->bd0_phys,
                                       GFP_NOWAIT);
        if (!sdma->bd0) {
                ret = -ENOMEM;
@@ -1205,8 +1212,8 @@ static int sdma_alloc_bd(struct sdma_desc *desc)
        u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor);
        int ret = 0;
 
-       desc->bd = dma_alloc_coherent(NULL, bd_size, &desc->bd_phys,
-                                     GFP_NOWAIT);
+       desc->bd = dma_alloc_coherent(desc->sdmac->sdma->dev, bd_size,
+                                     &desc->bd_phys, GFP_NOWAIT);
        if (!desc->bd) {
                ret = -ENOMEM;
                goto out;
@@ -1219,7 +1226,8 @@ static void sdma_free_bd(struct sdma_desc *desc)
 {
        u32 bd_size = desc->num_bd * sizeof(struct sdma_buffer_descriptor);
 
-       dma_free_coherent(NULL, bd_size, desc->bd, desc->bd_phys);
+       dma_free_coherent(desc->sdmac->sdma->dev, bd_size, desc->bd,
+                         desc->bd_phys);
 }
 
 static void sdma_desc_free(struct virt_dma_desc *vd)
@@ -1842,7 +1850,7 @@ static int sdma_init(struct sdma_engine *sdma)
        /* Be sure SDMA has not started yet */
        writel_relaxed(0, sdma->regs + SDMA_H_C0PTR);
 
-       sdma->channel_control = dma_alloc_coherent(NULL,
+       sdma->channel_control = dma_alloc_coherent(sdma->dev,
                        MAX_DMA_CHANNELS * sizeof (struct sdma_channel_control) +
                        sizeof(struct sdma_context_data),
                        &ccb_phys, GFP_KERNEL);