Skip to contentSkip to conversation

BCM2711 sdhci-iproc improvements

PATCH In review Nicolas Saenz Julienne 6 participants 10 messages Apr 6, 2021 – Jul 30, 2021

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

cover BCM2711 sdhci-iproc improvements

This is a follow-up series to "BCM2711's sdhci-iproc CMD timeouts"[1], but since much most of the patches changed I decided to start counting patch revisions from scratch.

This series tries to address rather odd behavior from BCM2711's integration of sdhci-iproc (Raspberry Pi 4's SoC). The controller will timeout on SDHCI CMDs under the following conditions:

- No SD card plugged in (the card polling thread is running, CD irq disabled).
- BCM2711's VPU clock configured at 500MHz or more, lower clocks are OK.

There is no specific command that will time out, it seems random.

As an extra to this I also include a small fix, and convert the controller's bindings to yaml.

Regards,
Nicolas

[1] https://lore.kernel.org/linux-mmc/[email protected]/

---

Nicolas Saenz Julienne (3):
dt-bindings: mmc: iproc-sdhci: Convert to json-schema
mmc: sdhci-iproc: Cap min clock frequency on BCM2711
mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN on BCM2711

 .../bindings/mmc/brcm,iproc-sdhci.yaml        | 63 +++++++++++++++++++
 .../bindings/mmc/brcm,sdhci-iproc.txt         | 37 -----------
 drivers/mmc/host/sdhci-iproc.c                | 21 ++++++-
 3 files changed, 83 insertions(+), 38 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml
 delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt
Signature · 1 line
2.30.2
#1 lore raw

PATCH 1/3 dt-bindings: mmc: iproc-sdhci: Convert to json-schema

Convert the brcm,iproc-sdhci binding to DT schema format using json-schema

---

 .../bindings/mmc/brcm,iproc-sdhci.yaml        | 63 +++++++++++++++++++
 .../bindings/mmc/brcm,sdhci-iproc.txt         | 37 -----------
 2 files changed, 63 insertions(+), 37 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml
 delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt
Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml new file +63 -0
new file mode 100644
index 000000000000..6f569fbfa134
@@ -0,0 +1,63 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mmc/brcm,iproc-sdhci.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom IPROC SDHCI controller
+
+maintainers:
+  - Ray Jui <[email protected]>
+  - Scott Branden <[email protected]>
+  - Nicolas Saenz Julienne <[email protected]>
+
+allOf:
+  - $ref: mmc-controller.yaml#
+
+properties:
+  compatible:
+    enum:
+      - brcm,bcm2835-sdhci
+      - brcm,bcm2711-emmc2
+      - brcm,sdhci-iproc-cygnus
+      - brcm,sdhci-iproc
+
+  reg:
+    minItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  clocks:
+    maxItems: 1
+    description:
+      Handle to core clock for the sdhci controller.
+
+  sdhci,auto-cmd12:
+    type: boolean
+    description: Specifies that controller should use auto CMD12
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - clocks
+
+unevaluatedProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/irq.h>
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+    #include <dt-bindings/clock/bcm-cygnus.h>
+
+    mmc@18041000 {
+      compatible = "brcm,sdhci-iproc-cygnus";
+      reg = <0x18041000 0x100>;
+      interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+      clocks = <&lcpll0_clks BCM_CYGNUS_LCPLL0_SDIO_CLK>;
+      bus-width = <4>;
+      sdhci,auto-cmd12;
+      no-1-8-v;
+    };
+...
Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt deleted +0 -37
deleted file mode 100644
index 09d87cc1182a..000000000000
@@ -1,37 +0,0 @@
-Broadcom IPROC SDHCI controller
-
-This file documents differences between the core properties described
-by mmc.txt and the properties that represent the IPROC SDHCI controller.
-
-Required properties:
-- compatible : Should be one of the following
-	       "brcm,bcm2835-sdhci"
-	       "brcm,bcm2711-emmc2"
-	       "brcm,sdhci-iproc-cygnus"
-	       "brcm,sdhci-iproc"
-
-Use brcm2835-sdhci for the eMMC controller on the BCM2835 (Raspberry Pi) and
-bcm2711-emmc2 for the additional eMMC2 controller on BCM2711.
-
-Use sdhci-iproc-cygnus for Broadcom SDHCI Controllers
-restricted to 32bit host accesses to SDHCI registers.
-
-Use sdhci-iproc for Broadcom SDHCI Controllers that allow standard
-8, 16, 32-bit host access to SDHCI register.
-
-- clocks : The clock feeding the SDHCI controller.
-
-Optional properties:
-  - sdhci,auto-cmd12: specifies that controller should use auto CMD12.
-
-Example:
-
-sdhci0: sdhci@18041000 {
-	compatible = "brcm,sdhci-iproc-cygnus";
-	reg = <0x18041000 0x100>;
-	interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-	clocks = <&lcpll0_clks BCM_CYGNUS_LCPLL0_SDIO_CLK>;
-	bus-width = <4>;
-	sdhci,auto-cmd12;
-	no-1-8-v;
-};
Signature · 1 line
2.30.2
maintainer Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] dt-bindings: mmc: iproc-sdhci: Convert to json-schema

