This patch remove the MMC_CAP2_HS200_1_8V_SDR capacity from host->cap2 when the dt property mmc-hs400-1v8 set. It cause error and occasionally hang on boot and reboot. Board with this issue: rk3399 with SanDisk DG4008 eMMC. This patch did not change the mmc-hs400-1_2v host->cap2 added the MMC_CAP2_HS200_1_2V_SDR. Log shows a boot process with a HS400 5.1 capable SanDisk 8G with mmc-hs400-1_8v dt property and the MMC_CAP2_HS200_1_8V_SDR append to the host->cap2. [ 1.775721] mmc1: CQHCI version 5.10 [ 1.802342] mmc1: SDHCI controller on fe330000.sdhci [fe330000.sdhci] using ADMA [ 2.007581] mmc1: mmc_select_hs200 failed, error -110 [ 2.007589] mmc1: error -110 whilst initialising MMC card [ 2.413559] mmc1: mmc_select_hs200 failed, error -110 [ 2.413562] mmc1: error -110 whilst initialising MMC card [ 3.183343] mmc1: Command Queue Engine enabled [ 3.183355] mmc1: new HS400 MMC card at address 0001 [ 3.197163] mmcblk1: mmc1:0001 DG4008 7.28 GiB [ 3.197256] mmcblk1boot0: mmc1:0001 DG4008 partition 1 4.00 MiB [ 3.197360] mmcblk1boot1: mmc1:0001 DG4008 partition 2 4.00 MiB [ 3.197479] mmcblk1rpmb: mmc1:0001 DG4008 partition 3 4.00 MiB, chardev (242:0) after patch applied [ 1.746691] mmc1: CQHCI version 5.10 [ 1.773316] mmc1: SDHCI controller on fe330000.sdhci [fe330000.sdhci] using ADMA [ 1.858410] mmc1: Command Queue Engine enabled [ 1.858418] mmc1: new HS400 MMC card at address 0001 [ 1.858897] mmcblk1: mmc1:0001 DG4008 7.28 GiB [ 1.859002] mmcblk1boot0: mmc1:0001 DG4008 partition 1 4.00 MiB [ 1.859097] mmcblk1boot1: mmc1:0001 DG4008 partition 2 4.00 MiB [ 1.859182] mmcblk1rpmb: mmc1:0001 DG4008 partition 3 4.00 MiB, chardev (242:0) Fixes: c373eb489b27b mmc: core: add DT bindings for eMMC HS400 1.8/1.2V Signed-off-by: Chris Ruehl <chris.ruehl@xxxxxxxxxxxx> --- drivers/mmc/core/host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 96b2ca1f1b06..f55113e24c68 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -295,7 +295,7 @@ int mmc_of_parse(struct mmc_host *host) if (device_property_read_bool(dev, "mmc-hs200-1_2v")) host->caps2 |= MMC_CAP2_HS200_1_2V_SDR; if (device_property_read_bool(dev, "mmc-hs400-1_8v")) - host->caps2 |= MMC_CAP2_HS400_1_8V | MMC_CAP2_HS200_1_8V_SDR; + host->caps2 |= MMC_CAP2_HS400_1_8V; if (device_property_read_bool(dev, "mmc-hs400-1_2v")) host->caps2 |= MMC_CAP2_HS400_1_2V | MMC_CAP2_HS200_1_2V_SDR; if (device_property_read_bool(dev, "mmc-hs400-enhanced-strobe")) -- 2.20.1
