3 files changed, 29 insertions, 33 deletions

diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index b7156a4555b5..f967226d7505 100644
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@ -187,9 +187,8 @@ static void au1xmmc_tasklet_finish(unsigned long param)
 }
 
 static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
-                                struct mmc_command *cmd)
+                                struct mmc_command *cmd, unsigned int flags)
 {
-
         u32 mmccmd = (cmd->opcode << SD_CMD_CI_SHIFT);
 
         switch (mmc_resp_type(cmd)) {
@@ -213,24 +212,16 @@ static int au1xmmc_send_command(struct au1xmmc_host *host, int wait,
                 return MMC_ERR_INVALID;
         }
 
-        switch(cmd->opcode) {
-        case MMC_READ_SINGLE_BLOCK:
-        case SD_APP_SEND_SCR:
-                mmccmd |= SD_CMD_CT_2;
-                break;
-        case MMC_READ_MULTIPLE_BLOCK:
-                mmccmd |= SD_CMD_CT_4;
-                break;
-        case MMC_WRITE_BLOCK:
-                mmccmd |= SD_CMD_CT_1;
-                break;
-
-        case MMC_WRITE_MULTIPLE_BLOCK:
-                mmccmd |= SD_CMD_CT_3;
-                break;
-        case MMC_STOP_TRANSMISSION:
-                mmccmd |= SD_CMD_CT_7;
-                break;
+        if (flags & MMC_DATA_READ) {
+                if (flags & MMC_DATA_MULTI)
+                        mmccmd |= SD_CMD_CT_4;
+                else
+                        mmccmd |= SD_CMD_CT_2;
+        } else if (flags & MMC_DATA_WRITE) {
+                if (flags & MMC_DATA_MULTI)
+                        mmccmd |= SD_CMD_CT_3;
+                else
+                        mmccmd |= SD_CMD_CT_1;
         }
 
         au_writel(cmd->arg, HOST_CMDARG(host));
@@ -665,6 +656,7 @@ static void au1xmmc_request(struct mmc_host* mmc, struct mmc_request* mrq)
 {
 
         struct au1xmmc_host *host = mmc_priv(mmc);
+        unsigned int flags = 0;
         int ret = MMC_ERR_NONE;
 
         WARN_ON(irqs_disabled());
@@ -677,11 +669,12 @@ static void au1xmmc_request(struct mmc_host* mmc, struct mmc_request* mrq)
 
         if (mrq->data) {
                 FLUSH_FIFO(host);
+                flags = mrq->data->flags;
                 ret = au1xmmc_prepare_data(host, mrq->data);
         }
 
         if (ret == MMC_ERR_NONE)
-                ret = au1xmmc_send_command(host, 0, mrq->cmd);
+                ret = au1xmmc_send_command(host, 0, mrq->cmd, flags);
 
         if (ret != MMC_ERR_NONE) {
                 mrq->cmd->error = ret;
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c
index d97d3864b57f..f8985c508bb9 100644
--- a/drivers/mmc/host/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
@@ -232,20 +232,14 @@ static int pxamci_cmd_done(struct pxamci_host *host, unsigned int stat)
                 /*
                  * workaround for erratum #42:
                  * Intel PXA27x Family Processor Specification Update Rev 001
+                 * A bogus CRC error can appear if the msb of a 136 bit
+                 * response is a one.
                  */
-                if (cmd->opcode == MMC_ALL_SEND_CID ||
-                    cmd->opcode == MMC_SEND_CSD ||
-                    cmd->opcode == MMC_SEND_CID) {
-                        /* a bogus CRC error can appear if the msb of
-                           the 15 byte response is a one */
-                        if ((cmd->resp[0] & 0x80000000) == 0)
-                                cmd->error = MMC_ERR_BADCRC;
-                } else {
-                        pr_debug("ignoring CRC from command %d - *risky*\n",cmd->opcode);
-                }
-#else
-                cmd->error = MMC_ERR_BADCRC;
+                if (cmd->flags & MMC_RSP_136 && cmd->resp[0] & 0x80000000) {
+                        pr_debug("ignoring CRC from command %d - *risky*\n", cmd->opcode);
+                } else
 #endif
+                cmd->error = MMC_ERR_BADCRC;
         }
 
         pxamci_disable_irq(host, END_CMD_RES);
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index ff5bf73cdd25..a359efdd77eb 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -963,6 +963,15 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
                 if (intmask & (SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL))
                         sdhci_transfer_pio(host);
 
+                /*
+                 * We currently don't do anything fancy with DMA
+                 * boundaries, but as we can't disable the feature
+                 * we need to at least restart the transfer.
+                 */
+                if (intmask & SDHCI_INT_DMA_END)
+                        writel(readl(host->ioaddr + SDHCI_DMA_ADDRESS),
+                                host->ioaddr + SDHCI_DMA_ADDRESS);
+
                 if (intmask & SDHCI_INT_DATA_END)
                         sdhci_finish_data(host);
         }