mmc: Fixes for Dual Data Rate (DDR) support

The DDR support patch needs the following fixes:

- The block driver does not need to know about DDR, any more
  than it needs to know about bus width.
- Not only the card must be switched to DDR mode.  The host
  controller must also be configured, which is done through
  the 'set_ios()' function.
- Do not set the DDR mode state until after the switch command
  is successful.
- Setting block length is not supported in DDR mode.  Make that
  a core function and change the other place it is used (mmc_test)
  also.

Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

4 files changed, 42 insertions, 14 deletions

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index e70bd6641cee..da3c01b214ec 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -253,14 +253,16 @@ int mmc_add_card(struct mmc_card *card)
         }
 
         if (mmc_host_is_spi(card->host)) {
-                printk(KERN_INFO "%s: new %s%s card on SPI\n",
+                printk(KERN_INFO "%s: new %s%s%s card on SPI\n",
                         mmc_hostname(card->host),
                         mmc_card_highspeed(card) ? "high speed " : "",
+                        mmc_card_ddr_mode(card) ? "DDR " : "",
                         type);
         } else {
-                printk(KERN_INFO "%s: new %s%s card at address %04x\n",
+                printk(KERN_INFO "%s: new %s%s%s card at address %04x\n",
                         mmc_hostname(card->host),
                         mmc_card_highspeed(card) ? "high speed " : "",
+                        mmc_card_ddr_mode(card) ? "DDR " : "",
                         type, card->rca);
         }
 
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 46029d5c0364..7cb352b3b247 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -651,14 +651,23 @@ void mmc_set_bus_mode(struct mmc_host *host, unsigned int mode)
 }
 
 /*
- * Change data bus width of a host.
+ * Change data bus width and DDR mode of a host.
  */
-void mmc_set_bus_width(struct mmc_host *host, unsigned int width)
+void mmc_set_bus_width_ddr(struct mmc_host *host, unsigned int width, int ddr)
 {
         host->ios.bus_width = width;
+        host->ios.ddr = ddr ? MMC_DDR_MODE : MMC_SDR_MODE;
         mmc_set_ios(host);
 }
 
+/*
+ * Change data bus width of a host.
+ */
+void mmc_set_bus_width(struct mmc_host *host, unsigned int width)
+{
+        mmc_set_bus_width_ddr(host, width, 0);
+}
+
 /**
  * mmc_vdd_to_ocrbitnum - Convert a voltage to the OCR bit number
  * @vdd:        voltage (mV)
@@ -1399,6 +1408,21 @@ int mmc_erase_group_aligned(struct mmc_card *card, unsigned int from,
 }
 EXPORT_SYMBOL(mmc_erase_group_aligned);
 
+int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen)
+{
+        struct mmc_command cmd;
+
+        if (mmc_card_blockaddr(card) || mmc_card_ddr_mode(card))
+                return 0;
+
+        memset(&cmd, 0, sizeof(struct mmc_command));
+        cmd.opcode = MMC_SET_BLOCKLEN;
+        cmd.arg = blocklen;
+        cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
+        return mmc_wait_for_cmd(card->host, &cmd, 5);
+}
+EXPORT_SYMBOL(mmc_set_blocklen);
+
 void mmc_rescan(struct work_struct *work)
 {
         struct mmc_host *host =
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
index a2ca770ca89b..13240d128a69 100644
--- a/drivers/mmc/core/core.h
+++ b/drivers/mmc/core/core.h
@@ -35,6 +35,7 @@ void mmc_set_chip_select(struct mmc_host *host, int mode);
 void mmc_set_clock(struct mmc_host *host, unsigned int hz);
 void mmc_set_bus_mode(struct mmc_host *host, unsigned int mode);
 void mmc_set_bus_width(struct mmc_host *host, unsigned int width);
+void mmc_set_bus_width_ddr(struct mmc_host *host, unsigned int width, int ddr);
 u32 mmc_select_voltage(struct mmc_host *host, u32 ocr);
 void mmc_set_timing(struct mmc_host *host, unsigned int timing);
 
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 66c4a59fee5f..3ea58ce773ff 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -375,7 +375,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
         struct mmc_card *oldcard)
 {
         struct mmc_card *card;
-        int err;
+        int err, ddr = 0;
         u32 cid[4];
         unsigned int max_dtr;
 
@@ -518,32 +518,32 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
         mmc_set_clock(host, max_dtr);
 
         /*
-         * Activate DDR50 mode (if supported).
+         * Indicate DDR mode (if supported).
          */
         if (mmc_card_highspeed(card)) {
                 if ((card->ext_csd.card_type & EXT_CSD_CARD_TYPE_DDR_1_8V)
                         && (host->caps & (MMC_CAP_1_8V_DDR)))
-                                mmc_card_set_ddr_mode(card);
+                                ddr = 1;
                 else if ((card->ext_csd.card_type & EXT_CSD_CARD_TYPE_DDR_1_2V)
                         && (host->caps & (MMC_CAP_1_2V_DDR)))
-                                mmc_card_set_ddr_mode(card);
+                                ddr = 1;
         }
 
         /*
-         * Activate wide bus (if supported).
+         * Activate wide bus and DDR (if supported).
          */
         if ((card->csd.mmca_vsn >= CSD_SPEC_VER_4) &&
             (host->caps & (MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA))) {
                 unsigned ext_csd_bit, bus_width;
 
                 if (host->caps & MMC_CAP_8_BIT_DATA) {
-                        if (mmc_card_ddr_mode(card))
+                        if (ddr)
                                 ext_csd_bit = EXT_CSD_DDR_BUS_WIDTH_8;
                         else
                                 ext_csd_bit = EXT_CSD_BUS_WIDTH_8;
                         bus_width = MMC_BUS_WIDTH_8;
                 } else {
-                        if (mmc_card_ddr_mode(card))
+                        if (ddr)
                                 ext_csd_bit = EXT_CSD_DDR_BUS_WIDTH_4;
                         else
                                 ext_csd_bit = EXT_CSD_BUS_WIDTH_4;
@@ -557,12 +557,13 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                         goto free_card;
 
                 if (err) {
-                        printk(KERN_WARNING "%s: switch to bus width %d "
+                        printk(KERN_WARNING "%s: switch to bus width %d ddr %d "
                                "failed\n", mmc_hostname(card->host),
-                               1 << bus_width);
+                               1 << bus_width, ddr);
                         err = 0;
                 } else {
-                        mmc_set_bus_width(card->host, bus_width);
+                        mmc_card_set_ddr_mode(card);
+                        mmc_set_bus_width_ddr(card->host, bus_width, ddr);
                 }
         }