Quoted 4 lines · Nicolas Saenz Julienne

Convert the brcm,iproc-sdhci binding to DT schema format using json-schema

Quoted 8 lines

---

 .../bindings/mmc/brcm,iproc-sdhci.yaml        | 63 +++++++++++++++++++
 .../bindings/mmc/brcm,sdhci-iproc.txt         | 37 -----------
 2 files changed, 63 insertions(+), 37 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml
 delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt
#3 lore raw

Re: [PATCH 1/3] dt-bindings: mmc: iproc-sdhci: Convert to json-schema

In reply to Nicolas Saenz Julienne
Quoted 4 lines · Nicolas Saenz Julienne

Convert the brcm,iproc-sdhci binding to DT schema format using json-schema

Applied for next, thanks! (I guess patch2 and patch3 needs a re-spin?)

Kind regards
Uffe

Quoted 124 lines

---

 .../bindings/mmc/brcm,iproc-sdhci.yaml        | 63 +++++++++++++++++++
 .../bindings/mmc/brcm,sdhci-iproc.txt         | 37 -----------
 2 files changed, 63 insertions(+), 37 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml
 delete mode 100644 Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt
Documentation/devicetree/bindings/mmc/brcm,iproc-sdhci.yaml new file +63 -0
new file mode 100644
index 000000000000..6f569fbfa134
@@ -0,0 +1,63 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/mmc/brcm,iproc-sdhci.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom IPROC SDHCI controller
+
+maintainers:
+  - Ray Jui <[email protected]>
+  - Scott Branden <[email protected]>
+  - Nicolas Saenz Julienne <[email protected]>
+
+allOf:
+  - $ref: mmc-controller.yaml#
+
+properties:
+  compatible:
+    enum:
+      - brcm,bcm2835-sdhci
+      - brcm,bcm2711-emmc2
+      - brcm,sdhci-iproc-cygnus
+      - brcm,sdhci-iproc
+
+  reg:
+    minItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  clocks:
+    maxItems: 1
+    description:
+      Handle to core clock for the sdhci controller.
+
+  sdhci,auto-cmd12:
+    type: boolean
+    description: Specifies that controller should use auto CMD12
+
+required:
+  - compatible
+  - reg
+  - interrupts
+  - clocks
+
+unevaluatedProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/irq.h>
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+    #include <dt-bindings/clock/bcm-cygnus.h>
+
+    mmc@18041000 {
+      compatible = "brcm,sdhci-iproc-cygnus";
+      reg = <0x18041000 0x100>;
+      interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+      clocks = <&lcpll0_clks BCM_CYGNUS_LCPLL0_SDIO_CLK>;
+      bus-width = <4>;
+      sdhci,auto-cmd12;
+      no-1-8-v;
+    };
+...
Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt deleted +0 -38
deleted file mode 100644
index 09d87cc1182a..000000000000
@@ -1,37 +0,0 @@
-Broadcom IPROC SDHCI controller
-
-This file documents differences between the core properties described
-by mmc.txt and the properties that represent the IPROC SDHCI controller.
-
-Required properties:
-- compatible : Should be one of the following
-              "brcm,bcm2835-sdhci"
-              "brcm,bcm2711-emmc2"
-              "brcm,sdhci-iproc-cygnus"
-              "brcm,sdhci-iproc"
-
-Use brcm2835-sdhci for the eMMC controller on the BCM2835 (Raspberry Pi) and
-bcm2711-emmc2 for the additional eMMC2 controller on BCM2711.
-
-Use sdhci-iproc-cygnus for Broadcom SDHCI Controllers
-restricted to 32bit host accesses to SDHCI registers.
-
-Use sdhci-iproc for Broadcom SDHCI Controllers that allow standard
-8, 16, 32-bit host access to SDHCI register.
-
-- clocks : The clock feeding the SDHCI controller.
-
-Optional properties:
-  - sdhci,auto-cmd12: specifies that controller should use auto CMD12.
-
-Example:
-
-sdhci0: sdhci@18041000 {
-       compatible = "brcm,sdhci-iproc-cygnus";
-       reg = <0x18041000 0x100>;
-       interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
-       clocks = <&lcpll0_clks BCM_CYGNUS_LCPLL0_SDIO_CLK>;
-       bus-width = <4>;
-       sdhci,auto-cmd12;
-       no-1-8-v;
-};
--

