Skip to contentSkip to conversation

a few fixes for sprd's sd host controller

PATCH RESEND In review Chunyan Zhang 2 participants 8 messages Aug 29, 2019 – Aug 30, 2019

Subsystems (3)
MMC, SD and SDIO Secure digital host controller interface (SDHCI) driver Arm/spreadtrum SoC support
lore
Share & tools
lore

Chunyan Zhang

author reviewer
#0 lore raw

v2 cover a few fixes for sprd's sd host controller

With this patch-set, both sd card and mmc can be setup. This patch-set was verified on Unisoc's Whale2 and another mobile phone platform SC9863A.

Changes from v1:
- Added Reviewed-by and Tested-by of Baolin;
- Added fixes tag for all patches in this series.

Chunyan Zhang (5):
mmc: sdhci-sprd: fixed incorrect clock divider
mmc: sdhci-sprd: add get_ro hook function
mmc: sdhci-sprd: add SDHCI_QUIRK2_PRESET_VALUE_BROKEN
mms: sdhci-sprd: add SDHCI_QUIRK_BROKEN_CARD_DETECTION
mmc: sdhci-sprd: clear the UHS-I modes read from registers

 drivers/mmc/host/sdhci-sprd.c | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)
Signature · 1 line
2.20.1
author reviewer
#1 lore raw

PATCH RESEND v2 1/5 mmc: sdhci-sprd: fixed incorrect clock divider

From: Chunyan Zhang <[email protected]>

The register SDHCI_CLOCK_CONTROL should be cleared before config clock divider, otherwise the frequency configured maybe lower than we expected.

Fixes fb8bd90f83c4 ("mmc: sdhci-sprd: Add Spreadtrum's initial host controller")
Signed-off-by Chunyan Zhang <[email protected]>
Signed-off-by Chunyan Zhang <[email protected]>
Reviewed-by Baolin Wang <[email protected]>
Tested-by Baolin Wang <[email protected]>
---
 drivers/mmc/host/sdhci-sprd.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/mmc/host/sdhci-sprd.c +4 -3
index 6ee340a3fb3a..d5871865a1e9 100644
@@ -217,10 +217,11 @@ static inline void _sdhci_sprd_set_clock(struct sdhci_host *host,
 	struct sdhci_sprd_host *sprd_host = TO_SPRD_HOST(host);
 	u32 div, val, mask;
 
-	div = sdhci_sprd_calc_div(sprd_host->base_rate, clk);
+	sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
 
-	clk |= ((div & 0x300) >> 2) | ((div & 0xFF) << 8);
-	sdhci_enable_clk(host, clk);
+	div = sdhci_sprd_calc_div(sprd_host->base_rate, clk);
+	div = ((div & 0x300) >> 2) | ((div & 0xFF) << 8);
+	sdhci_enable_clk(host, div);
 
 	/* enable auto gate sdhc_enable_auto_gate */
 	val = sdhci_readl(host, SDHCI_SPRD_REG_32_BUSY_POSI);
Signature · 1 line
2.20.1
author reviewer
#2 lore raw

PATCH RESEND v2 2/5 mmc: sdhci-sprd: add get_ro hook function

In reply to Chunyan Zhang

From: Chunyan Zhang <[email protected]>

sprd's sd host controller doesn't support write protect to sd card.

Fixes fb8bd90f83c4 ("mmc: sdhci-sprd: Add Spreadtrum's initial host controller")
Signed-off-by Chunyan Zhang <[email protected]>
Signed-off-by Chunyan Zhang <[email protected]>
Reviewed-by Baolin Wang <[email protected]>
Tested-by Baolin Wang <[email protected]>
---
 drivers/mmc/host/sdhci-sprd.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/mmc/host/sdhci-sprd.c +6 -0
index d5871865a1e9..90cb2af91159 100644
@@ -374,6 +374,11 @@ static unsigned int sdhci_sprd_get_max_timeout_count(struct sdhci_host *host)
 	return 1 << 31;
 }
 
