diff options
| author | Dov Levenglick <dovl@codeaurora.org> | 2015-06-30 14:19:16 +0300 |
|---|---|---|
| committer | Subhash Jadavani <subhashj@codeaurora.org> | 2016-05-31 15:26:53 -0700 |
| commit | ed5008d44facbf349b56772e948affa8698ae901 (patch) | |
| tree | 8e5b1c6bd5d9e2991e80e1634c2fd31c17372ac6 | |
| parent | 7f7fbf659c4fbd5a364d0e58efc1d1dcf88e2ac5 (diff) | |
mmc: core: fix bkops init for cmdq
It is needed to initialize auto bkops before enabling
command queueing since the initialization uses CMD6 which
may not be called when cmdq is enabled.
Change-Id: Idecff761754fe394c01425e7fd4dd5f6a083135d
Signed-off-by: Dov Levenglick <dovl@codeaurora.org>
[subhashj@codeaurora.org: fixed trivial merge conflicts]
Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org>
| -rw-r--r-- | drivers/mmc/core/mmc.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 3f68765323ea..9a4b1a859cfa 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -2126,18 +2126,6 @@ reinit: } } - if (card->ext_csd.cmdq_support && (card->host->caps2 & - MMC_CAP2_CMD_QUEUE)) { - err = mmc_select_cmdq(card); - if (err) { - pr_err("%s: selecting CMDQ mode: failed: %d\n", - mmc_hostname(card->host), err); - card->ext_csd.cmdq_support = 0; - oldcard = card; - goto reinit; - } - } - /* * Start auto bkops, if supported. * @@ -2155,6 +2143,18 @@ reinit: (void)mmc_set_auto_bkops(card, true); } + if (card->ext_csd.cmdq_support && (card->host->caps2 & + MMC_CAP2_CMD_QUEUE)) { + err = mmc_select_cmdq(card); + if (err) { + pr_err("%s: selecting CMDQ mode: failed: %d\n", + mmc_hostname(card->host), err); + card->ext_csd.cmdq_support = 0; + oldcard = card; + goto reinit; + } + } + return 0; free_card: |