Skip to contentSkip to conversation

FAILED: patch "[PATCH] mmc: sdhci-sprd: clear the UHS-I modes read from registers" failed to apply to 5.2-stable tree

PATCH [email protected] 2 participants 2 messages Sep 3, 2019

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

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.2-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 2f765c175e1d1acae911f889e71e5933c6488929 Mon Sep 17 00:00:00 2001
From: Chunyan Zhang <[email protected]>
Date: Wed, 28 Aug 2019 10:17:36 +0800
Subject: [PATCH] mmc: sdhci-sprd: clear the UHS-I modes read from registers

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]>
Cc [email protected]
Signed-off-by Ulf Hansson <[email protected]>
drivers/mmc/host/sdhci-sprd.c +12 -1
index ba777f0c77d1..d07b9793380f 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;
maintainer
#1 lore raw
Quoted 5 lines · On Tue, Sep 03, 2019 at 08:53:43PM +0200, [email protected] wrote:

The patch below does not apply to the 5.2-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

I've fixed it up and queued it up for 5.2, it's not needed on older kernels. No real conflicts, the code just moved around a bit in drivers/mmc/host/sdhci-sprd.c .

--
Thanks,
Sasha