p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mmc: sdhci-omap: Fix DCRC error handling during tuning 

Commit 7d33c35815 ("mmc: sdhci-omap: Workaround for Errata i802")
disabled DCRC interrupts during tuning. This write to the interrupt
enable register gets overwritten in sdhci_prepare_data() and the
interrupt is not in fact disabled. Fix this by disabling the interrupt
in the host->ier variable.

Fixes: 7d33c35815 ("mmc: sdhci-omap: Workaround for Errata i802")
Cc: <stable@vger.kernel.org>
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Faiz Abbas 2018-11-21 16:03:55 +05:30 committed by Ulf Hansson
parent e8cde625bf
commit db2039fcfd
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/mmc/host/sdhci-omap.c
View File

@ -288,9 +288,9 @@ static int sdhci_omap_execute_tuning(struct mmc_host *mmc, u32 opcode)
struct device *dev = omap_host->dev; struct device *dev = omap_host->dev;
struct mmc_ios *ios = &mmc->ios; struct mmc_ios *ios = &mmc->ios;
u32 start_window = 0, max_window = 0; u32 start_window = 0, max_window = 0;
bool dcrc_was_enabled = false;
u8 cur_match, prev_match = 0; u8 cur_match, prev_match = 0;
u32 length = 0, max_len = 0; u32 length = 0, max_len = 0;
u32 ier = host->ier;
u32 phase_delay = 0; u32 phase_delay = 0;
int ret = 0; int ret = 0;
u32 reg; u32 reg;
@ -317,9 +317,10 @@ static int sdhci_omap_execute_tuning(struct mmc_host *mmc, u32 opcode)
* during the tuning procedure. So disable it during the * during the tuning procedure. So disable it during the
* tuning procedure. * tuning procedure.
*/ */
ier &= ~SDHCI_INT_DATA_CRC; if (host->ier & SDHCI_INT_DATA_CRC) {
sdhci_writel(host, ier, SDHCI_INT_ENABLE); host->ier &= ~SDHCI_INT_DATA_CRC;
sdhci_writel(host, ier, SDHCI_SIGNAL_ENABLE); dcrc_was_enabled = true;
}
while (phase_delay <= MAX_PHASE_DELAY) { while (phase_delay <= MAX_PHASE_DELAY) {
sdhci_omap_set_dll(omap_host, phase_delay); sdhci_omap_set_dll(omap_host, phase_delay);
@ -366,6 +367,9 @@ static int sdhci_omap_execute_tuning(struct mmc_host *mmc, u32 opcode)
ret: ret:
sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA); sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA);
/* Reenable forbidden interrupt */
if (dcrc_was_enabled)
host->ier |= SDHCI_INT_DATA_CRC;
sdhci_writel(host, host->ier, SDHCI_INT_ENABLE); sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE); sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
return ret; return ret;