[V3,1/2] mmc: cqhci: Add cqhci_deactivate()
diff mbox series

Message ID 1583503724-13943-2-git-send-email-vbadigan@codeaurora.org
State Accepted
Commit 0ffa6cfbd94982e6c028a8924b06a96c1b91bed8
Headers show
  • Deactivate CQE during SDHC reset
Related show

Commit Message

Veerabhadrarao Badiganti March 6, 2020, 2:08 p.m. UTC
From: Adrian Hunter <adrian.hunter@intel.com>

Host controllers can reset CQHCI either directly or as a consequence of
host controller reset. Add cqhci_deactivate() which puts the CQHCI
driver into a state that is consistent with that.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org>
 drivers/mmc/host/cqhci.c | 6 +++---
 drivers/mmc/host/cqhci.h | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff mbox series

diff --git a/drivers/mmc/host/cqhci.c b/drivers/mmc/host/cqhci.c
index e24b8ff..c2239ee 100644
--- a/drivers/mmc/host/cqhci.c
+++ b/drivers/mmc/host/cqhci.c
@@ -298,16 +298,16 @@  static void __cqhci_disable(struct cqhci_host *cq_host)
 	cq_host->activated = false;
-int cqhci_suspend(struct mmc_host *mmc)
+int cqhci_deactivate(struct mmc_host *mmc)
 	struct cqhci_host *cq_host = mmc->cqe_private;
-	if (cq_host->enabled)
+	if (cq_host->enabled && cq_host->activated)
 	return 0;
 int cqhci_resume(struct mmc_host *mmc)
diff --git a/drivers/mmc/host/cqhci.h b/drivers/mmc/host/cqhci.h
index def76e9..4377001 100644
--- a/drivers/mmc/host/cqhci.h
+++ b/drivers/mmc/host/cqhci.h
@@ -230,7 +230,11 @@  irqreturn_t cqhci_irq(struct mmc_host *mmc, u32 intmask, int cmd_error,
 		      int data_error);
 int cqhci_init(struct cqhci_host *cq_host, struct mmc_host *mmc, bool dma64);
 struct cqhci_host *cqhci_pltfm_init(struct platform_device *pdev);
-int cqhci_suspend(struct mmc_host *mmc);
+int cqhci_deactivate(struct mmc_host *mmc);
+static inline int cqhci_suspend(struct mmc_host *mmc)
+	return cqhci_deactivate(mmc);
 int cqhci_resume(struct mmc_host *mmc);