diff options
| author | San Mehat <san@google.com> | 2011-11-20 09:53:25 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-11-20 10:17:56 +0800 |
| commit | c573834d0f36a2a18ffea1ee5f5166b24a1d7fff (patch) | |
| tree | edd6517323aeb1d96fed1a1bfb9706788c05284b /drivers | |
| parent | e7049692a4958122ce60216821457ed6c72c19b4 (diff) | |
mmc: sd: Add new CONFIG_MMC_PARANOID_SD_INIT for enabling retries during SD detection
Signed-off-by: San Mehat <san@google.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/core/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/mmc/core/sd.c | 22 |
2 files changed, 30 insertions, 0 deletions
diff --git a/drivers/mmc/core/Kconfig b/drivers/mmc/core/Kconfig index ef103871517..1972b00f801 100644 --- a/drivers/mmc/core/Kconfig +++ b/drivers/mmc/core/Kconfig @@ -27,3 +27,11 @@ config MMC_CLKGATE support handling this in order for it to be of any use. If unsure, say N. + +config MMC_PARANOID_SD_INIT + bool "Enable paranoid SD card initialization (EXPERIMENTAL)" + help + If you say Y here, the MMC layer will be extra paranoid + about re-trying SD init requests. This can be a useful + work-around for buggy controllers and hardware. Enable + if you are experiencing issues with SD detection. diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index a230e7f9d77..d55203f2c85 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -719,6 +719,9 @@ struct device_type sd_type = { int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr) { int err; +#ifdef CONFIG_MMC_PARANOID_SD_INIT + int retries; +#endif /* * Since we're changing the OCR value, we seem to @@ -825,7 +828,26 @@ int mmc_sd_setup_card(struct mmc_host *host, struct mmc_card *card, /* * Fetch switch information from card. */ +#ifdef CONFIG_MMC_PARANOID_SD_INIT + for (retries = 1; retries <= 3; retries++) { + err = mmc_read_switch(card); + if (!err) { + if (retries > 1) { + printk(KERN_WARNING + "%s: recovered\n", + mmc_hostname(host)); + } + break; + } else { + printk(KERN_WARNING + "%s: read switch failed (attempt %d)\n", + mmc_hostname(host), retries); + } + } +#else err = mmc_read_switch(card); +#endif + if (err) return err; } |