mmc: mmc: Enable CQE's

Enable or disable CQE when a card is added or removed respectively.

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/bus.c b/drivers/mmc/core/bus.c
index 301246513a3709dfa73b9d07d2daab900252e5ba..a4b49e25fe963b135d71c0532ce0bf5c8951a3cd 100644 (file)
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -369,10 +369,17 @@ int mmc_add_card(struct mmc_card *card)
  */
 void mmc_remove_card(struct mmc_card *card)
 {
+       struct mmc_host *host = card->host;
+
 #ifdef CONFIG_DEBUG_FS
        mmc_remove_card_debugfs(card);
 #endif
 
+       if (host->cqe_enabled) {
+               host->cqe_ops->cqe_disable(host);
+               host->cqe_enabled = false;
+       }
+
        if (mmc_card_present(card)) {
                if (mmc_host_is_spi(card->host)) {
                        pr_info("%s: SPI card removed\n",

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 8e11526c5092d1476b333b2cbd4583878a6c3ace..44d67ee8bf7bf204acb1a10787d1458a8f33ac94 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1809,6 +1809,18 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
         */
        card->reenable_cmdq = card->ext_csd.cmdq_en;
 
+       if (card->ext_csd.cmdq_en && !host->cqe_enabled) {
+               err = host->cqe_ops->cqe_enable(host, card);
+               if (err) {
+                       pr_err("%s: Failed to enable CQE, error %d\n",
+                               mmc_hostname(host), err);
+               } else {
+                       host->cqe_enabled = true;
+                       pr_info("%s: Command Queue Engine enabled\n",
+                               mmc_hostname(host));
+               }
+       }
+
        if (!oldcard)
                host->card = card;