2.30.2

#4 lore raw

Re: [PATCH 1/3] dt-bindings: mmc: iproc-sdhci: Convert to json-schema

Quoted 7 lines · Ulf Hansson
Quoted 4 lines · Nicolas Saenz Julienne

Convert the brcm,iproc-sdhci binding to DT schema format using json-schema

Applied for next, thanks! (I guess patch2 and patch3 needs a re-spin?)

Yes, that's right. Thanks!

Regards,
Nicolas

#5 lore raw

PATCH 2/3 mmc: sdhci-iproc: Cap min clock frequency on BCM2711

In reply to Nicolas Saenz Julienne

There is a known bug on BCM2711's SDHCI core integration where the controller will hang when the difference between the core clock and the bus clock is too great. Specifically this can be reproduced under the following conditions:

- No SD card plugged in, polling thread is running, probing cards at 100KHz.
- BCM2711's core clock configured at 500MHz or more.

So set 200MHz as the minimum clock frequency available for that board.

For more information on the issue see this:
https://lore.kernel.org/linux-mmc/[email protected]/T/#m11f2783a09b581da6b8a15f302625b43a6ecdeca

Fixes f84e411c85be ("mmc: sdhci-iproc: Add support for emmc2 of the BCM2711")
---
 drivers/mmc/host/sdhci-iproc.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
drivers/mmc/host/sdhci-iproc.c +18 -0
index ddeaf8e1f72f..1ef888e91f73 100644
@@ -173,6 +173,23 @@ static unsigned int sdhci_iproc_get_max_clock(struct sdhci_host *host)
 		return pltfm_host->clock;
 }
 
