Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c9780dc authored by Sahitya Tummala's avatar Sahitya Tummala Committed by Xiaonian Wang
Browse files

mmc: sdhci-msm: Use maximum possible data timeout value 



The MSM SDHCI controller defines the usage of 0xF in data
timeout counter register (0x2E) which is actually a reserved
bit as per specification. This would result in maximum of
5.3 secs timeout value. For some buggy SD cards, the core
layer wants to set the data timeout to 3 secs and on our MSM
SDHCI if we configure data timeout counter value to 0xE,
then we would get only 2.67 secs. Observed data timeout errors
for CMD25 on SDR104 card. Hence program data timeout counter to
0xF, to achieve at least 3 secs timeout value.

CRs-fixed: 470661
Change-Id: Ie1e192eb9c38ca3922bb1f518073a8ff0cb57f0c
Signed-off-by: default avatarSahitya Tummala <stummala@codeaurora.org>
[subhashj@codeaurora.org: fixed minor merge conflict]
Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
[xiaonian@codeaurora.org: fix trivial merge conflict]
Signed-off-by: default avatarXiaonian Wang <xiaonian@codeaurora.org>
parent 314162c4

drivers/mmc/host/sdhci-msm.c

+1 −0
Original line number Diff line number Diff line
@@ -1935,6 +1935,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
	host->quirks2 |= SDHCI_QUIRK2_ALWAYS_USE_BASE_CLOCK;

	host->quirks2 |= SDHCI_QUIRK2_IGNORE_DATATOUT_FOR_R1BCMD;

	host->quirks2 |= SDHCI_QUIRK2_BROKEN_PRESET_VALUE;

	host->quirks2 |= SDHCI_QUIRK2_USE_RESERVED_MAX_TIMEOUT;



	host_version = readl_relaxed((host->ioaddr + SDHCI_HOST_VERSION));

	dev_dbg(&pdev->dev, "Host Version: 0x%x Vendor Version 0x%x\n",

drivers/mmc/host/sdhci.c

+6 −4
Original line number Diff line number Diff line
@@ -737,11 +737,13 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd) 
			break;

	}



	if (!(host->quirks2 & SDHCI_QUIRK2_USE_RESERVED_MAX_TIMEOUT)) {

		if (count >= 0xF) {

			DBG("%s: Too large timeout 0x%x requested for CMD%d!\n",

			    mmc_hostname(host->mmc), count, cmd->opcode);

			count = 0xE;

		}

	}



	return count;

}

drivers/mmc/host/sdhci.h

+6 −0
Original line number Diff line number Diff line
@@ -454,6 +454,12 @@ struct sdhci_host { 
 * such controllers.

 */

#define SDHCI_QUIRK2_BROKEN_PRESET_VALUE		(1<<22)

/*

 * Some controllers define the usage of 0xF in data timeout counter

 * register (0x2E) which is actually a reserved bit as per

 * specification.

 */

#define SDHCI_QUIRK2_USE_RESERVED_MAX_TIMEOUT		(1<<23)



	int irq;		/* Device IRQ */

	void __iomem *ioaddr;	/* Mapped address */