mmc: core: Cleanup BKOPS support

It's been ~6 years ago since we introduced the BKOPS support for eMMC
cards. The current code is a bit messy and primarily that's because it
prepares to support running BKOPS in an asynchronous mode. However, that
mode has never been fully implemented/enabled. Instead BKOPS is always
executed in synchronously, when the card has reported an urgent BKOPS
level.

For these reasons, let's make the code more readable by dropping the unused
parts. Let's also rename mmc_start_bkops() to mmc_run_bkops(), as to make
it more descriptive.

Cc: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 111934838da2c14ef439a4a3b2907d46093380c9..48386473dcd7dcbf151dee6e736a5b3091f10689 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -1961,7 +1961,7 @@ static void mmc_blk_urgent_bkops(struct mmc_queue *mq,
                                 struct mmc_queue_req *mqrq)
 {
        if (mmc_blk_urgent_bkops_needed(mq, mqrq))
-               mmc_start_bkops(mq->card, true);
+               mmc_run_bkops(mq->card);
 }
 
 void mmc_blk_mq_complete(struct request *req)

diff --git a/drivers/mmc/core/card.h b/drivers/mmc/core/card.h
index 1170feb8f96982755e601af401fe31950363a918..eef3014524063e34d6ce281182eda9c56bc7c72f 100644 (file)
--- a/drivers/mmc/core/card.h
+++ b/drivers/mmc/core/card.h
@@ -23,15 +23,13 @@
 #define MMC_STATE_BLOCKADDR    (1<<2)          /* card uses block-addressing */
 #define MMC_CARD_SDXC          (1<<3)          /* card is SDXC */
 #define MMC_CARD_REMOVED       (1<<4)          /* card has been removed */
-#define MMC_STATE_DOING_BKOPS  (1<<5)          /* card is doing BKOPS */
-#define MMC_STATE_SUSPENDED    (1<<6)          /* card is suspended */
+#define MMC_STATE_SUSPENDED    (1<<5)          /* card is suspended */
 
 #define mmc_card_present(c)    ((c)->state & MMC_STATE_PRESENT)
 #define mmc_card_readonly(c)   ((c)->state & MMC_STATE_READONLY)
 #define mmc_card_blockaddr(c)  ((c)->state & MMC_STATE_BLOCKADDR)
 #define mmc_card_ext_capacity(c) ((c)->state & MMC_CARD_SDXC)
 #define mmc_card_removed(c)    ((c) && ((c)->state & MMC_CARD_REMOVED))
-#define mmc_card_doing_bkops(c)        ((c)->state & MMC_STATE_DOING_BKOPS)
 #define mmc_card_suspended(c)  ((c)->state & MMC_STATE_SUSPENDED)
 
 #define mmc_card_set_present(c)        ((c)->state |= MMC_STATE_PRESENT)
@@ -39,8 +37,6 @@
 #define mmc_card_set_blockaddr(c) ((c)->state |= MMC_STATE_BLOCKADDR)
 #define mmc_card_set_ext_capacity(c) ((c)->state |= MMC_CARD_SDXC)
 #define mmc_card_set_removed(c) ((c)->state |= MMC_CARD_REMOVED)
-#define mmc_card_set_doing_bkops(c)    ((c)->state |= MMC_STATE_DOING_BKOPS)
-#define mmc_card_clr_doing_bkops(c)    ((c)->state &= ~MMC_STATE_DOING_BKOPS)
 #define mmc_card_set_suspended(c) ((c)->state |= MMC_STATE_SUSPENDED)
 #define mmc_card_clr_suspended(c) ((c)->state &= ~MMC_STATE_SUSPENDED)
 

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 2510cebd670f5b45e933ac163475e65db6bc1b97..da892a599524b9727a3ac1d679333ac36d33c492 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -2014,12 +2014,6 @@ static int _mmc_suspend(struct mmc_host *host, bool is_suspend)
        if (mmc_card_suspended(host->card))
                goto out;
 
-       if (mmc_card_doing_bkops(host->card)) {
-               err = mmc_stop_bkops(host->card);
-               if (err)
-                       goto out;
-       }
-
        err = mmc_flush_cache(host->card);
        if (err)
                goto out;

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index ffc74d44ee6790c1d7e548164ef9ed1f039624a0..9054329fe903e83e95699d8702b91d09eaeceacf 100644 (file)
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -891,34 +891,6 @@ int mmc_can_ext_csd(struct mmc_card *card)
        return (card && card->csd.mmca_vsn > CSD_SPEC_VER_3);
 }
 
