diff options
| author | Sahitya Tummala <stummala@codeaurora.org> | 2013-02-25 15:50:08 +0530 |
|---|---|---|
| committer | Subhash Jadavani <subhashj@codeaurora.org> | 2016-05-27 10:28:25 -0700 |
| commit | ce8e870d5d09c7058f3f564e6d75fa5005836d83 (patch) | |
| tree | 74e69e008fd6afd4965992d800dae5bf5e6c71ee /drivers/mmc | |
| parent | 226107c254a8ddd29097a78d99c4ab8432a5f40f (diff) | |
mmc: sdhci: Add a quirk to ignore CMD CRC err for tuning commands
MSM SDHCI controller doesn't support tuning as specified by the
Standard Host Controller 3.0 spec. As a result of which,
CMD CRC errors are expected for tuning commands. Hence, add a
new quirk SDHCI_QUIRK2_IGNORE_CMDCRC_FOR_TUNING to ignore
those errors for tuning commands.
Change-Id: Id43d300bf8fabea921c80931fbf45cd3782ff3fa
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
[subhashj@codeaurora.org: fix trivial merge conflict]
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-msm.c | 1 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 20 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci.h | 3 |
3 files changed, 24 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index e9d811043f0b..71589f3c7554 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -1146,6 +1146,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) */ host->quirks |= SDHCI_QUIRK_BROKEN_CARD_DETECTION; host->quirks |= SDHCI_QUIRK_SINGLE_POWER_WRITE; + host->quirks2 |= SDHCI_QUIRK2_IGNORE_CMDCRC_FOR_TUNING; host_version = readl_relaxed((host->ioaddr + SDHCI_HOST_VERSION)); dev_dbg(&pdev->dev, "Host Version: 0x%x Vendor Version 0x%x\n", diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 9a0a9069a15b..0237da8bf1f9 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2347,6 +2347,16 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask, u32 *mask) SDHCI_INT_INDEX)) host->cmd->error = -EILSEQ; + if (host->quirks2 & SDHCI_QUIRK2_IGNORE_CMDCRC_FOR_TUNING) { + if ((host->cmd->opcode == MMC_SEND_TUNING_BLOCK_HS200) || + (host->cmd->opcode == MMC_SEND_TUNING_BLOCK)) { + if (intmask & SDHCI_INT_CRC) { + sdhci_reset(host, SDHCI_RESET_CMD); + host->cmd->error = 0; + } + } + } + if (host->cmd->error) { tasklet_schedule(&host->finish_tasklet); return; @@ -2381,6 +2391,16 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask, u32 *mask) *mask &= ~SDHCI_INT_DATA_END; } + if (host->quirks2 & SDHCI_QUIRK2_IGNORE_CMDCRC_FOR_TUNING) { + if ((host->cmd->opcode == MMC_SEND_TUNING_BLOCK_HS200) || + (host->cmd->opcode == MMC_SEND_TUNING_BLOCK)) { + if (intmask & SDHCI_INT_CRC) { + sdhci_finish_command(host); + return; + } + } + } + if (intmask & SDHCI_INT_RESPONSE) sdhci_finish_command(host); } diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index d348e1d917cb..9287f1099cf4 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -430,6 +430,9 @@ struct sdhci_host { */ #define SDHCI_QUIRK2_SLOW_INT_CLR (1<<18) +/* Ignore CMD CRC errors for tuning commands */ +#define SDHCI_QUIRK2_IGNORE_CMDCRC_FOR_TUNING (1<<6) + int irq; /* Device IRQ */ void __iomem *ioaddr; /* Mapped address */ |