Commit 4117e897 authored Dec 01, 2017 by Adrian Hunter Committed by Greg Kroah-Hartman Mar 19, 2018

mmc: mmc_test: Ensure command queue is disabled for testing




[ Upstream commit 23a185254ace8e63dc4ca36e0315aed9440ae749 ]

mmc_test disables the command queue because none of the tests use the
command queue. However the Reset Test will re-enable it, so disable it in
that case too.

Fixes: 9d4579a8 ("mmc: mmc_test: Disable Command Queue while mmc_test is used")
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b45ccc79

drivers/mmc/core/mmc_test.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -2328,10 +2328,17 @@ static int mmc_test_reset(struct mmc_test_card *test)
		int err;

		err = mmc_hw_reset(host);
		if (!err)
		if (!err) {
		/*
		* Reset will re-enable the card's command queue, but tests
		* expect it to be disabled.
		*/
		if (card->ext_csd.cmdq_en)
		mmc_cmdq_disable(card);
		return RESULT_OK;
		else if (err == -EOPNOTSUPP)
		} else if (err == -EOPNOTSUPP) {
		return RESULT_UNSUP_HOST;
		}

		return RESULT_FAIL;
		}