1 files changed, 18 insertions, 9 deletions

diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index f993955a640c..a8af379680c1 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -247,7 +247,7 @@ struct sdma_engine;
 struct sdma_channel {
         struct sdma_engine              *sdma;
         unsigned int                    channel;
-        enum dma_data_direction         direction;
+        enum dma_transfer_direction             direction;
         enum sdma_peripheral_type       peripheral_type;
         unsigned int                    event_id0;
         unsigned int                    event_id1;
@@ -268,6 +268,8 @@ struct sdma_channel {
         struct dma_async_tx_descriptor  desc;
         dma_cookie_t                    last_completed;
         enum dma_status                 status;
+        unsigned int                    chn_count;
+        unsigned int                    chn_real_count;
 };
 
 #define IMX_DMA_SG_LOOP         (1 << 0)
@@ -503,6 +505,7 @@ static void mxc_sdma_handle_channel_normal(struct sdma_channel *sdmac)
         struct sdma_buffer_descriptor *bd;
         int i, error = 0;
 
+        sdmac->chn_real_count = 0;
         /*
          * non loop mode. Iterate over all descriptors, collect
          * errors and call callback function
@@ -512,6 +515,7 @@ static void mxc_sdma_handle_channel_normal(struct sdma_channel *sdmac)
 
                  if (bd->mode.status & (BD_DONE | BD_RROR))
                         error = -EIO;
+                 sdmac->chn_real_count += bd->mode.count;
         }
 
         if (error)
@@ -519,9 +523,9 @@ static void mxc_sdma_handle_channel_normal(struct sdma_channel *sdmac)
         else
                 sdmac->status = DMA_SUCCESS;
 
+        sdmac->last_completed = sdmac->desc.cookie;
         if (sdmac->desc.callback)
                 sdmac->desc.callback(sdmac->desc.callback_param);
-        sdmac->last_completed = sdmac->desc.cookie;
 }
 
 static void mxc_sdma_handle_channel(struct sdma_channel *sdmac)
@@ -650,7 +654,7 @@ static int sdma_load_context(struct sdma_channel *sdmac)
         struct sdma_buffer_descriptor *bd0 = sdma->channel[0].bd;
         int ret;
 
-        if (sdmac->direction == DMA_FROM_DEVICE) {
+        if (sdmac->direction == DMA_DEV_TO_MEM) {
                 load_address = sdmac->pc_from_device;
         } else {
                 load_address = sdmac->pc_to_device;
@@ -832,17 +836,18 @@ static struct sdma_channel *to_sdma_chan(struct dma_chan *chan)
 
 static dma_cookie_t sdma_tx_submit(struct dma_async_tx_descriptor *tx)
 {
+        unsigned long flags;
         struct sdma_channel *sdmac = to_sdma_chan(tx->chan);
         struct sdma_engine *sdma = sdmac->sdma;
         dma_cookie_t cookie;
 
-        spin_lock_irq(&sdmac->lock);
+        spin_lock_irqsave(&sdmac->lock, flags);
 
         cookie = sdma_assign_cookie(sdmac);
 
         sdma_enable_channel(sdma, sdmac->channel);
 
-        spin_unlock_irq(&sdmac->lock);
+        spin_unlock_irqrestore(&sdmac->lock, flags);
 
         return cookie;
 }
@@ -911,7 +916,7 @@ static void sdma_free_chan_resources(struct dma_chan *chan)
 
 static struct dma_async_tx_descriptor *sdma_prep_slave_sg(
                 struct dma_chan *chan, struct scatterlist *sgl,
-                unsigned int sg_len, enum dma_data_direction direction,
+                unsigned int sg_len, enum dma_transfer_direction direction,
                 unsigned long flags)
 {
         struct sdma_channel *sdmac = to_sdma_chan(chan);
@@ -941,6 +946,7 @@ static struct dma_async_tx_descriptor *sdma_prep_slave_sg(
                 goto err_out;
         }
 
+        sdmac->chn_count = 0;
         for_each_sg(sgl, sg, sg_len, i) {
                 struct sdma_buffer_descriptor *bd = &sdmac->bd[i];
                 int param;
@@ -957,6 +963,7 @@ static struct dma_async_tx_descriptor *sdma_prep_slave_sg(
                 }
 
                 bd->mode.count = count;
+                sdmac->chn_count += count;
 
                 if (sdmac->word_size > DMA_SLAVE_BUSWIDTH_4_BYTES) {
                         ret =  -EINVAL;
@@ -1008,7 +1015,7 @@ err_out:
 
 static struct dma_async_tx_descriptor *sdma_prep_dma_cyclic(
                 struct dma_chan *chan, dma_addr_t dma_addr, size_t buf_len,
-                size_t period_len, enum dma_data_direction direction)
+                size_t period_len, enum dma_transfer_direction direction)
 {
         struct sdma_channel *sdmac = to_sdma_chan(chan);
         struct sdma_engine *sdma = sdmac->sdma;
@@ -1093,7 +1100,7 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
                 sdma_disable_channel(sdmac);
                 return 0;
         case DMA_SLAVE_CONFIG:
-                if (dmaengine_cfg->direction == DMA_FROM_DEVICE) {
+                if (dmaengine_cfg->direction == DMA_DEV_TO_MEM) {
                         sdmac->per_address = dmaengine_cfg->src_addr;
                         sdmac->watermark_level = dmaengine_cfg->src_maxburst;
                         sdmac->word_size = dmaengine_cfg->src_addr_width;
@@ -1102,6 +1109,7 @@ static int sdma_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
                         sdmac->watermark_level = dmaengine_cfg->dst_maxburst;
                         sdmac->word_size = dmaengine_cfg->dst_addr_width;
                 }
+                sdmac->direction = dmaengine_cfg->direction;
                 return sdma_config_channel(sdmac);
         default:
                 return -ENOSYS;
@@ -1119,7 +1127,8 @@ static enum dma_status sdma_tx_status(struct dma_chan *chan,
 
         last_used = chan->cookie;
 
-        dma_set_tx_state(txstate, sdmac->last_completed, last_used, 0);
+        dma_set_tx_state(txstate, sdmac->last_completed, last_used,
+                        sdmac->chn_count - sdmac->chn_real_count);
 
         return sdmac->status;
 }