mmc: fixes for HS200/UHS core support

Instead of failing, the driver uses the default: 1-bit bus width.

Signed-off-by Jean-Jacques Hiblot <[email protected]>

---
 drivers/mmc/mmc-uclass.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

drivers/mmc/mmc-uclass.c +4 -3

index e30cde7..48fafce 100644
@@ -137,9 +137,10 @@ int mmc_of_parse(const void *fdt, int node,
 struct mmc_config *cfg) cfg->host_caps |= MMC_MODE_1BIT;
 		break;
 	default:
-		printf("error: %s invalid bus-width property %d\n",
-		       fdt_get_name(fdt, node, NULL), val);
-		return -ENOENT;
+		debug("warning: %s invalid bus-width property. using
 1-bit\n",
+		      fdt_get_name(fdt, node, NULL));
+		cfg->host_caps |= MMC_MODE_1BIT;
+		break;
 	}
 

cfg->f_max = fdtdec_get_int(fdt, node, "max-frequency",
52000000);

drivers/mmc/mmc-uclass.c +4 -4

                cfg->host_caps |= MMC_MODE_1BIT;
                break;
        default:
-               printf("error: %s invalid bus-width property %d\n",
-                      fdt_get_name(fdt, node, NULL), val);
-               return -ENOENT;
+               debug("warning: %s invalid bus-width property. using 1-bit\n",
+                     fdt_get_name(fdt, node, NULL));
+               cfg->host_caps |= MMC_MODE_1BIT;
+               break;
        }
 
        cfg->f_max = fdtdec_get_int(fdt, node, "max-frequency", 52000000);
--

1.9.1

Signed-off-by Jean-Jacques Hiblot <[email protected]>

---
 drivers/mmc/mmc-uclass.c | 4 ++++
 1 file changed, 4 insertions(+)

drivers/mmc/mmc-uclass.c +0 -0

index 48fafce..9723129 100644
@@ -161,8 +161,12 @@ int mmc_of_parse(const void *fdt, int node,
 struct mmc_config *cfg) cfg->host_caps |= MMC_CAP(UHS_DDR50);
 	if (fdtdec_get_bool(fdt, node, "mmc-ddr-1_8v"))

Signed-off-by Jean-Jacques Hiblot <[email protected]>

---
 drivers/mmc/mmc-uclass.c | 4 ++++
 1 file changed, 4 insertions(+)

drivers/mmc/mmc-uclass.c +0 -0

index 48fafce..9723129 100644

drivers/mmc/mmc-uclass.c +0 -1

        return 0;
 }
--

1.9.1

This is a useful information while debugging the initialization process or performance issues.

Signed-off-by Jean-Jacques Hiblot <[email protected]>

---
 drivers/mmc/mmc.c | 9 +++++++++
 1 file changed, 9 insertions(+)

drivers/mmc/mmc.c +8 -0

index a5a521e..a30b6a2 100644
@@ -1502,6 +1502,10 @@ void mmc_dump_capabilities(const char *text,
 uint caps) printf("%s, ", mmc_mode_name(mode));
 	printf("\b\b]\n");
 }
