Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98d4f780 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: mmc: Enable Command Queuing 



Enable the Command Queue if the host controller supports a command queue
engine. It is not compatible with Packed Commands, so make a note of that in the
comment.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 72a5af55

drivers/mmc/core/mmc.c

+17 −0
Original line number Diff line number Diff line
@@ -1785,6 +1785,23 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
		}

	}



	/*

	 * Enable Command Queue if supported. Note that Packed Commands cannot

	 * be used with Command Queue.

	 */

	card->ext_csd.cmdq_en = false;

	if (card->ext_csd.cmdq_support && host->caps2 & MMC_CAP2_CQE) {

		err = mmc_cmdq_enable(card);

		if (err && err != -EBADMSG)

			goto free_card;

		if (err) {

			pr_warn("%s: Enabling CMDQ failed\n",

				mmc_hostname(card->host));

			card->ext_csd.cmdq_support = false;

			card->ext_csd.cmdq_depth = 0;

			err = 0;

		}

	}

	/*

	 * In some cases (e.g. RPMB or mmc_test), the Command Queue must be

	 * disabled for a time, so a flag is needed to indicate to re-enable the