Skip to contentSkip to conversation

mmc: sd: Add new CONFIG_MMC_PARANOID_SD_INIT for enabling retries during SD detection

PATCH In review Bálint Czobor 1 participant 1 message Oct 27, 2015 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 mmc: sd: Add new CONFIG_MMC_PARANOID_SD_INIT for enabling retries during SD detection

From: San Mehat <[email protected]>

---
 drivers/mmc/core/Kconfig |    8 ++++++++
 drivers/mmc/core/sd.c    |   22 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)
drivers/mmc/core/Kconfig +8 -0
index 9ebee72..1d284c1 100644
@@ -11,3 +11,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.
drivers/mmc/core/sd.c +22 -0
index 4e7366a..dcbbd33 100644
@@ -797,6 +797,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) {
 		/*
@@ -823,7 +826,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;
 	}
Signature · 1 line
1.7.9.5