Re: [PATCH V9 05/15] mmc: mmc: Enable CQE's

[Linus Walleij]

On Fri, Sep 22, 2017 at 2:36 PM, Adrian Hunter  wrote:

> Enable or disable CQE when a card is added or removed respectively.
>
> Signed-off-by: Adrian Hunter 

Reviewed-by: Linus Walleij 

Yours,
Linus Walleij

[PATCH V9 05/15] mmc: mmc: Enable CQE's

[Adrian Hunter]

Enable or disable CQE when a card is added or removed respectively.

Signed-off-by: Adrian Hunter 
---
 drivers/mmc/core/bus.c |  7 +++
 drivers/mmc/core/mmc.c | 12 
 2 files changed, 19 insertions(+)

diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index 301246513a37..a4b49e25fe96 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -369,10 +369,17 @@ int mmc_add_card(struct mmc_card *card)
  */
 void mmc_remove_card(struct mmc_card *card)
 {
+   struct mmc_host *host = card->host;
+
 #ifdef CONFIG_DEBUG_FS
mmc_remove_card_debugfs(card);
 #endif
 
+   if (host->cqe_enabled) {
+   host->cqe_ops->cqe_disable(host);
+   host->cqe_enabled = false;
+   }
+
if (mmc_card_present(card)) {
if (mmc_host_is_spi(card->host)) {
pr_info("%s: SPI card removed\n",
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 454a5079a90f..de817ac80383 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1807,6 +1807,18 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
 */
card->reenable_cmdq = card->ext_csd.cmdq_en;
 
+   if (card->ext_csd.cmdq_en && !host->cqe_enabled) {
+   err = host->cqe_ops->cqe_enable(host, card);
+   if (err) {
+   pr_err("%s: Failed to enable CQE, error %d\n",
+   mmc_hostname(host), err);
+   } else {
+   host->cqe_enabled = true;
+   pr_info("%s: Command Queue Engine enabled\n",
+   mmc_hostname(host));
+   }
+   }
+
if (!oldcard)
host->card = card;
 
-- 
1.9.1