mmc: sdhci-msm: Deactivate CQE during SDHC reset (5cf583f1) · Commits · 戴 / test

When SDHC gets reset (E.g. in runtime suspend path), CQE also gets reset and goes to disable state. But s/w state still points it as CQE is in enabled state. Since s/w and h/w states goes out of sync, it results in s/w request timeout for subsequent CQE requests. To synchronize CQE s/w and h/w state during SDHC reset, explicitly deactivate CQE just before SDHC reset. Signed-off-by:

Veerabhadrarao Badiganti <vbadigan@codeaurora.org> Acked-by:

Adrian Hunter <adrian.hunter@intel.com> Link: https://lore.kernel.org/r/1583503724-13943-3-git-send-email-vbadigan@codeaurora.org Signed-off-by:

Ulf Hansson <ulf.hansson@linaro.org>

drivers/mmc/host/sdhci-msm.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -1823,6 +1823,13 @@ static void sdhci_msm_set_regulator_caps(struct sdhci_msm_host *msm_host)
		pr_debug("%s: supported caps: 0x%08x\n", mmc_hostname(mmc), caps);
		}

		static void sdhci_msm_reset(struct sdhci_host *host, u8 mask)
		{
		if ((host->mmc->caps2 & MMC_CAP2_CQE) && (mask & SDHCI_RESET_ALL))
		cqhci_deactivate(host->mmc);
		sdhci_reset(host, mask);
		}

		static const struct sdhci_msm_variant_ops mci_var_ops = {
		.msm_readl_relaxed = sdhci_msm_mci_variant_readl_relaxed,
		.msm_writel_relaxed = sdhci_msm_mci_variant_writel_relaxed,
		@@ -1861,7 +1868,7 @@ static const struct of_device_id sdhci_msm_dt_match[] = {
		MODULE_DEVICE_TABLE(of, sdhci_msm_dt_match);

		static const struct sdhci_ops sdhci_msm_ops = {
		.reset = sdhci_reset,
		.reset = sdhci_msm_reset,
		.set_clock = sdhci_msm_set_clock,
		.get_min_clock = sdhci_msm_get_min_clock,
		.get_max_clock = sdhci_msm_get_max_clock,

Admin message