diff options
| author | Adrian Hunter | 2017-09-22 14:36:53 +0200 |
|---|---|---|
| committer | Ulf Hansson | 2017-10-30 11:45:50 +0100 |
| commit | 98d4f7809d99bbf456f93816ef9895616cdd1b2d (patch) | |
| tree | 39a901d4eabd4dc18481105f300bebefb52a9bde /drivers/mmc/core | |
| parent | mmc: core: Add support for handling CQE requests (diff) | |
| download | kernel-qcow2-linux-98d4f7809d99bbf456f93816ef9895616cdd1b2d.tar.gz kernel-qcow2-linux-98d4f7809d99bbf456f93816ef9895616cdd1b2d.tar.xz kernel-qcow2-linux-98d4f7809d99bbf456f93816ef9895616cdd1b2d.zip | |
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: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/core')
| -rw-r--r-- | drivers/mmc/core/mmc.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 8d77ddc85af1..8e11526c5092 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1786,6 +1786,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 * Command Queue. |