+#else
+void mmc_dump_capabilities(const char *text, uint caps)
+{
+}
 #endif
 
 struct mode_width_tuning {

@@ -1582,6 +1586,8 @@ static int sd_select_mode_and_width(struct mmc
 *mmc, uint card_caps) bool uhs_en = (mmc->ocr & OCR_S18R) ? true :
 false; uint caps;
 
+	mmc_dump_capabilities("sd card", card_caps);
+	mmc_dump_capabilities("host", mmc->host_caps |
 MMC_MODE_1BIT); 
 	/* Restrict card's capabilities by what the host can do */
 	caps = card_caps & (mmc->host_caps | MMC_MODE_1BIT);

@@ -1764,6 +1770,9 @@ static int mmc_select_mode_and_width(struct mmc
 *mmc, uint card_caps) const struct mode_width_tuning *mwt;
 	const struct ext_csd_bus_width *ecbw;
 
+	mmc_dump_capabilities("mmc", card_caps);
+	mmc_dump_capabilities("host", mmc->host_caps |

MMC_MODE_1BIT); +

This is a useful information while debugging the initialization process or performance issues.

Signed-off-by Jean-Jacques Hiblot <[email protected]>

---
 drivers/mmc/mmc.c | 9 +++++++++
 1 file changed, 9 insertions(+)

As the legacy modes were not added to the list of supported modes, old cards that do not support other modes could not be used.

Signed-off-by Jean-Jacques Hiblot <[email protected]>

---
 drivers/mmc/mmc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

drivers/mmc/mmc.c +1 -1

index a30b6a2..67f21ff 100644
@@ -818,7 +818,7 @@ static int mmc_get_capabilities(struct mmc *mmc)
 	u8 *ext_csd = mmc->ext_csd;
 	char cardtype;
 
-	mmc->card_caps = MMC_MODE_1BIT;
+	mmc->card_caps = MMC_MODE_1BIT | MMC_CAP(MMC_LEGACY);
 
 	if (mmc_host_is_spi(mmc))
 		return 0;

As the legacy modes were not added to the list of supported modes, old cards that do not support other modes could not be used.

Signed-off-by Jean-Jacques Hiblot <[email protected]>

---
 drivers/mmc/mmc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Make sure that those basic capabilities are advertised by the host.

Signed-off-by Jean-Jacques Hiblot <[email protected]>

---
 drivers/mmc/mmc.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

drivers/mmc/mmc.c +2 -2

index 67f21ff..ec1dc49 100644
@@ -1587,10 +1587,10 @@ static int sd_select_mode_and_width(struct
 mmc *mmc, uint card_caps) uint caps;
 
 	mmc_dump_capabilities("sd card", card_caps);
-	mmc_dump_capabilities("host", mmc->host_caps |
 MMC_MODE_1BIT);
+	mmc_dump_capabilities("host", mmc->host_caps);
 
 	/* Restrict card's capabilities by what the host can do */
-	caps = card_caps & (mmc->host_caps | MMC_MODE_1BIT);
+	caps = card_caps & mmc->host_caps;
 
 	if (!uhs_en)

drivers/mmc/mmc.c +2 -2

 		caps &= ~UHS_CAPS;

@@ -1771,10 +1771,10 @@ static int mmc_select_mode_and_width(struct
 mmc *mmc, uint card_caps) const struct ext_csd_bus_width *ecbw;
 
 	mmc_dump_capabilities("mmc", card_caps);
-	mmc_dump_capabilities("host", mmc->host_caps |
 MMC_MODE_1BIT);
+	mmc_dump_capabilities("host", mmc->host_caps);
 
 	/* Restrict card's capabilities by what the host can do */
-	card_caps &= (mmc->host_caps | MMC_MODE_1BIT);
+	card_caps &= mmc->host_caps;
 
 	/* Only version 4 of MMC supports wider bus widths */

drivers/mmc/mmc.c +2 -1

 	if (mmc->version < MMC_VERSION_4)

@@ -2389,7 +2389,12 @@ int mmc_start_init(struct mmc *mmc)
 	bool uhs_en = supports_uhs(mmc->cfg->host_caps);
 	int err;
 
-	mmc->host_caps = mmc->cfg->host_caps;
+	/*
+	 * all hosts are capable of 1 bit bus-width and able to use

the legacy

Make sure that those basic capabilities are advertised by the host.

Signed-off-by Jean-Jacques Hiblot <[email protected]>

---
 drivers/mmc/mmc.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Hi Jean-Jacques,

Quoted 2 lines · Jean-Jacques Hiblot

Make sure that those basic capabilities are advertised by the host.

Quoted 5 lines

Signed-off-by Jean-Jacques Hiblot <[email protected]>

---
  drivers/mmc/mmc.c | 15 ++++++++++-----
  1 file changed, 10 insertions(+), 5 deletions(-)

Your patch seems to suggest that the hardware is advertising the wrong thing. Is that right?

Regards,
Simon

This series applies on top of "[PATCH v2 00/26] mmc: Add support for HS200 and UHS modes"

It fixes a bug with old SD and MMC cards that support only the legacy mode. It also addresses the comments made on the mailing list:
* dump card and host capabilities in debug mode
* use 1-bit if the DTS property 'bus-width' is not present.
* recognize the "mmc-ddr-1_2v" and "mmc-hs200-1_2v" DTS properties

Tested on DRA7, DRA72 and AM335x

Jean-Jacques Hiblot (5):
dm: mmc: updated mmc_of_parse() to not fail because of an invalid
bus-width
mmc: dm: support "mmc-ddr-1_2v" and "mmc-hs200-1_2v" boolean
properties
mmc: dump card and host capabilities if debug is enabled
mmc: Fixed a problem with old sd or mmc that do not support High speed
mmc: all hosts support 1-bit bus width and legacy timings

 drivers/mmc/mmc-uclass.c | 11 ++++++++---
 drivers/mmc/mmc.c        | 24 +++++++++++++++++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)

Quoted 9 lines · Jean-Jacques Hiblot

This series applies on top of "[PATCH v2 00/26] mmc: Add support for HS200 and UHS modes"

It fixes a bug with old SD and MMC cards that support only the legacy mode. It also addresses the comments made on the mailing list:
* dump card and host capabilities in debug mode
* use 1-bit if the DTS property 'bus-width' is not present.
* recognize the "mmc-ddr-1_2v" and "mmc-hs200-1_2v" DTS properties

Quoted 1 line

Tested on DRA7, DRA72 and AM335x

Thanks for sending patches. After testing with my boards, will update. For your patches, i made the testing-uhs-supporting branch on u-boot-mmc.

At least, i will share the result about testing with my boards.

Quoted 10 lines · Jaehoon Chung

Quoted 9 lines · Jean-Jacques Hiblot

This series applies on top of "[PATCH v2 00/26] mmc: Add support for HS200 and UHS modes"

It fixes a bug with old SD and MMC cards that support only the legacy mode. It also addresses the comments made on the mailing list:
* dump card and host capabilities in debug mode
* use 1-bit if the DTS property 'bus-width' is not present.
* recognize the "mmc-ddr-1_2v" and "mmc-hs200-1_2v" DTS properties

Quoted 5 lines

Quoted 1 line

Tested on DRA7, DRA72 and AM335x

Thanks for sending patches. After testing with my boards, will update. For your patches, i made the testing-uhs-supporting branch on u-boot-mmc.

At least, i will share the result about testing with my boards.

Any chance this UHS support will make it into this release finally ?

It's been dragging on for like half a year already ...

Quoted 14 lines · Marek Vasut

Quoted 13 lines · Jaehoon Chung

Quoted 12 lines · Jean-Jacques Hiblot

This series applies on top of "[PATCH v2 00/26] mmc: Add support for HS200
and UHS modes"

It fixes a bug with old SD and MMC cards that support only the legacy mode.
It also addresses the comments made on the mailing list:
* dump card and host capabilities in debug mode
* use 1-bit if the DTS property 'bus-width' is not present.
* recognize the "mmc-ddr-1_2v" and "mmc-hs200-1_2v" DTS properties

Tested on DRA7, DRA72 and AM335x

Quoted 6 lines

Quoted 5 lines

Thanks for sending patches. After testing with my boards, will update. For your patches, i made the testing-uhs-supporting branch on u-boot-mmc.

At least, i will share the result about testing with my boards.

Any chance this UHS support will make it into this release finally ?

I hope so too. Jaehoon, do you need some help with the testing? what would you need?

Quoted 2 lines

It's been dragging on for like half a year already ...

Quoted 21 lines · Jean-Jacques Hiblot

Quoted 18 lines · Marek Vasut

Quoted 17 lines · Jaehoon Chung

Quoted 4 lines · Jean-Jacques Hiblot

This series applies on top of "[PATCH v2 00/26] mmc: Add support for HS200
and UHS modes"

Quoted 8 lines

It fixes a bug with old SD and MMC cards that support only the legacy mode.
It also addresses the comments made on the mailing list:
* dump card and host capabilities in debug mode
* use 1-bit if the DTS property 'bus-width' is not present.
* recognize the "mmc-ddr-1_2v" and "mmc-hs200-1_2v" DTS properties

Tested on DRA7, DRA72 and AM335x

Thanks for sending patches. After testing with my boards, will update. For your patches, i made the testing-uhs-supporting branch on u-boot-mmc.

Quoted 4 lines

Quoted 2 lines

Quoted 1 line

At least, i will share the result about testing with my boards.

Any chance this UHS support will make it into this release finally ?

I hope so too. Jaehoon, do you need some help with the testing? what would you need?

It's been tested on 3 different HW platforms and controllers already, so I really fail to see much of a reason to drag this on. If something is botched on samsung controller, that can always be fixed later.

Quoted 5 lines

Quoted 3 lines

It's been dragging on for like half a year already ...

Quoted 11 lines · Marek Vasut

Quoted 10 lines · Jaehoon Chung

Quoted 9 lines · Jean-Jacques Hiblot

This series applies on top of "[PATCH v2 00/26] mmc: Add support for HS200 and UHS modes"

It fixes a bug with old SD and MMC cards that support only the legacy mode. It also addresses the comments made on the mailing list:
* dump card and host capabilities in debug mode
* use 1-bit if the DTS property 'bus-width' is not present.
* recognize the "mmc-ddr-1_2v" and "mmc-hs200-1_2v" DTS properties

Quoted 6 lines

Quoted 5 lines

Quoted 1 line

Tested on DRA7, DRA72 and AM335x

Thanks for sending patches. After testing with my boards, will update. For your patches, i made the testing-uhs-supporting branch on u-boot-mmc.

At least, i will share the result about testing with my boards.

Any chance this UHS support will make it into this release finally ?

I hope so too. Jaehoon, do you need some help with the testing? what would you need?

Quoted 2 lines

It's been dragging on for like half a year already ...