+static unsigned int sdhci_sprd_get_ro(struct sdhci_host *host)
+{
+	return 0;
+}
+
 static struct sdhci_ops sdhci_sprd_ops = {
 	.read_l = sdhci_sprd_readl,
 	.write_l = sdhci_sprd_writel,

@@ -386,6 +391,7 @@ static struct sdhci_ops sdhci_sprd_ops = {
 	.set_uhs_signaling = sdhci_sprd_set_uhs_signaling,
 	.hw_reset = sdhci_sprd_hw_reset,
 	.get_max_timeout_count = sdhci_sprd_get_max_timeout_count,
+	.get_ro = sdhci_sprd_get_ro,
 };
 
 static void sdhci_sprd_request(struct mmc_host *mmc, struct mmc_request *mrq)
Signature · 1 line
2.20.1
author reviewer
#3 lore raw

PATCH RESEND v2 3/5 mmc: sdhci-sprd: add SDHCI_QUIRK2_PRESET_VALUE_BROKEN

In reply to Chunyan Zhang

From: Chunyan Zhang <[email protected]>

The bit of PRESET_VAL_ENABLE in HOST_CONTROL2 register is reserved on sprd's sd host controller, set quirk2 to disable configuring this.

Fixes fb8bd90f83c4 ("mmc: sdhci-sprd: Add Spreadtrum's initial host controller")
Signed-off-by Chunyan Zhang <[email protected]>
Signed-off-by Chunyan Zhang <[email protected]>
Reviewed-by Baolin Wang <[email protected]>
Tested-by Baolin Wang <[email protected]>
---
 drivers/mmc/host/sdhci-sprd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-sprd.c +2 -1
index 90cb2af91159..27d0b57f3f89 100644
@@ -510,7 +510,8 @@ static void sdhci_sprd_phy_param_parse(struct sdhci_sprd_host *sprd_host,
 static const struct sdhci_pltfm_data sdhci_sprd_pdata = {
 	.quirks = SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK,
 	.quirks2 = SDHCI_QUIRK2_BROKEN_HS200 |
-		   SDHCI_QUIRK2_USE_32BIT_BLK_CNT,
+		   SDHCI_QUIRK2_USE_32BIT_BLK_CNT |
+		   SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
 	.ops = &sdhci_sprd_ops,
 };
Signature · 1 line
2.20.1
author reviewer
#4 lore raw

PATCH RESEND v2 4/5 mms: sdhci-sprd: add SDHCI_QUIRK_BROKEN_CARD_DETECTION

In reply to Chunyan Zhang

From: Chunyan Zhang <[email protected]>

sprd's sd host controller doesn't support detection to card insert or remove.

Fixes fb8bd90f83c4 ("mmc: sdhci-sprd: Add Spreadtrum's initial host controller")
Signed-off-by Chunyan Zhang <[email protected]>
Signed-off-by Chunyan Zhang <[email protected]>
Reviewed-by Baolin Wang <[email protected]>
Tested-by Baolin Wang <[email protected]>
---
 drivers/mmc/host/sdhci-sprd.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-sprd.c +2 -1
index 27d0b57f3f89..1fecf055682c 100644
@@ -508,7 +508,8 @@ static void sdhci_sprd_phy_param_parse(struct sdhci_sprd_host *sprd_host,
 }
 
 static const struct sdhci_pltfm_data sdhci_sprd_pdata = {
-	.quirks = SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK,
+	.quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION |
+		  SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK,
 	.quirks2 = SDHCI_QUIRK2_BROKEN_HS200 |
 		   SDHCI_QUIRK2_USE_32BIT_BLK_CNT |
 		   SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
Signature · 1 line
2.20.1
author reviewer
#5 lore raw

PATCH RESEND v2 5/5 mmc: sdhci-sprd: clear the UHS-I modes read from registers

In reply to Chunyan Zhang

From: Chunyan Zhang <[email protected]>

sprd's sd host controller supports SDR50/SDR104/DDR50 though, the UHS-I mode used by the specific card can be selected via devicetree only.

Fixes fb8bd90f83c4 ("mmc: sdhci-sprd: Add Spreadtrum's initial host controller")
Signed-off-by Chunyan Zhang <[email protected]>
Signed-off-by Chunyan Zhang <[email protected]>
Reviewed-by Baolin Wang <[email protected]>
Tested-by Baolin Wang <[email protected]>
---
 drivers/mmc/host/sdhci-sprd.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-sprd.c +12 -1
index 1fecf055682c..d3c3e95676f0 100644
@@ -509,7 +509,8 @@ static void sdhci_sprd_phy_param_parse(struct sdhci_sprd_host *sprd_host,
 
 static const struct sdhci_pltfm_data sdhci_sprd_pdata = {
 	.quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION |
-		  SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK,
+		  SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
+		  SDHCI_QUIRK_MISSING_CAPS,
 	.quirks2 = SDHCI_QUIRK2_BROKEN_HS200 |
 		   SDHCI_QUIRK2_USE_32BIT_BLK_CNT |
 		   SDHCI_QUIRK2_PRESET_VALUE_BROKEN,

@@ -614,6 +615,16 @@ static int sdhci_sprd_probe(struct platform_device *pdev)
 
 	sdhci_enable_v4_mode(host);
 
+	/*
+	 * Supply the existing CAPS, but clear the UHS-I modes. This
+	 * will allow these modes to be specified only by device
+	 * tree properties through mmc_of_parse().
+	 */
+	host->caps = sdhci_readl(host, SDHCI_CAPABILITIES);
+	host->caps1 = sdhci_readl(host, SDHCI_CAPABILITIES_1);
+	host->caps1 &= ~(SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_SDR104 |
+			 SDHCI_SUPPORT_DDR50);
+
 	ret = sdhci_setup_host(host);
 	if (ret)
 		goto pm_runtime_disable;
Signature · 1 line
2.20.1
#6 lore raw
In reply to Chunyan Zhang
Quoted 15 lines · Chunyan Zhang

With this patch-set, both sd card and mmc can be setup. This patch-set was verified on Unisoc's Whale2 and another mobile phone platform SC9863A.

Changes from v1:
- Added Reviewed-by and Tested-by of Baolin;
- Added fixes tag for all patches in this series.

Chunyan Zhang (5):
mmc: sdhci-sprd: fixed incorrect clock divider
mmc: sdhci-sprd: add get_ro hook function
mmc: sdhci-sprd: add SDHCI_QUIRK2_PRESET_VALUE_BROKEN
mms: sdhci-sprd: add SDHCI_QUIRK_BROKEN_CARD_DETECTION
mmc: sdhci-sprd: clear the UHS-I modes read from registers

Quoted 6 lines
 drivers/mmc/host/sdhci-sprd.c | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

--
2.20.1

Thanks, but I amended the current applied patches, assuming the only change change you did was to put the fixes tag on one single line (for each patch).

Kind regards
Uffe

author reviewer
#7 lore raw
Quoted 20 lines · Ulf Hansson
Quoted 18 lines · Chunyan Zhang

With this patch-set, both sd card and mmc can be setup. This patch-set was verified on Unisoc's Whale2 and another mobile phone platform SC9863A.

Changes from v1:
- Added Reviewed-by and Tested-by of Baolin;
- Added fixes tag for all patches in this series.

Chunyan Zhang (5):
mmc: sdhci-sprd: fixed incorrect clock divider
mmc: sdhci-sprd: add get_ro hook function
mmc: sdhci-sprd: add SDHCI_QUIRK2_PRESET_VALUE_BROKEN
mms: sdhci-sprd: add SDHCI_QUIRK_BROKEN_CARD_DETECTION
mmc: sdhci-sprd: clear the UHS-I modes read from registers

 drivers/mmc/host/sdhci-sprd.c | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)
Quoted 7 lines
Quoted 3 lines

--
2.20.1

Thanks, but I amended the current applied patches, assuming the only change change you did was to put the fixes tag on one single line (for each patch).

Yes and right, thanks!

Chunyan

Quoted 3 lines

Kind regards
Uffe