mmc: mmc_test: Disable Command Queue while mmc_test is used

Normal read and write commands may not be used while the command queue is
enabled. Disable the Command Queue when mmc_test is probed and re-enable it
when it is removed.

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

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c
index f99ac3123fd2..fd1b4b8510b9 100644
--- a/drivers/mmc/core/mmc_test.c
+++ b/drivers/mmc/core/mmc_test.c
@@ -26,6 +26,7 @@
 #include "card.h"
 #include "host.h"
 #include "bus.h"
+#include "mmc_ops.h"
 
 #define RESULT_OK               0
 #define RESULT_FAIL             1
@@ -3264,6 +3265,14 @@ static int mmc_test_probe(struct mmc_card *card)
         if (ret)
                 return ret;
 
+        if (card->ext_csd.cmdq_en) {
+                mmc_claim_host(card->host);
+                ret = mmc_cmdq_disable(card);
+                mmc_release_host(card->host);
+                if (ret)
+                        return ret;
+        }
+
         dev_info(&card->dev, "Card claimed for testing.\n");
 
         return 0;
@@ -3271,6 +3280,11 @@ static int mmc_test_probe(struct mmc_card *card)
 
 static void mmc_test_remove(struct mmc_card *card)
 {
+        if (card->reenable_cmdq) {
+                mmc_claim_host(card->host);
+                mmc_cmdq_enable(card);
+                mmc_release_host(card->host);
+        }
         mmc_test_free_result(card);
         mmc_test_free_dbgfs_file(card);
 }