mmc: core: Add default timeout value for CMD6

EXT_CSD[248] includes the default maximum timeout for CMD6.
This field is added at eMMC4.5 Spec. And it can be used for default
timeout except for some operations which don't define the timeout
(i.e. background operation, sanitize, flush cache) in eMMC4.5 Spec.

Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 2a4c9a4d3c00c1dc832a7962f4b6e2019b1d45ac..7dde373d1439d1525558547b9e38ca36344a16e6 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -458,6 +458,12 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
        else
                card->erased_byte = 0x0;
 
+       if (card->ext_csd.rev >= 6)
+               card->ext_csd.generic_cmd6_time = 10 *
+                       ext_csd[EXT_CSD_GENERIC_CMD6_TIME];
+       else
+               card->ext_csd.generic_cmd6_time = 0;
+
 out:
        return err;
 }
@@ -801,7 +807,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
         */
        if (card->ext_csd.enhanced_area_en) {
                err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-                                EXT_CSD_ERASE_GROUP_DEF, 1, 0);
+                                EXT_CSD_ERASE_GROUP_DEF, 1,
+                                card->ext_csd.generic_cmd6_time);
 
                if (err && err != -EBADMSG)
                        goto free_card;
@@ -844,7 +851,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
        if ((card->ext_csd.hs_max_dtr != 0) &&
                (host->caps & MMC_CAP_MMC_HIGHSPEED)) {
                err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-                                EXT_CSD_HS_TIMING, 1, 0);
+                                EXT_CSD_HS_TIMING, 1,
+                                card->ext_csd.generic_cmd6_time);
                if (err && err != -EBADMSG)
                        goto free_card;
 
@@ -924,7 +932,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                        err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
                                         EXT_CSD_BUS_WIDTH,
                                         ext_csd_bits[idx][0],
-                                        0);
+                                        card->ext_csd.generic_cmd6_time);
                        if (!err) {
                                mmc_set_bus_width(card->host, bus_width);
 
@@ -955,7 +963,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                        err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
                                         EXT_CSD_BUS_WIDTH,
                                         ext_csd_bits[idx][1],
-                                        0);
+                                        card->ext_csd.generic_cmd6_time);
                }
                if (err) {
                        printk(KERN_WARNING "%s: switch to bus width %d ddr %d "

diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 95a104ab9142f9a43bc80ad2935ab0f74634ee72..0ea4a06dfd765c31c95481889accd63a696dc433 100644 (file)
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -54,6 +54,7 @@ struct mmc_ext_csd {
        u8                      rst_n_function;
        unsigned int            part_time;              /* Units: ms */
        unsigned int            sa_timeout;             /* Units: 100ns */
+       unsigned int            generic_cmd6_time;      /* Units: 10ms */
        unsigned int            hs_max_dtr;
        unsigned int            sectors;
        unsigned int            card_type;

diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index ea558eb44c79e4d7c41cc2f19da99f75ca7af758..cd63c2dc95cc0eef0b39038dc0204c7ed34e8c91 100644 (file)
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -305,6 +305,7 @@ struct _mmc_csd {
 #define EXT_CSD_PWR_CL_DDR_52_195      238     /* RO */
 #define EXT_CSD_PWR_CL_DDR_52_360      239     /* RO */
 #define EXT_CSD_POWER_OFF_LONG_TIME    247     /* RO */
+#define EXT_CSD_GENERIC_CMD6_TIME      248     /* RO */
 
 /*
  * EXT_CSD field definitions