Skip to contentSkip to conversation

sdhci: Add support for hosts that are only capable of 1-bit transfers

PATCH Superseded Anton Vorontsov 3 participants 7 messages Jun 11, 2009 – Jun 19, 2009 3 messages not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sdhci: Add support for hosts that are only capable of 1-bit transfers

Some hosts (hardware configurations, or particular SD/MMC slots) may not support 4-bit bus. For example, on MPC8569E-MDS boards we can switch between serial (1-bit only) and nibble (4-bit) modes, thought we have to disable more peripherals to work in 4-bit mode.

Along with some small core changes, this patch modifies sdhci-of driver, so that now it looks for "mode" property in the device-tree.

---

Pierre, I'm not sure if a quirk would be appropriate here. If so, I can redo the patch with FORCE_1_BIT_DATA quirk.

Thanks,

 Documentation/powerpc/dts-bindings/fsl/esdhc.txt |    2 ++
 drivers/mmc/host/sdhci-of.c                      |    7 +++++++
 drivers/mmc/host/sdhci-pci.c                     |    1 +
 drivers/mmc/host/sdhci.c                         |    2 +-
 4 files changed, 11 insertions(+), 1 deletions(-)
Documentation/powerpc/dts-bindings/fsl/esdhc.txt +2 -0
index 5093ddf..298b865 100644
@@ -10,6 +10,8 @@ Required properties:
   - interrupts : should contain eSDHC interrupt.
   - interrupt-parent : interrupt source phandle.
   - clock-frequency : specifies eSDHC base clock frequency.
+  - mode : specifies eSDHC mode, valid values are: "1-bit" and "4-bit".
+    If mode is unspecified, then 4-bit mode is assumed.
 
 Example:
 
