瀏覽代碼

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>
Adrian Hunter 8 年之前
父節點
當前提交
3e207c8cfa
共有 1 個文件被更改,包括 9 次插入0 次删除
  1. 9 0
      drivers/mmc/core/core.c

+ 9 - 0
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);
 	trace_mmc_request_start(host, mrq);
 
 
+	if (host->cqe_on)
+		host->cqe_ops->cqe_off(host);
+
 	host->ops->request(host, mrq);
 	host->ops->request(host, mrq);
 }
 }
 
 
@@ -979,6 +982,9 @@ int mmc_execute_tuning(struct mmc_card *card)
 	if (!host->ops->execute_tuning)
 	if (!host->ops->execute_tuning)
 		return 0;
 		return 0;
 
 
+	if (host->cqe_on)
+		host->cqe_ops->cqe_off(host);
+
 	if (mmc_card_mmc(card))
 	if (mmc_card_mmc(card))
 		opcode = MMC_SEND_TUNING_BLOCK_HS200;
 		opcode = MMC_SEND_TUNING_BLOCK_HS200;
 	else
 	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)
 void mmc_set_initial_state(struct mmc_host *host)
 {
 {
+	if (host->cqe_on)
+		host->cqe_ops->cqe_off(host);
+
 	mmc_retune_disable(host);
 	mmc_retune_disable(host);
 
 
 	if (mmc_host_is_spi(host))
 	if (mmc_host_is_spi(host))