+/*
+ * There is a known bug on BCM2711's SDHCI core integration where the
+ * controller will hang when the difference between the core clock and the bus
+ * clock is too great. Specifically this can be reproduced under the following
+ * conditions:
+ *
+ *  - No SD card plugged in, polling thread is running, probing cards at
+ *    100KHz.
+ *  - BCM2711's core clock configured at 500MHz or more
+ *
+ * So we set 200MHz as the minimum clock frequency available for that SoC.
+ */
+static unsigned int sdhci_iproc_bcm2711_get_min_clock(struct sdhci_host *host)
+{
+	return 200000;
+}
+
 static const struct sdhci_ops sdhci_iproc_ops = {
 	.set_clock = sdhci_set_clock,
 	.get_max_clock = sdhci_iproc_get_max_clock,
@@ -271,6 +288,7 @@ static const struct sdhci_ops sdhci_iproc_bcm2711_ops = {
 	.set_clock = sdhci_set_clock,
 	.set_power = sdhci_set_power_and_bus_voltage,
 	.get_max_clock = sdhci_iproc_get_max_clock,
+	.get_min_clock = sdhci_iproc_bcm2711_get_min_clock,
 	.set_bus_width = sdhci_set_bus_width,
 	.reset = sdhci_reset,
 	.set_uhs_signaling = sdhci_set_uhs_signaling,
Signature · 1 line
2.30.2
#6 lore raw

Re: [PATCH 2/3] mmc: sdhci-iproc: Cap min clock frequency on BCM2711

Hi Nicolas,

Am 06.04.21 um 12:48 schrieb Nicolas Saenz Julienne:

Quoted 10 lines

There is a known bug on BCM2711's SDHCI core integration where the controller will hang when the difference between the core clock and the bus clock is too great. Specifically this can be reproduced under the following conditions:

- No SD card plugged in, polling thread is running, probing cards at 100KHz.
- BCM2711's core clock configured at 500MHz or more.

So set 200MHz as the minimum clock frequency available for that board.

i think it should be 200 kHz?

Quoted 46 lines

For more information on the issue see this:
https://lore.kernel.org/linux-mmc/[email protected]/T/#m11f2783a09b581da6b8a15f302625b43a6ecdeca

Fixes f84e411c85be ("mmc: sdhci-iproc: Add support for emmc2 of the BCM2711")
---
 drivers/mmc/host/sdhci-iproc.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
drivers/mmc/host/sdhci-iproc.c +18 -0
index ddeaf8e1f72f..1ef888e91f73 100644
@@ -173,6 +173,23 @@ static unsigned int sdhci_iproc_get_max_clock(struct sdhci_host *host)
 		return pltfm_host->clock;
 }
 
+/*
+ * There is a known bug on BCM2711's SDHCI core integration where the
+ * controller will hang when the difference between the core clock and the bus
+ * clock is too great. Specifically this can be reproduced under the following
+ * conditions:
+ *
+ *  - No SD card plugged in, polling thread is running, probing cards at
+ *    100KHz.
+ *  - BCM2711's core clock configured at 500MHz or more
+ *
+ * So we set 200MHz as the minimum clock frequency available for that SoC.
+ */
+static unsigned int sdhci_iproc_bcm2711_get_min_clock(struct sdhci_host *host)
+{
+	return 200000;
+}
+
 static const struct sdhci_ops sdhci_iproc_ops = {
 	.set_clock = sdhci_set_clock,
 	.get_max_clock = sdhci_iproc_get_max_clock,
@@ -271,6 +288,7 @@ static const struct sdhci_ops sdhci_iproc_bcm2711_ops = {
 	.set_clock = sdhci_set_clock,
 	.set_power = sdhci_set_power_and_bus_voltage,
 	.get_max_clock = sdhci_iproc_get_max_clock,
+	.get_min_clock = sdhci_iproc_bcm2711_get_min_clock,
 	.set_bus_width = sdhci_set_bus_width,
 	.reset = sdhci_reset,
 	.set_uhs_signaling = sdhci_set_uhs_signaling,
#7 lore raw

Re: [PATCH 2/3] mmc: sdhci-iproc: Cap min clock frequency on BCM2711

Quoted 8 lines · Stefan Wahren

Hi Nicolas,

Am 06.04.21 um 12:48 schrieb Nicolas Saenz Julienne:

Quoted 5 lines

There is a known bug on BCM2711's SDHCI core integration where the controller will hang when the difference between the core clock and the bus clock is too great. Specifically this can be reproduced under the following conditions:

Quoted 6 lines
Quoted 5 lines

- No SD card plugged in, polling thread is running, probing cards at 100KHz.
- BCM2711's core clock configured at 500MHz or more.

So set 200MHz as the minimum clock frequency available for that board.

i think it should be 200 kHz?

Of course... Sorry for that.

Regards,
Nicolas

Quoted 39 lines
Quoted 39 lines

For more information on the issue see this:
https://lore.kernel.org/linux-mmc/[email protected]/T/#m11f2783a09b581da6b8a15f302625b43a6ecdeca

Fixes f84e411c85be ("mmc: sdhci-iproc: Add support for emmc2 of the BCM2711")

---
 drivers/mmc/host/sdhci-iproc.c | 18 ++++++++++++++++++

 1 file changed, 18 insertions(+)
drivers/mmc/host/sdhci-iproc.c +0 -0
index ddeaf8e1f72f..1ef888e91f73 100644
@@ -173,6 +173,23 @@ static unsigned int sdhci_iproc_get_max_clock(struct sdhci_host *host)
  		return pltfm_host->clock;
  }

drivers/mmc/host/sdhci-iproc.c +17 -0
+/*
+ * There is a known bug on BCM2711's SDHCI core integration where the
+ * controller will hang when the difference between the core clock and the bus
+ * clock is too great. Specifically this can be reproduced under the following
+ * conditions:
+ *
+ *  - No SD card plugged in, polling thread is running, probing cards at
+ *    100KHz.
+ *  - BCM2711's core clock configured at 500MHz or more
+ *
+ * So we set 200MHz as the minimum clock frequency available for that SoC.
+ */
+static unsigned int sdhci_iproc_bcm2711_get_min_clock(struct sdhci_host *host)
+{
+	return 200000;
+}
+

 static const struct sdhci_ops sdhci_iproc_ops = { .set_clock = sdhci_set_clock, .get_max_clock = sdhci_iproc_get_max_clock,

Quoted 8 lines

drivers/mmc/host/sdhci-iproc.c static const struct sdhci_ops sdhci_iproc_bcm2711_ops = { · line 294

Quoted 8 lines
drivers/mmc/host/sdhci-iproc.c +1 -0
@@ -271,6 +288,7 @@ static const struct sdhci_ops sdhci_iproc_bcm2711_ops = {
  	.set_clock = sdhci_set_clock,
  	.set_power = sdhci_set_power_and_bus_voltage,
  	.get_max_clock = sdhci_iproc_get_max_clock,
+	.get_min_clock = sdhci_iproc_bcm2711_get_min_clock,
  	.set_bus_width = sdhci_set_bus_width,
  	.reset = sdhci_reset,
  	.set_uhs_signaling = sdhci_set_uhs_signaling,

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#8 lore raw

Re: [PATCH 2/3] mmc: sdhci-iproc: Cap min clock frequency on BCM2711

Hi Nicolas,

Quoting Nicolas Saenz Julienne (2021-04-07 11:44:39)

Quoted 9 lines · Stefan Wahren
Quoted 8 lines

Hi Nicolas,

Am 06.04.21 um 12:48 schrieb Nicolas Saenz Julienne:

Quoted 5 lines

There is a known bug on BCM2711's SDHCI core integration where the controller will hang when the difference between the core clock and the bus clock is too great. Specifically this can be reproduced under the following conditions:

Quoted 9 lines
Quoted 6 lines
Quoted 5 lines

- No SD card plugged in, polling thread is running, probing cards at 100KHz.
- BCM2711's core clock configured at 500MHz or more.

So set 200MHz as the minimum clock frequency available for that board.

i think it should be 200 kHz?

Of course... Sorry for that.

What is the plan for this patch?

Thanks,
Ivan

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#9 lore raw

PATCH 3/3 mmc: sdhci-iproc: Set SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN on BCM2711

In reply to Nicolas Saenz Julienne

The controller doesn't seem to pick-up on clock changes, so set the SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN flag to query the clock frequency directly from the clock.

Fixes f84e411c85be ("mmc: sdhci-iproc: Add support for emmc2 of the BCM2711")
---
 drivers/mmc/host/sdhci-iproc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-iproc.c +2 -1
index 1ef888e91f73..31f61ea474f0 100644
@@ -295,7 +295,8 @@ static const struct sdhci_ops sdhci_iproc_bcm2711_ops = {
 };
 
 static const struct sdhci_pltfm_data sdhci_bcm2711_pltfm_data = {
-	.quirks = SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12,
+	.quirks = SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12 |
+		  SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN,
 	.ops = &sdhci_iproc_bcm2711_ops,
 };
 
Signature · 1 line
2.30.2