Commit 156e14b1 authored by Giuseppe CAVALLARO's avatar Giuseppe CAVALLARO Committed by Chris Ball
Browse files

mmc: sdhci: fix caps2 for HS200 



Although the HC supports HS200 (eMMC) the caps2 are always zero; this
means there's no way to use the super speed mode (when init the card).

If the HC support SDR104, for SD3.0, so it also supports HS200 for eMMC
and this patch just sets the MMC_CAP2_HS200 in the host caps2 field.

Reported-by: default avatarYoussef Triki <youssef.triki@st.com>
Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Reviewed-by: default avatarPhilip Rakity <prakity@nvidia.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 0dcaa249

drivers/mmc/host/sdhci.c

+9 −5
Original line number Diff line number Diff line
@@ -1863,7 +1863,7 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) 
	 */

	if (((ctrl & SDHCI_CTRL_UHS_MASK) == SDHCI_CTRL_UHS_SDR50) &&

	    (host->flags & SDHCI_SDR50_NEEDS_TUNING ||

	     host->flags & SDHCI_HS200_NEEDS_TUNING))

	     host->flags & SDHCI_SDR104_NEEDS_TUNING))

		requires_tuning_nonuhs = true;



	if (((ctrl & SDHCI_CTRL_UHS_MASK) == SDHCI_CTRL_UHS_SDR104) ||
@@ -2994,9 +2994,13 @@ int sdhci_add_host(struct sdhci_host *host) 
		mmc->caps |= MMC_CAP_UHS_SDR12 | MMC_CAP_UHS_SDR25;



	/* SDR104 supports also implies SDR50 support */

	if (caps[1] & SDHCI_SUPPORT_SDR104)

	if (caps[1] & SDHCI_SUPPORT_SDR104) {

		mmc->caps |= MMC_CAP_UHS_SDR104 | MMC_CAP_UHS_SDR50;

	else if (caps[1] & SDHCI_SUPPORT_SDR50)

		/* SD3.0: SDR104 is supported so (for eMMC) the caps2

		 * field can be promoted to support HS200.

		 */

		mmc->caps2 |= MMC_CAP2_HS200;

	} else if (caps[1] & SDHCI_SUPPORT_SDR50)

		mmc->caps |= MMC_CAP_UHS_SDR50;



	if (caps[1] & SDHCI_SUPPORT_DDR50)
@@ -3006,9 +3010,9 @@ int sdhci_add_host(struct sdhci_host *host) 
	if (caps[1] & SDHCI_USE_SDR50_TUNING)

		host->flags |= SDHCI_SDR50_NEEDS_TUNING;



	/* Does the host need tuning for HS200? */

	/* Does the host need tuning for SDR104 / HS200? */

	if (mmc->caps2 & MMC_CAP2_HS200)

		host->flags |= SDHCI_HS200_NEEDS_TUNING;

		host->flags |= SDHCI_SDR104_NEEDS_TUNING;



	/* Driver Type(s) (A, C, D) supported by the host */

	if (caps[1] & SDHCI_DRIVER_TYPE_A)

include/linux/mmc/sdhci.h

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ struct sdhci_host { 
#define SDHCI_AUTO_CMD23	(1<<7)	/* Auto CMD23 support */

#define SDHCI_PV_ENABLED	(1<<8)	/* Preset value enabled */

#define SDHCI_SDIO_IRQ_ENABLED	(1<<9)	/* SDIO irq enabled */

#define SDHCI_HS200_NEEDS_TUNING (1<<10)	/* HS200 needs tuning */

#define SDHCI_SDR104_NEEDS_TUNING (1<<10)	/* SDR104/HS200 needs tuning */

#define SDHCI_USING_RETUNING_TIMER (1<<11)	/* Host is using a retuning timer for the card */



	unsigned int version;	/* SDHCI spec. version */

CRA Git | Maintained and supported by SUSTech CRA and CCSE