Skip to contentSkip to conversation

mmc: core: enable CMD19 tuning for DDR50 mode

PATCH Applied Barry Song 2 participants 6 messages Oct 4, 2015 – Oct 5, 2015

Subsystems (2)
lore
Share & tools
lore

Barry Song

author
#0 lore raw

PATCH v3 1/3 mmc: core: enable CMD19 tuning for DDR50 mode

From: Weijun Yang <[email protected]>

As SD Specifications Part1 Physical Layer Specification Version 3.01 says, CMD19 tuning is available for unlocked cards in transfer state of 1.8V signaling mode. The small difference between v3.00 and 3.01 spec means that CMD19 tuning is also available for DDR50 mode.

---
 drivers/mmc/core/sd.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/mmc/core/sd.c +17 -2
index 4e7366a..eaf8cb3 100644
@@ -628,9 +628,24 @@ static int mmc_sd_init_uhs_card(struct mmc_card *card)
 	 * SDR104 mode SD-cards. Note that tuning is mandatory for SDR104.
 	 */
 	if (!mmc_host_is_spi(card->host) &&
-	    (card->sd_bus_speed == UHS_SDR50_BUS_SPEED ||
-	     card->sd_bus_speed == UHS_SDR104_BUS_SPEED))
+		(card->sd_bus_speed == UHS_SDR50_BUS_SPEED ||
+		 card->sd_bus_speed == UHS_DDR50_BUS_SPEED ||
+		 card->sd_bus_speed == UHS_SDR104_BUS_SPEED)) {
 		err = mmc_execute_tuning(card);
+
+		/*
+		 * As SD Specifications Part1 Physical Layer Specification Version
+		 * 3.01 says, CMD19 tuning is available for unlocked cards in transfer
+		 * state of 1.8V signaling mode. The small difference between v3.00
+		 * and 3.01 spec means that CMD19 tuning is also available for DDR50
+		 * mode.
+		 */
+		if (err && (card->sd_bus_speed == UHS_DDR50_BUS_SPEED)) {
+			pr_warn("%s: ddr50 tuning failed\n", mmc_hostname(card->host));
+			err = 0;
+		}
+	}
+
 out:
 	kfree(status);
 
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH v3 2/3 mmc: sdhci: enable tuning for DDR50

From: Weijun Yang <[email protected]>

CMD19 tuning is also available for DDR50 mode.

---
 drivers/mmc/host/sdhci.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/mmc/host/sdhci.c +4 -3
index 64b7fdb..2ea30fa 100644
@@ -1893,9 +1893,9 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
 		tuning_count = host->tuning_count;
 
 	/*
-	 * The Host Controller needs tuning only in case of SDR104 mode
-	 * and for SDR50 mode when Use Tuning for SDR50 is set in the
-	 * Capabilities register.
+	 * The Host Controller needs tuning in case of SDR104 and DDR5
+	 * mode, and for SDR50 mode when Use Tuning for SDR50 is set in
+	 * the Capabilities register.
 	 * If the Host Controller supports the HS200 mode then the
 	 * tuning function has to be executed.
 	 */
@@ -1915,6 +1915,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
 		break;
 
 	case MMC_TIMING_UHS_SDR104:
+	case MMC_TIMING_UHS_DDR50:
 		break;
 
 	case MMC_TIMING_UHS_SDR50:
Signature · 1 line
1.9.1
Applied
#2 lore raw

Re: [PATCH v3 2/3] mmc: sdhci: enable tuning for DDR50

Quoted 6 lines · Barry Song

From: Weijun Yang <[email protected]>

CMD19 tuning is also available for DDR50 mode.

Thanks, applied for next - with a minor change.

Quoted 9 lines
---
 drivers/mmc/host/sdhci.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/mmc/host/sdhci.c +0 -0
index 64b7fdb..2ea30fa 100644

drivers/mmc/host/sdhci.c static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) · line 1896

Quoted 7 lines
drivers/mmc/host/sdhci.c +1 -3
@@ -1893,9 +1893,9 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
                tuning_count = host->tuning_count;
 
        /*
-        * The Host Controller needs tuning only in case of SDR104 mode
-        * and for SDR50 mode when Use Tuning for SDR50 is set in the
-        * Capabilities register.
+        * The Host Controller needs tuning in case of SDR104 and DDR5

/s / DDR5 / DDR50

Quoted 14 lines
drivers/mmc/host/sdhci.c +3 -1
+        * mode, and for SDR50 mode when Use Tuning for SDR50 is set in
+        * the Capabilities register.
         * If the Host Controller supports the HS200 mode then the
         * tuning function has to be executed.
         */
@@ -1915,6 +1915,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
                break;
 
        case MMC_TIMING_UHS_SDR104:
+       case MMC_TIMING_UHS_DDR50:
                break;
 
        case MMC_TIMING_UHS_SDR50:
--
Quoted 2 lines

