[PATCH v8 0/2] mmc: sdhci-brcmstb: add new sdhci reset sequence for brcm 74165b0

[PATCH v8 0/2] mmc: sdhci-brcmstb: add new sdhci reset sequence for brcm 74165b0

[Kamal Dasu]

[-- Attachment #1: Type: text/plain, Size: 1567 bytes --]

v8 changes
 - Add  subject as "mmc: sdhci-brcmstb:" to PATCH 2/2
 - Added Acked tag to PATCH 2/2 commit message

v7 changes:
 - Moved variable longer line to be first
 - Used read_poll_timeout_atomic() and fixed break condition as per
   review comments

v6 changes:
 - PATCH 1/2 Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 - PATCH 2/2 replaced readb_poll_timeout() with readb_poll_timeout_atomic()
   based on Review comments

v5 changes:
 - got rid of  'Reported by:' and 'Closes:' tags for all patches
   
v4 changes:
 - Fix for v3 changes that introduced dt schema errors
 - Fix for v3 changes that introduced sdhci-brcmstb build warnings 
 - Added proper PATCH format and cleanup commit messages as per
   review comments. Added proper 'Reported-by' and 'Closes' tags
 - Added comments for 32-bit register access as per review comments
 - Replaced wait loop polling with readb_poll_timeout() helper as per
   review comments for the sdhci-brcmstb driver changes
 
v3 changes:
 - Removed extra emun arrayfor possible compatible strings
 - shdci-brcmstb checkpatch warning fixes 

v2 changes:
 - Fixed devicetree bindings for shdci-brcmstb and removed 74165 compatible
   string as per review comments


Kamal Dasu (2):
  dt-bindings: mmc: brcm,sdhci-brcmstb: Add support for 74165b0
  mmc: sdhci-brcmstb: add new sdhci reset sequence for brcm 74165b0

 .../bindings/mmc/brcm,sdhci-brcmstb.yaml      |  4 +-
 drivers/mmc/host/sdhci-brcmstb.c              | 69 +++++++++++++++++--
 2 files changed, 65 insertions(+), 8 deletions(-)

-- 
2.17.1


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4203 bytes --]

[PATCH v8 1/2] dt-bindings: mmc: brcm,sdhci-brcmstb: Add support for 74165b0

[Kamal Dasu]

[-- Attachment #1: Type: text/plain, Size: 1048 bytes --]

From: Kamal Dasu <kdasu@broadcom.com>

With newer sdio controller core used for 74165b0 we need to update
the compatibility with "brcm,bcm74165b0-sdhci".

Signed-off-by: Kamal Dasu <kdasu@broadcom.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
index c028039bc477..cbd3d6c6c77f 100644
--- a/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
+++ b/Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.yaml
@@ -20,10 +20,8 @@ properties:
           - const: brcm,sdhci-brcmstb
       - items:
           - enum:
+              - brcm,bcm74165b0-sdhci
               - brcm,bcm7445-sdhci
-          - const: brcm,sdhci-brcmstb
-      - items:
-          - enum:
               - brcm,bcm7425-sdhci
           - const: brcm,sdhci-brcmstb
 
-- 
2.17.1


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4203 bytes --]

[PATCH v8 2/2] mmc: sdhci-brcmstb: add new sdhci reset sequence for brcm 74165b0

[Kamal Dasu]

