From: John Stultz <john.stultz@linaro.org>
To: linux-mmc@vger.kernel.org
Cc: San Mehat <san@android.com>, Chris Ball <cjb@laptop.org>,
Arnd Bergmann <arnd@arndb.de>, Dima Zavin <dima@android.com>,
John Stultz <john.stultz@linaro.org>
Subject: [PATCH 6/6] mmc: sd: Add retries in re-detection
Date: Fri, 22 Apr 2011 18:01:42 -0700 [thread overview]
Message-ID: <1303520502-32171-7-git-send-email-john.stultz@linaro.org> (raw)
In-Reply-To: <1303520502-32171-1-git-send-email-john.stultz@linaro.org>
From: San Mehat <san@android.com>
Signed-off-by: San Mehat <san@android.com>
mmc: sd: Remove debugging printk
CC: Chris Ball <cjb@laptop.org>
CC: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Dima Zavin <dima@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
drivers/mmc/core/sd.c | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 7b6cab2..24e1a85 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -403,9 +403,6 @@ struct device_type sd_type = {
int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid)
{
int err;
-#ifdef CONFIG_MMC_PARANOID_SD_INIT
- int retries;
-#endif
/*
* Since we're changing the OCR value, we seem to
@@ -459,6 +456,9 @@ int mmc_sd_setup_card(struct mmc_host *host, struct mmc_card *card,
bool reinit)
{
int err;
+#ifdef CONFIG_MMC_PARANOID_SD_INIT
+ int retries;
+#endif
if (!reinit) {
/*
@@ -685,7 +685,10 @@ static void mmc_sd_remove(struct mmc_host *host)
*/
static void mmc_sd_detect(struct mmc_host *host)
{
- int err;
+ int err = 0;
+#ifdef CONFIG_MMC_PARANOID_SD_INIT
+ int retries = 5;
+#endif
BUG_ON(!host);
BUG_ON(!host->card);
@@ -695,8 +698,23 @@ static void mmc_sd_detect(struct mmc_host *host)
/*
* Just check if our card has been removed.
*/
+#ifdef CONFIG_MMC_PARANOID_SD_INIT
+ while(retries) {
+ err = mmc_send_status(host->card, NULL);
+ if (err) {
+ retries--;
+ udelay(5);
+ continue;
+ }
+ break;
+ }
+ if (!retries) {
+ printk(KERN_ERR "%s(%s): Unable to re-detect card (%d)\n",
+ __func__, mmc_hostname(host), err);
+ }
+#else
err = mmc_send_status(host->card, NULL);
-
+#endif
mmc_release_host(host);
if (err) {
@@ -810,6 +828,9 @@ int mmc_attach_sd(struct mmc_host *host)
{
int err;
u32 ocr;
+#ifdef CONFIG_MMC_PARANOID_SD_INIT
+ int retries;
+#endif
BUG_ON(!host);
WARN_ON(!host->claimed);
@@ -865,9 +886,27 @@ int mmc_attach_sd(struct mmc_host *host)
/*
* Detect and init the card.
*/
+#ifdef CONFIG_MMC_PARANOID_SD_INIT
+ retries = 5;
+ while (retries) {
+ err = mmc_sd_init_card(host, host->ocr, NULL);
+ if (err) {
+ retries--;
+ continue;
+ }
+ break;
+ }
+
+ if (!retries) {
+ printk(KERN_ERR "%s: mmc_sd_init_card() failure (err = %d)\n",
+ mmc_hostname(host), err);
+ goto err;
+ }
+#else
err = mmc_sd_init_card(host, host->ocr, NULL);
if (err)
goto err;
+#endif
mmc_release_host(host);
err = mmc_add_card(host->card);
--
1.7.3.2.146.gca209
next prev parent reply other threads:[~2011-04-23 1:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-23 1:01 [PATCH 0/6] Trivial MMC patches from Android John Stultz
2011-04-23 1:01 ` [PATCH 1/6] mmc: block: Resume multi-block reads after transient read errors John Stultz
2011-04-26 13:19 ` Arnd Bergmann
2011-04-27 8:16 ` Adrian Hunter
2011-04-27 8:42 ` Andrei Warkentin
2011-04-23 1:01 ` [PATCH 2/6] mmc_block: Allow more than 8 partitions per card John Stultz
2011-04-26 13:22 ` Arnd Bergmann
2011-04-26 16:10 ` Colin Cross
2011-04-26 16:13 ` Arnd Bergmann
2011-04-23 1:01 ` [PATCH 3/6] sdhci: Always pass clock request value zero to set_clock host op John Stultz
2011-04-23 1:01 ` [PATCH 4/6] mmc: sd: Add new CONFIG_MMC_PARANOID_SD_INIT for enabling retries during SD detection John Stultz
2011-04-26 13:35 ` Arnd Bergmann
2011-04-23 1:01 ` [PATCH 5/6] mmc: sd: When resuming, try a little harder to init the card John Stultz
2011-04-26 13:39 ` Arnd Bergmann
2011-04-23 1:01 ` John Stultz [this message]
2011-04-26 13:42 ` [PATCH 6/6] mmc: sd: Add retries in re-detection Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1303520502-32171-7-git-send-email-john.stultz@linaro.org \
--to=john.stultz@linaro.org \
--cc=arnd@arndb.de \
--cc=cjb@laptop.org \
--cc=dima@android.com \
--cc=linux-mmc@vger.kernel.org \
--cc=san@android.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).