1.9.1

Kind regards
Uffe

author
#3 lore raw

PATCH v3 3/3 mmc: sirf: fix the capbility to support DDR50

In reply to Barry Song

From: Weijun Yang <[email protected]>

According to hardware spec, validate DDR50 mode
for SDXC.

---
 drivers/mmc/host/sdhci-sirf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-sirf.c +2 -1
index 8842945..f5488c4 100644
@@ -50,7 +50,8 @@ static u32 sdhci_sirf_readl_le(struct sdhci_host *host, int reg)
 	if (unlikely((reg == SDHCI_CAPABILITIES_1) &&
 			(host->mmc->caps & MMC_CAP_UHS_SDR50))) {
 		/* fake CAP_1 register */
-		val = SDHCI_SUPPORT_SDR50 | SDHCI_USE_SDR50_TUNING;
+		val = SDHCI_SUPPORT_DDR50 |
+			SDHCI_SUPPORT_SDR50 | SDHCI_USE_SDR50_TUNING;
 	}
 
 	if (unlikely(reg == SDHCI_SLOT_INT_STATUS)) {
Signature · 1 line
1.9.1
Applied
#4 lore raw

Re: [PATCH v3 3/3] mmc: sirf: fix the capbility to support DDR50

Quoted 7 lines · Barry Song

From: Weijun Yang <[email protected]>

According to hardware spec, validate DDR50 mode
for SDXC.

Thanks, applied for next!

Kind regards
Uffe

Quoted 21 lines
---
 drivers/mmc/host/sdhci-sirf.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-sirf.c +2 -2
index 8842945..f5488c4 100644
@@ -50,7 +50,8 @@ static u32 sdhci_sirf_readl_le(struct sdhci_host *host, int reg)
        if (unlikely((reg == SDHCI_CAPABILITIES_1) &&
                        (host->mmc->caps & MMC_CAP_UHS_SDR50))) {
                /* fake CAP_1 register */
-               val = SDHCI_SUPPORT_SDR50 | SDHCI_USE_SDR50_TUNING;
+               val = SDHCI_SUPPORT_DDR50 |
+                       SDHCI_SUPPORT_SDR50 | SDHCI_USE_SDR50_TUNING;
        }
 
        if (unlikely(reg == SDHCI_SLOT_INT_STATUS)) {
--

1.9.1

Applied
#5 lore raw
In reply to Barry Song
Quoted 10 lines · Barry Song

From: Weijun Yang <[email protected]>

As SD Specifications Part1 Physical Layer Specification Version 3.01 says, CMD19 tuning is available for unlocked cards in transfer state of 1.8V signaling mode. The small difference between v3.00 and 3.01 spec means that CMD19 tuning is also available for DDR50 mode.

Thanks, applied for next - although with some minor changes as described below.

Quoted 16 lines
---
 drivers/mmc/core/sd.c | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/mmc/core/sd.c +2 -2
index 4e7366a..eaf8cb3 100644
@@ -628,9 +628,24 @@ static int mmc_sd_init_uhs_card(struct mmc_card *card)
         * SDR104 mode SD-cards. Note that tuning is mandatory for SDR104.
         */
        if (!mmc_host_is_spi(card->host) &&
-           (card->sd_bus_speed == UHS_SDR50_BUS_SPEED ||
-            card->sd_bus_speed == UHS_SDR104_BUS_SPEED))
+               (card->sd_bus_speed == UHS_SDR50_BUS_SPEED ||
+                card->sd_bus_speed == UHS_DDR50_BUS_SPEED ||

drivers/mmc/core/sd.c static int mmc_sd_init_uhs_card(struct mmc_card *card) · line 642

Quoted 10 lines
drivers/mmc/core/sd.c +9 -0
+                card->sd_bus_speed == UHS_SDR104_BUS_SPEED)) {
                err = mmc_execute_tuning(card);
+
+               /*
+                * As SD Specifications Part1 Physical Layer Specification Version
+                * 3.01 says, CMD19 tuning is available for unlocked cards in transfer
+                * state of 1.8V signaling mode. The small difference between v3.00
+                * and 3.01 spec means that CMD19 tuning is also available for DDR50
+                * mode.
+                */

Checkpatch warned about long lines, so I changed them.

drivers/mmc/core/sd.c static int mmc_sd_init_uhs_card(struct mmc_card *card) · line 643

Quoted 1 line
drivers/mmc/core/sd.c +1 -0
+               if (err && (card->sd_bus_speed == UHS_DDR50_BUS_SPEED)) {

Removed a pair of unnecessary parentheses for this if statement.

Quoted 11 lines
drivers/mmc/core/sd.c +5 -1
+                       pr_warn("%s: ddr50 tuning failed\n", mmc_hostname(card->host));
+                       err = 0;
+               }
+       }
+
 out:
        kfree(status);
 
--

1.9.1

Kind regards
Uffe