mmc: core: Turn off CQE before sending commands

CQE needs to be off for the host controller to accept non-CQ commands. Turn
off the CQE before sending commands, and ensure it is off in any reset or
power management paths, or re-tuning.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 5dd1c00d95f5ed94b33e3915029e9bfe8a6277a0..66c9cf49ad2f11fe59de05eae716b6b797766cc4 100644 (file)
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -260,6 +260,9 @@ static void __mmc_start_request(struct mmc_host *host, struct mmc_request *mrq)
 
        trace_mmc_request_start(host, mrq);
 
+       if (host->cqe_on)
+               host->cqe_ops->cqe_off(host);
+
        host->ops->request(host, mrq);
 }
 
@@ -979,6 +982,9 @@ int mmc_execute_tuning(struct mmc_card *card)
        if (!host->ops->execute_tuning)
                return 0;
 
+       if (host->cqe_on)
+               host->cqe_ops->cqe_off(host);
+
        if (mmc_card_mmc(card))
                opcode = MMC_SEND_TUNING_BLOCK_HS200;
        else
@@ -1018,6 +1024,9 @@ void mmc_set_bus_width(struct mmc_host *host, unsigned int width)
  */
 void mmc_set_initial_state(struct mmc_host *host)
 {
+       if (host->cqe_on)
+               host->cqe_ops->cqe_off(host);
+
        mmc_retune_disable(host);
 
        if (mmc_host_is_spi(host))