-/**
- *     mmc_stop_bkops - stop ongoing BKOPS
- *     @card: MMC card to check BKOPS
- *
- *     Send HPI command to stop ongoing background operations to
- *     allow rapid servicing of foreground operations, e.g. read/
- *     writes. Wait until the card comes out of the programming state
- *     to avoid errors in servicing read/write requests.
- */
-int mmc_stop_bkops(struct mmc_card *card)
-{
-       int err = 0;
-
-       err = mmc_interrupt_hpi(card);
-
-       /*
-        * If err is EINVAL, we can't issue an HPI.
-        * It should complete the BKOPS.
-        */
-       if (!err || (err == -EINVAL)) {
-               mmc_card_clr_doing_bkops(card);
-               mmc_retune_release(card->host);
-               err = 0;
-       }
-
-       return err;
-}
-
 static int mmc_read_bkops_status(struct mmc_card *card)
 {
        int err;
@@ -935,22 +907,17 @@ static int mmc_read_bkops_status(struct mmc_card *card)
 }
 
 /**
- *     mmc_start_bkops - start BKOPS for supported cards
- *     @card: MMC card to start BKOPS
- *     @from_exception: A flag to indicate if this function was
- *                      called due to an exception raised by the card
+ *     mmc_run_bkops - Run BKOPS for supported cards
+ *     @card: MMC card to run BKOPS for
  *
- *     Start background operations whenever requested.
- *     When the urgent BKOPS bit is set in a R1 command response
- *     then background operations should be started immediately.
+ *     Run background operations synchronously for cards having manual BKOPS
+ *     enabled and in case it reports urgent BKOPS level.
 */
-void mmc_start_bkops(struct mmc_card *card, bool from_exception)
+void mmc_run_bkops(struct mmc_card *card)
 {
        int err;
-       int timeout;
-       bool use_busy_signal;
 
-       if (!card->ext_csd.man_bkops_en || mmc_card_doing_bkops(card))
+       if (!card->ext_csd.man_bkops_en)
                return;
 
        err = mmc_read_bkops_status(card);
@@ -960,44 +927,26 @@ void mmc_start_bkops(struct mmc_card *card, bool from_exception)
                return;
        }
 
-       if (!card->ext_csd.raw_bkops_status)
+       if (!card->ext_csd.raw_bkops_status ||
+           card->ext_csd.raw_bkops_status < EXT_CSD_BKOPS_LEVEL_2)
                return;
 
-       if (card->ext_csd.raw_bkops_status < EXT_CSD_BKOPS_LEVEL_2 &&
-           from_exception)
-               return;
-
-       if (card->ext_csd.raw_bkops_status >= EXT_CSD_BKOPS_LEVEL_2) {
-               timeout = MMC_OPS_TIMEOUT_MS;
-               use_busy_signal = true;
-       } else {
-               timeout = 0;
-               use_busy_signal = false;
-       }
-
        mmc_retune_hold(card->host);
 
-       err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-                       EXT_CSD_BKOPS_START, 1, timeout, 0,
-                       use_busy_signal, true, false);
-       if (err) {
+       /*
+        * For urgent BKOPS status, LEVEL_2 and higher, let's execute
+        * synchronously. Future wise, we may consider to start BKOPS, for less
+        * urgent levels by using an asynchronous background task, when idle.
+        */
+       err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
+                       EXT_CSD_BKOPS_START, 1, MMC_OPS_TIMEOUT_MS);
+       if (err)
                pr_warn("%s: Error %d starting bkops\n",
                        mmc_hostname(card->host), err);
-               mmc_retune_release(card->host);
-               return;
-       }
 
-       /*
-        * For urgent bkops status (LEVEL_2 and more)
-        * bkops executed synchronously, otherwise
-        * the operation is in progress
-        */
-       if (!use_busy_signal)
-               mmc_card_set_doing_bkops(card);
-       else
-               mmc_retune_release(card->host);
+       mmc_retune_release(card->host);
 }
-EXPORT_SYMBOL(mmc_start_bkops);
+EXPORT_SYMBOL(mmc_run_bkops);
 
 /*
  * Flush the cache to the non-volatile storage.

diff --git a/drivers/mmc/core/mmc_ops.h b/drivers/mmc/core/mmc_ops.h
index a1390d4863815fcb4718ae974ac19490341a63e5..018a5e3f66d6f8af780c6bcfe7b9627f1b7a16df 100644 (file)
--- a/drivers/mmc/core/mmc_ops.h
+++ b/drivers/mmc/core/mmc_ops.h
@@ -40,8 +40,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
                bool use_busy_signal, bool send_status, bool retry_crc_err);
 int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
                unsigned int timeout_ms);
-int mmc_stop_bkops(struct mmc_card *card);
-void mmc_start_bkops(struct mmc_card *card, bool from_exception);
+void mmc_run_bkops(struct mmc_card *card);
 int mmc_flush_cache(struct mmc_card *card);
 int mmc_cmdq_enable(struct mmc_card *card);
 int mmc_cmdq_disable(struct mmc_card *card);