1 files changed, 87 insertions, 12 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 2558d705c92e..1aab8a120d02 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -53,6 +53,9 @@ static void sdhci_finish_command(struct sdhci_host *);
 static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode);
 static void sdhci_tuning_timer(unsigned long data);
 static void sdhci_enable_preset_value(struct sdhci_host *host, bool enable);
+static int sdhci_pre_dma_transfer(struct sdhci_host *host,
+                                        struct mmc_data *data,
+                                        struct sdhci_host_next *next);
 
 #ifdef CONFIG_PM
 static int sdhci_runtime_pm_get(struct sdhci_host *host);
@@ -505,9 +508,8 @@ static int sdhci_adma_table_pre(struct sdhci_host *host,
                 goto fail;
         BUG_ON(host->align_addr & host->align_mask);
 
-        host->sg_count = dma_map_sg(mmc_dev(host->mmc),
-                data->sg, data->sg_len, direction);
-        if (host->sg_count == 0)
+        host->sg_count = sdhci_pre_dma_transfer(host, data, NULL);
+        if (host->sg_count < 0)
                 goto unmap_align;
 
         desc = host->adma_table;
@@ -645,8 +647,9 @@ static void sdhci_adma_table_post(struct sdhci_host *host,
                 }
         }
 
-        dma_unmap_sg(mmc_dev(host->mmc), data->sg,
-                data->sg_len, direction);
+        if (!data->host_cookie)
+                dma_unmap_sg(mmc_dev(host->mmc), data->sg,
+                        data->sg_len, direction);
 }
 
 static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd)
@@ -842,11 +845,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
                 } else {
                         int sg_cnt;
 
-                        sg_cnt = dma_map_sg(mmc_dev(host->mmc),
-                                        data->sg, data->sg_len,
-                                        (data->flags & MMC_DATA_READ) ?
-                                                DMA_FROM_DEVICE :
-                                                DMA_TO_DEVICE);
+                        sg_cnt = sdhci_pre_dma_transfer(host, data, NULL);
                         if (sg_cnt == 0) {
                                 /*
                                  * This only happens when someone fed
@@ -959,8 +958,10 @@ static void sdhci_finish_data(struct sdhci_host *host)
                 if (host->flags & SDHCI_USE_ADMA)
                         sdhci_adma_table_post(host, data);
                 else {
-                        dma_unmap_sg(mmc_dev(host->mmc), data->sg,
-                                data->sg_len, (data->flags & MMC_DATA_READ) ?
+                        if (!data->host_cookie)
+                                dma_unmap_sg(mmc_dev(host->mmc),
+                                        data->sg, data->sg_len,
+                                        (data->flags & MMC_DATA_READ) ?
                                         DMA_FROM_DEVICE : DMA_TO_DEVICE);
                 }
         }
@@ -2125,6 +2126,77 @@ static void sdhci_enable_preset_value(struct sdhci_host *host, bool enable)
         }
 }
 
+static void sdhci_post_req(struct mmc_host *mmc, struct mmc_request *mrq,
+                                int err)
+{
+        struct sdhci_host *host = mmc_priv(mmc);
+        struct mmc_data *data = mrq->data;
+
+        if (host->flags & SDHCI_REQ_USE_DMA) {
+                if (data->host_cookie)
+                        dma_unmap_sg(mmc_dev(host->mmc), data->sg, data->sg_len,
+                                         data->flags & MMC_DATA_WRITE ?
+                                         DMA_TO_DEVICE : DMA_FROM_DEVICE);
+                mrq->data->host_cookie = 0;
+        }
+}
+
+static int sdhci_pre_dma_transfer(struct sdhci_host *host,
+                                       struct mmc_data *data,
+                                       struct sdhci_host_next *next)
+{
+        int sg_count;
+
+        if (!next && data->host_cookie &&
+            data->host_cookie != host->next_data.cookie) {
+                pr_debug(DRIVER_NAME "[%s] invalid cookie: %d, next-cookie %d\n",
+                        __func__, data->host_cookie, host->next_data.cookie);
+                data->host_cookie = 0;
+        }
+
+        /* Check if next job is already prepared */
+        if (next ||
+            (!next && data->host_cookie != host->next_data.cookie)) {
+                sg_count = dma_map_sg(mmc_dev(host->mmc), data->sg,
+                                     data->sg_len,
+                                     data->flags & MMC_DATA_WRITE ?
+                                     DMA_TO_DEVICE : DMA_FROM_DEVICE);
+
+        } else {
+                sg_count = host->next_data.sg_count;
+                host->next_data.sg_count = 0;
+        }
+
+
+        if (sg_count == 0)
+                return -EINVAL;
+
+        if (next) {
+                next->sg_count = sg_count;
+                data->host_cookie = ++next->cookie < 0 ? 1 : next->cookie;
+        } else
+                host->sg_count = sg_count;
+
+        return sg_count;
+}
+
+static void sdhci_pre_req(struct mmc_host *mmc, struct mmc_request *mrq,
+                               bool is_first_req)
+{
+        struct sdhci_host *host = mmc_priv(mmc);
+
+        if (mrq->data->host_cookie) {
+                mrq->data->host_cookie = 0;
+                return;
+        }
+
+        if (host->flags & SDHCI_REQ_USE_DMA)
+                if (sdhci_pre_dma_transfer(host,
+                                        mrq->data,
+                                        &host->next_data) < 0)
+                        mrq->data->host_cookie = 0;
+}
+
 static void sdhci_card_event(struct mmc_host *mmc)
 {
         struct sdhci_host *host = mmc_priv(mmc);
@@ -2158,6 +2230,8 @@ static void sdhci_card_event(struct mmc_host *mmc)
 
 static const struct mmc_host_ops sdhci_ops = {
         .request        = sdhci_request,
+        .post_req       = sdhci_post_req,
+        .pre_req        = sdhci_pre_req,
         .set_ios        = sdhci_set_ios,
         .get_cd         = sdhci_get_cd,
         .get_ro         = sdhci_get_ro,
@@ -3015,6 +3089,7 @@ int sdhci_add_host(struct sdhci_host *host)
                 host->max_clk = host->ops->get_max_clock(host);
         }
 
+        host->next_data.cookie = 1;
         /*
          * In case of Host Controller v3.00, find out whether clock
          * multiplier is supported.