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

Commit d968ddd8 authored by Veerabhadrarao Badiganti's avatar Veerabhadrarao Badiganti Committed by Sarthak Garg
Browse files

UPSTREAM: mmc: sdhci-msm: Deactivate CQE during SDHC reset 



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 go 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: default avatarVeerabhadrarao Badiganti <vbadigan@codeaurora.org>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/1583503724-13943-3-git-send-email-vbadigan@codeaurora.org


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Bug: 158284839
Git-repo: https://android.googlesource.com/kernel/common/


Git-commit: e33d025bf6a34e8cccde9c1e794ec7d05b9c45c6
Change-Id: I41e79bade47ed8c9d1c1804eb5e10ad5453552e3
Signed-off-by: default avatarVeerabhadrarao Badiganti <vbadigan@codeaurora.org>
Signed-off-by: default avatarSarthak Garg <sartgarg@codeaurora.org>
parent 283d847a

drivers/mmc/host/sdhci-msm.c

+8 −1
Original line number Diff line number Diff line
@@ -3012,6 +3012,13 @@ static int sdhci_msm_cqe_add_host(struct sdhci_host *host, 
	return ret;

}



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,
@@ -3050,7 +3057,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,