| From af467fad78f03a42de8b72190f6a595366b870db Mon Sep 17 00:00:00 2001 |
| From: Claudiu Beznea <claudiu.beznea@microchip.com> |
| Date: Fri, 24 Sep 2021 11:28:50 +0300 |
| Subject: mmc: sdhci-of-at91: wait for calibration done before proceed |
| |
| From: Claudiu Beznea <claudiu.beznea@microchip.com> |
| |
| commit af467fad78f03a42de8b72190f6a595366b870db upstream. |
| |
| Datasheet specifies that at the end of calibration the SDMMC_CALCR_EN |
| bit will be cleared. No commands should be send before calibration is |
| done. |
| |
| Fixes: dbdea70f71d67 ("mmc: sdhci-of-at91: fix CALCR register being rewritten") |
| Fixes: 727d836a375ad ("mmc: sdhci-of-at91: add DT property to enable calibration on full reset") |
| Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> |
| Acked-by: Adrian Hunter <adrian.hunter@intel.com> |
| Cc: stable@vger.kernel.org |
| Link: https://lore.kernel.org/r/20210924082851.2132068-2-claudiu.beznea@microchip.com |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/mmc/host/sdhci-of-at91.c | 6 ++++++ |
| 1 file changed, 6 insertions(+) |
| |
| --- a/drivers/mmc/host/sdhci-of-at91.c |
| +++ b/drivers/mmc/host/sdhci-of-at91.c |
| @@ -11,6 +11,7 @@ |
| #include <linux/delay.h> |
| #include <linux/err.h> |
| #include <linux/io.h> |
| +#include <linux/iopoll.h> |
| #include <linux/kernel.h> |
| #include <linux/mmc/host.h> |
| #include <linux/mmc/slot-gpio.h> |
| @@ -114,6 +115,7 @@ static void sdhci_at91_reset(struct sdhc |
| { |
| struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); |
| struct sdhci_at91_priv *priv = sdhci_pltfm_priv(pltfm_host); |
| + unsigned int tmp; |
| |
| sdhci_reset(host, mask); |
| |
| @@ -126,6 +128,10 @@ static void sdhci_at91_reset(struct sdhc |
| |
| sdhci_writel(host, calcr | SDMMC_CALCR_ALWYSON | SDMMC_CALCR_EN, |
| SDMMC_CALCR); |
| + |
| + if (read_poll_timeout(sdhci_readl, tmp, !(tmp & SDMMC_CALCR_EN), |
| + 10, 20000, false, host, SDMMC_CALCR)) |
| + dev_err(mmc_dev(host->mmc), "Failed to calibrate\n"); |
| } |
| } |
| |