drivers/mmc/host/sdhci-of.c +7 -0
index 09cc597..12b9615 100644
@@ -14,6 +14,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/string.h>
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/interrupt.h>
@@ -212,6 +213,7 @@ static int __devinit sdhci_of_probe(struct of_device *ofdev,
 	struct sdhci_of_data *sdhci_of_data = match->data;
 	struct sdhci_host *host;
 	struct sdhci_of_host *of_host;
+	const char *mode;
 	const u32 *clk;
 	int size;
 	int ret;
@@ -244,6 +246,11 @@ static int __devinit sdhci_of_probe(struct of_device *ofdev,
 		host->ops = &sdhci_of_data->ops;
 	}
 
+	mode = of_get_property(np, "mode", &size);
+	if (!mode || (size == sizeof("4-bit") &&
+			!strncmp(mode, "4-bit", size)))
+		host->mmc->caps |= MMC_CAP_4_BIT_DATA;
+
 	clk = of_get_property(np, "clock-frequency", &size);
 	if (clk && size == sizeof(*clk) && *clk)
 		of_host->clock = *clk;
drivers/mmc/host/sdhci-pci.c +1 -0
index 65be279..c447d6c 100644
@@ -535,6 +535,7 @@ static struct sdhci_pci_slot * __devinit sdhci_pci_probe_slot(
 	host->hw_name = "PCI";
 	host->ops = &sdhci_pci_ops;
 	host->quirks = chip->quirks;
+	host->mmc->caps = MMC_CAP_4_BIT_DATA;
 
 	host->irq = pdev->irq;
 
drivers/mmc/host/sdhci.c +1 -1
index 9234be2..e31dd2a 100644
@@ -1721,7 +1721,7 @@ int sdhci_add_host(struct sdhci_host *host)
 	mmc->ops = &sdhci_ops;
 	mmc->f_min = host->max_clk / 256;
 	mmc->f_max = host->max_clk;
-	mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;
+	mmc->caps |= MMC_CAP_SDIO_IRQ;
 
 	if (caps & SDHCI_CAN_DO_HISPD)
 		mmc->caps |= MMC_CAP_SD_HIGHSPEED;
Signature · 1 line
1.6.3.1

A message that is not in the archive (sent off-list or not yet received): 20090611201545.GA15942-wnGakbxT3iijyJ0x5qLZdcN33GVbZNy3@public.gmane.org

#2 lore raw
Quoted 5 lines · On Fri, 12 Jun 2009 00:15:45 +0400 Anton Vorontsov…

Some hosts (hardware configurations, or particular SD/MMC slots) may not support 4-bit bus. For example, on MPC8569E-MDS boards we can switch between serial (1-bit only) and nibble (4-bit) modes, thought we have to disable more peripherals to work in 4-bit mode.

Quoted 9 lines

Along with some small core changes, this patch modifies sdhci-of driver, so that now it looks for "mode" property in the device-tree.

---

Pierre, I'm not sure if a quirk would be appropriate here. If so, I can redo the patch with FORCE_1_BIT_DATA quirk.

I'd prefer a quirk, yes. 4-bit support is mandated so this would be a deviation from the spec and such should always be handled by quirks for clarity.

(I do think it is silly that they made it mandatory though considering the embedded market)

Rgds

Signature · 6 lines
     -- Pierre Ossman

  WARNING: This correspondence is being monitored by the
  Swedish government. Make sure your server uses encryption
  for SMTP traffic and consider using PGP for end-to-end
  encryption.
#3 lore raw
In reply to a message not in the archive
Quoted 27 lines · Anton Vorontsov

Some hosts (hardware configurations, or particular SD/MMC slots) may not support 4-bit bus. For example, on MPC8569E-MDS boards we can switch between serial (1-bit only) and nibble (4-bit) modes, thought we have to disable more peripherals to work in 4-bit mode.

Along with some small core changes, this patch modifies sdhci-of driver, so that now it looks for "mode" property in the device-tree.

---

Pierre, I'm not sure if a quirk would be appropriate here. If so, I can redo the patch with FORCE_1_BIT_DATA quirk.

Thanks,

 Documentation/powerpc/dts-bindings/fsl/esdhc.txt |    2 ++ drivers/mmc/host/sdhci-of.c                      |    7 +++++++ drivers/mmc/host/sdhci-pci.c                     |    1 + drivers/mmc/host/sdhci.c                         |    2 +-

 4 files changed, 11 insertions(+), 1 deletions(-)
Documentation/powerpc/dts-bindings/fsl/esdhc.txt +0 -0
index 5093ddf..298b865 100644
@@ -10,6 +10,8 @@ Required properties:
Quoted 5 lines

  - interrupts : should contain eSDHC interrupt.
  - interrupt-parent : interrupt source phandle.
  - clock-frequency : specifies eSDHC base clock frequency.
+  - mode : specifies eSDHC mode, valid values are: "1-bit" and "4-bit".
+    If mode is unspecified, then 4-bit mode is assumed.

In light of Pierre's comment that 4-bit is mandatory and this is a deviation, perhaps it would be better to define an empty property to indicate that only 1-bit transfers work. Maybe something along the lines of "sdhc-1-bit-only"?

g.

Signature · 2 lines
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

A message that is not in the archive (sent off-list or not yet received): fa686aa40906130840lfb751a7xc9e24646c860a76d-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#5 lore raw
Quoted 24 lines · Grant Likely
Quoted 22 lines · Anton Vorontsov

Some hosts (hardware configurations, or particular SD/MMC slots) may not support 4-bit bus. For example, on MPC8569E-MDS boards we can switch between serial (1-bit only) and nibble (4-bit) modes, thought we have to disable more peripherals to work in 4-bit mode.

Along with some small core changes, this patch modifies sdhci-of driver, so that now it looks for "mode" property in the device-tree.

---

Pierre, I'm not sure if a quirk would be appropriate here. If so, I can redo the patch with FORCE_1_BIT_DATA quirk.

Thanks,

 Documentation/powerpc/dts-bindings/fsl/esdhc.txt |    2 ++ drivers/mmc/host/sdhci-of.c                      |    7 +++++++ drivers/mmc/host/sdhci-pci.c                     |    1 + drivers/mmc/host/sdhci.c                         |    2 +-

 4 files changed, 11 insertions(+), 1 deletions(-)
Quoted 15 lines
Quoted 10 lines
Documentation/powerpc/dts-bindings/fsl/esdhc.txt +0 -0
index 5093ddf..298b865 100644
@@ -10,6 +10,8 @@ Required properties:

  - interrupts : should contain eSDHC interrupt.
  - interrupt-parent : interrupt source phandle.
  - clock-frequency : specifies eSDHC base clock frequency.
+  - mode : specifies eSDHC mode, valid values are: "1-bit" and "4-bit".
+    If mode is unspecified, then 4-bit mode is assumed.

In light of Pierre's comment that 4-bit is mandatory and this is a deviation, perhaps it would be better to define an empty property to indicate that only 1-bit transfers work. Maybe something along the lines of "sdhc-1-bit-only"?

Yeah, since it turned up to be a quirk, we'd better use a named property.

(I think that by convention we should use commas for controller-specific properties, i.e. "sdhci,property".)

Thanks!

Signature · 7 lines
Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2
_______________________________________________
devicetree-discuss mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/devicetree-discuss
#6 lore raw

PATCH v2 1/1 sdhci: Add support for hosts that are only capable of 1-bit transfers

In reply to a message not in the archive

Some hosts (hardware configurations, or particular SD/MMC slots) may not support 4-bit bus. For example, on MPC8569E-MDS boards we can switch between serial (1-bit only) and nibble (4-bit) modes, thought we have to disable more peripherals to work in 4-bit mode.

Along with some small core changes, this patch modifies sdhci-of driver, so that now it looks for "sdhci,1-bit-only" property in the device-tree, and if specified we enable a proper quirk.

---

Pierre,

As promised, here is a version with a quirk.
Also incorporated suggestions by Grant Likely.

Thanks,

 Documentation/powerpc/dts-bindings/fsl/esdhc.txt |    2 ++
 drivers/mmc/host/sdhci-of.c                      |    3 +++
 drivers/mmc/host/sdhci.c                         |    5 ++++-
 drivers/mmc/host/sdhci.h                         |    2 ++
 4 files changed, 11 insertions(+), 1 deletions(-)
Documentation/powerpc/dts-bindings/fsl/esdhc.txt +2 -0
index 5093ddf..3ed3797 100644
@@ -10,6 +10,8 @@ Required properties:
   - interrupts : should contain eSDHC interrupt.
   - interrupt-parent : interrupt source phandle.
   - clock-frequency : specifies eSDHC base clock frequency.
+  - sdhci,1-bit-only : (optional) specifies that a controller can
+    only handle 1-bit data transfers.
 
 Example:
 
drivers/mmc/host/sdhci-of.c +3 -0
index 09cc597..dd65f84 100644
@@ -244,6 +244,9 @@ static int __devinit sdhci_of_probe(struct of_device *ofdev,
 		host->ops = &sdhci_of_data->ops;
 	}
 
+	if (of_get_property(np, "sdhci,1-bit-only", NULL))
+		host->quirks |= SDHCI_QUIRK_FORCE_1_BIT_DATA;
+
 	clk = of_get_property(np, "clock-frequency", &size);
 	if (clk && size == sizeof(*clk) && *clk)
 		of_host->clock = *clk;
drivers/mmc/host/sdhci.c +4 -1
index 9234be2..f28f94a 100644
@@ -1721,7 +1721,10 @@ int sdhci_add_host(struct sdhci_host *host)
 	mmc->ops = &sdhci_ops;
 	mmc->f_min = host->max_clk / 256;
 	mmc->f_max = host->max_clk;
-	mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;
+	mmc->caps = MMC_CAP_SDIO_IRQ;
+
+	if (!(host->quirks & SDHCI_QUIRK_FORCE_1_BIT_DATA))
+		mmc->caps |= MMC_CAP_4_BIT_DATA;
 
 	if (caps & SDHCI_CAN_DO_HISPD)
 		mmc->caps |= MMC_CAP_SD_HIGHSPEED;
drivers/mmc/host/sdhci.h +2 -0
index 65c6f99..834f877 100644
@@ -226,6 +226,8 @@ struct sdhci_host {
 #define SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET		(1<<19)
 /* Controller has to be forced to use block size of 2048 bytes */
 #define SDHCI_QUIRK_FORCE_BLK_SZ_2048			(1<<20)
+/* Controller can only handle 1-bit data transfers */
+#define SDHCI_QUIRK_FORCE_1_BIT_DATA			(1<<21)
 
 	int			irq;		/* Device IRQ */
 	void __iomem *		ioaddr;		/* Mapped address */
Signature · 1 line
1.6.3.1

A message that is not in the archive (sent off-list or not yet received): 20090617201408.GA17909-wnGakbxT3iijyJ0x5qLZdcN33GVbZNy3@public.gmane.org

Acked-by
#8 lore raw
Quoted 10 lines · Anton Vorontsov

Some hosts (hardware configurations, or particular SD/MMC slots) may not support 4-bit bus. For example, on MPC8569E-MDS boards we can switch between serial (1-bit only) and nibble (4-bit) modes, thought we have to disable more peripherals to work in 4-bit mode.

Along with some small core changes, this patch modifies sdhci-of driver, so that now it looks for "sdhci,1-bit-only" property in the device-tree, and if specified we enable a proper quirk.

Looks good to me.

g.

Quoted 75 lines

---

Pierre,

As promised, here is a version with a quirk.
Also incorporated suggestions by Grant Likely.

Thanks,

 Documentation/powerpc/dts-bindings/fsl/esdhc.txt |    2 ++ drivers/mmc/host/sdhci-of.c                      |    3 +++ drivers/mmc/host/sdhci.c                         |    5 ++++- drivers/mmc/host/sdhci.h                         |    2 ++

 4 files changed, 11 insertions(+), 1 deletions(-)
Documentation/powerpc/dts-bindings/fsl/esdhc.txt +0 -0
index 5093ddf..3ed3797 100644
@@ -10,6 +10,8 @@ Required properties:

  - interrupts : should contain eSDHC interrupt.
  - interrupt-parent : interrupt source phandle.
  - clock-frequency : specifies eSDHC base clock frequency.
+  - sdhci,1-bit-only : (optional) specifies that a controller can
+    only handle 1-bit data transfers.

 Example:

drivers/mmc/host/sdhci-of.c +3 -0
index 09cc597..dd65f84 100644
@@ -244,6 +244,9 @@ static int __devinit sdhci_of_probe(struct of_device *ofdev,
                host->ops = &sdhci_of_data->ops;
        }
 
+       if (of_get_property(np, "sdhci,1-bit-only", NULL))
+               host->quirks |= SDHCI_QUIRK_FORCE_1_BIT_DATA;
+
        clk = of_get_property(np, "clock-frequency", &size);
        if (clk && size == sizeof(*clk) && *clk)
                of_host->clock = *clk;
drivers/mmc/host/sdhci.c +4 -1
index 9234be2..f28f94a 100644
@@ -1721,7 +1721,10 @@ int sdhci_add_host(struct sdhci_host *host)
        mmc->ops = &sdhci_ops;
        mmc->f_min = host->max_clk / 256;
        mmc->f_max = host->max_clk;
-       mmc->caps = MMC_CAP_4_BIT_DATA | MMC_CAP_SDIO_IRQ;
+       mmc->caps = MMC_CAP_SDIO_IRQ;
+
+       if (!(host->quirks & SDHCI_QUIRK_FORCE_1_BIT_DATA))
+               mmc->caps |= MMC_CAP_4_BIT_DATA;
 
        if (caps & SDHCI_CAN_DO_HISPD)
                mmc->caps |= MMC_CAP_SD_HIGHSPEED;
drivers/mmc/host/sdhci.h +2 -0
index 65c6f99..834f877 100644
@@ -226,6 +226,8 @@ struct sdhci_host {
  #define SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET           (1<<19)
  /* Controller has to be forced to use block size of 2048 bytes */
  #define SDHCI_QUIRK_FORCE_BLK_SZ_2048                  (1<<20)
+/* Controller can only handle 1-bit data transfers */
+#define SDHCI_QUIRK_FORCE_1_BIT_DATA                   (1<<21)
 

       int                     irq;            /* Device IRQ */ void __iomem *          ioaddr;         /* Mapped address */ --
1.6.3.1

Signature · 2 lines
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
#9 lore raw
In reply to a message not in the archive
Quoted 11 lines · On Thu, 18 Jun 2009 00:14:08 +0400 Anton Vorontsov…

Some hosts (hardware configurations, or particular SD/MMC slots) may not support 4-bit bus. For example, on MPC8569E-MDS boards we can switch between serial (1-bit only) and nibble (4-bit) modes, thought we have to disable more peripherals to work in 4-bit mode.

Along with some small core changes, this patch modifies sdhci-of driver, so that now it looks for "sdhci,1-bit-only" property in the device-tree, and if specified we enable a proper quirk.

---

Patch merged.

Rgds

Signature · 6 lines
     -- Pierre Ossman

  WARNING: This correspondence is being monitored by the
  Swedish government. Make sure your server uses encryption
  for SMTP traffic and consider using PGP for end-to-end
  encryption.

_______________________________________________
devicetree-discuss mailing list [email protected]
https://ozlabs.org/mailman/listinfo/devicetree-discuss