[-- Attachment #1: Type: text/plain, Size: 4465 bytes --]

From: Kamal Dasu <kdasu@broadcom.com>

74165b0 shall use a new sdio controller core version which
requires a different reset sequence. For core reset we use
sdhci_reset. For CMD and/or DATA reset added a new function
to also enable SDHCI clocks SDHCI_CLOCK_CARD_EN
SDHCI_CLOCK_INT_EN along with the SDHCI_RESET_CMD and/or
SDHCI_RESET_DATA fields.

Signed-off-by: Kamal Dasu <kdasu@broadcom.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
---
 drivers/mmc/host/sdhci-brcmstb.c | 69 +++++++++++++++++++++++++++++---
 1 file changed, 64 insertions(+), 5 deletions(-)

diff --git a/drivers/mmc/host/sdhci-brcmstb.c b/drivers/mmc/host/sdhci-brcmstb.c
index c23251bb95f3..9053526fa212 100644
--- a/drivers/mmc/host/sdhci-brcmstb.c
+++ b/drivers/mmc/host/sdhci-brcmstb.c
@@ -6,6 +6,7 @@
  */
 
 #include <linux/io.h>
+#include <linux/iopoll.h>
 #include <linux/mmc/host.h>
 #include <linux/module.h>
 #include <linux/of.h>
@@ -44,8 +45,13 @@ struct brcmstb_match_priv {
 
 static inline void enable_clock_gating(struct sdhci_host *host)
 {
+	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
+	struct sdhci_brcmstb_priv *priv = sdhci_pltfm_priv(pltfm_host);
 	u32 reg;
 
+	if (!(priv->flags & BRCMSTB_PRIV_FLAGS_GATE_CLOCK))
+		return;
+
 	reg = sdhci_readl(host, SDHCI_VENDOR);
 	reg |= SDHCI_VENDOR_GATE_SDCLK_EN;
 	sdhci_writel(host, reg, SDHCI_VENDOR);
@@ -53,14 +59,53 @@ static inline void enable_clock_gating(struct sdhci_host *host)
 
 static void brcmstb_reset(struct sdhci_host *host, u8 mask)
 {
-	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-	struct sdhci_brcmstb_priv *priv = sdhci_pltfm_priv(pltfm_host);
-
 	sdhci_and_cqhci_reset(host, mask);
 
 	/* Reset will clear this, so re-enable it */
-	if (priv->flags & BRCMSTB_PRIV_FLAGS_GATE_CLOCK)
-		enable_clock_gating(host);
+	enable_clock_gating(host);
+}
+
+static void brcmstb_sdhci_reset_cmd_data(struct sdhci_host *host, u8 mask)
+{
+	u32 new_mask = (mask &  (SDHCI_RESET_CMD | SDHCI_RESET_DATA)) << 24;
+	int ret;
+	u32 reg;
+
+	/*
+	 * SDHCI_CLOCK_CONTROL register CARD_EN and CLOCK_INT_EN bits shall
+	 * be set along with SOFTWARE_RESET register RESET_CMD or RESET_DATA
+	 * bits, hence access SDHCI_CLOCK_CONTROL register as 32-bit register
+	 */
+	new_mask |= SDHCI_CLOCK_CARD_EN | SDHCI_CLOCK_INT_EN;
+	reg = sdhci_readl(host, SDHCI_CLOCK_CONTROL);
+	sdhci_writel(host, reg | new_mask, SDHCI_CLOCK_CONTROL);
+
+	reg = sdhci_readb(host, SDHCI_SOFTWARE_RESET);
+
+	ret = read_poll_timeout_atomic(sdhci_readb, reg, !(reg & mask),
+				       10, 10000, false,
+				       host, SDHCI_SOFTWARE_RESET);
+
+	if (ret) {
+		pr_err("%s: Reset 0x%x never completed.\n",
+		       mmc_hostname(host->mmc), (int)mask);
+		sdhci_err_stats_inc(host, CTRL_TIMEOUT);
+		sdhci_dumpregs(host);
+	}
+}
+
+static void brcmstb_reset_74165b0(struct sdhci_host *host, u8 mask)
+{
+	/* take care of RESET_ALL as usual */
+	if (mask & SDHCI_RESET_ALL)
+		sdhci_and_cqhci_reset(host, SDHCI_RESET_ALL);
+
+	/* cmd and/or data treated differently on this core */
+	if (mask & (SDHCI_RESET_CMD | SDHCI_RESET_DATA))
+		brcmstb_sdhci_reset_cmd_data(host, mask);
+
+	/* Reset will clear this, so re-enable it */
+	enable_clock_gating(host);
 }
 
 static void sdhci_brcmstb_hs400es(struct mmc_host *mmc, struct mmc_ios *ios)
@@ -162,6 +207,13 @@ static struct sdhci_ops sdhci_brcmstb_ops_7216 = {
 	.set_uhs_signaling = sdhci_brcmstb_set_uhs_signaling,
 };
 
+static struct sdhci_ops sdhci_brcmstb_ops_74165b0 = {
+	.set_clock = sdhci_brcmstb_set_clock,
+	.set_bus_width = sdhci_set_bus_width,
+	.reset = brcmstb_reset_74165b0,
+	.set_uhs_signaling = sdhci_brcmstb_set_uhs_signaling,
+};
+
 static struct brcmstb_match_priv match_priv_7425 = {
 	.flags = BRCMSTB_MATCH_FLAGS_NO_64BIT |
 	BRCMSTB_MATCH_FLAGS_BROKEN_TIMEOUT,
@@ -179,10 +231,17 @@ static const struct brcmstb_match_priv match_priv_7216 = {
 	.ops = &sdhci_brcmstb_ops_7216,
 };
 
+static struct brcmstb_match_priv match_priv_74165b0 = {
+	.flags = BRCMSTB_MATCH_FLAGS_HAS_CLOCK_GATE,
+	.hs400es = sdhci_brcmstb_hs400es,
+	.ops = &sdhci_brcmstb_ops_74165b0,
+};
+
 static const struct of_device_id __maybe_unused sdhci_brcm_of_match[] = {
 	{ .compatible = "brcm,bcm7425-sdhci", .data = &match_priv_7425 },
 	{ .compatible = "brcm,bcm7445-sdhci", .data = &match_priv_7445 },
 	{ .compatible = "brcm,bcm7216-sdhci", .data = &match_priv_7216 },
+	{ .compatible = "brcm,bcm74165b0-sdhci", .data = &match_priv_74165b0 },
 	{},
 };
 
-- 
2.17.1


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4203 bytes --]

Re: [PATCH v8 1/2] dt-bindings: mmc: brcm,sdhci-brcmstb: Add support for 74165b0

[Florian Fainelli]

[-- Attachment #1: Type: text/plain, Size: 390 bytes --]

On 1/3/24 14:23, Kamal Dasu wrote:
> From: Kamal Dasu <kdasu@broadcom.com>
> 
> With newer sdio controller core used for 74165b0 we need to update
> the compatibility with "brcm,bcm74165b0-sdhci".
> 
> Signed-off-by: Kamal Dasu <kdasu@broadcom.com>
> Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
-- 
Florian


[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4221 bytes --]

Re: [PATCH v8 0/2] mmc: sdhci-brcmstb: add new sdhci reset sequence for brcm 74165b0

[Ulf Hansson]

On Wed, 3 Jan 2024 at 23:23, Kamal Dasu <kamal.dasu@broadcom.com> wrote:
>
> v8 changes
>  - Add  subject as "mmc: sdhci-brcmstb:" to PATCH 2/2
>  - Added Acked tag to PATCH 2/2 commit message
>
> v7 changes:
>  - Moved variable longer line to be first
>  - Used read_poll_timeout_atomic() and fixed break condition as per
>    review comments
>
> v6 changes:
>  - PATCH 1/2 Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>  - PATCH 2/2 replaced readb_poll_timeout() with readb_poll_timeout_atomic()
>    based on Review comments
>
> v5 changes:
>  - got rid of  'Reported by:' and 'Closes:' tags for all patches
>
> v4 changes:
>  - Fix for v3 changes that introduced dt schema errors
>  - Fix for v3 changes that introduced sdhci-brcmstb build warnings
>  - Added proper PATCH format and cleanup commit messages as per
>    review comments. Added proper 'Reported-by' and 'Closes' tags
>  - Added comments for 32-bit register access as per review comments
>  - Replaced wait loop polling with readb_poll_timeout() helper as per
>    review comments for the sdhci-brcmstb driver changes
>
> v3 changes:
>  - Removed extra emun arrayfor possible compatible strings
>  - shdci-brcmstb checkpatch warning fixes
>
> v2 changes:
>  - Fixed devicetree bindings for shdci-brcmstb and removed 74165 compatible
>    string as per review comments
>
>
> Kamal Dasu (2):
>   dt-bindings: mmc: brcm,sdhci-brcmstb: Add support for 74165b0
>   mmc: sdhci-brcmstb: add new sdhci reset sequence for brcm 74165b0
>
>  .../bindings/mmc/brcm,sdhci-brcmstb.yaml      |  4 +-
>  drivers/mmc/host/sdhci-brcmstb.c              | 69 +++++++++++++++++--
>  2 files changed, 65 insertions(+), 8 deletions(-)
>

Applied for next, thanks!

Kind regards
Uffe