Merge remote-tracking branch 'stable/linux-4.19.y' into rpi-4.19.y

[platform/kernel/linux-rpi.git] / drivers / mmc / core / block.c

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 81ab6a3..daa2584 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -416,38 +416,6 @@ static int mmc_blk_ioctl_copy_to_user(struct mmc_ioc_cmd __user *ic_ptr,
        return 0;
 }
 
-static int ioctl_rpmb_card_status_poll(struct mmc_card *card, u32 *status,
-                                      u32 retries_max)
-{
-       int err;
-       u32 retry_count = 0;
-
-       if (!status || !retries_max)
-               return -EINVAL;
-
-       do {
-               err = __mmc_send_status(card, status, 5);
-               if (err)
-                       break;
-
-               if (!R1_STATUS(*status) &&
-                               (R1_CURRENT_STATE(*status) != R1_STATE_PRG))
-                       break; /* RPMB programming operation complete */
-
-               /*
-                * Rechedule to give the MMC device a chance to continue
-                * processing the previous command without being polled too
-                * frequently.
-                */
-               usleep_range(1000, 5000);
-       } while (++retry_count < retries_max);
-
-       if (retry_count == retries_max)
-               err = -EPERM;
-
-       return err;
-}
-
 static int ioctl_do_sanitize(struct mmc_card *card)
 {
        int err;
@@ -476,6 +444,58 @@ out:
        return err;
 }
 
+static inline bool mmc_blk_in_tran_state(u32 status)
+{
+       /*
+        * Some cards mishandle the status bits, so make sure to check both the
+        * busy indication and the card state.
+        */
+       return status & R1_READY_FOR_DATA &&
+              (R1_CURRENT_STATE(status) == R1_STATE_TRAN);
+}
+
+static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms,
+                           u32 *resp_errs)
+{
+       unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms);
+       int err = 0;
+       u32 status;
+
+       do {
+               bool done = time_after(jiffies, timeout);
+
+               err = __mmc_send_status(card, &status, 5);
+               if (err) {
+                       dev_err(mmc_dev(card->host),
+                               "error %d requesting status\n", err);
+                       return err;
+               }
+
+               /* Accumulate any response error bits seen */
+               if (resp_errs)
+                       *resp_errs |= status;
+
+               /*
+                * Timeout if the device never becomes ready for data and never
+                * leaves the program state.
+                */
+               if (done) {
+                       dev_err(mmc_dev(card->host),
+                               "Card stuck in wrong state! %s status: %#x\n",
+                                __func__, status);
+                       return -ETIMEDOUT;
+               }
+
+               /*
+                * Some cards mishandle the status bits,
+                * so make sure to check both the busy
+                * indication and the card state.
+                */
+       } while (!mmc_blk_in_tran_state(status));
+
+       return err;
+}
+
 static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
                               struct mmc_blk_ioc_data *idata)
 {
@@ -485,7 +505,6 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
        struct scatterlist sg;
        int err;
        unsigned int target_part;
-       u32 status = 0;
 
        if (!card || !md || !idata)
                return -EINVAL;
@@ -619,16 +638,12 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
 
        memcpy(&(idata->ic.response), cmd.resp, sizeof(cmd.resp));
 
-       if (idata->rpmb) {
+       if (idata->rpmb || (cmd.flags & MMC_RSP_R1B)) {
                /*
-                * Ensure RPMB command has completed by polling CMD13
+                * Ensure RPMB/R1B command has completed by polling CMD13
                 * "Send Status".
                 */
-               err = ioctl_rpmb_card_status_poll(card, &status, 5);
-               if (err)
-                       dev_err(mmc_dev(card->host),
-                                       "%s: Card Status=0x%08X, error %d\n",
-                                       __func__, status, err);
+               err = card_busy_detect(card, MMC_BLK_TIMEOUT_MS, NULL);
        }
 
        return err;
@@ -978,58 +993,6 @@ static unsigned int mmc_blk_data_timeout_ms(struct mmc_host *host,
        return ms;
 }
 
-static inline bool mmc_blk_in_tran_state(u32 status)
-{
-       /*
-        * Some cards mishandle the status bits, so make sure to check both the
-        * busy indication and the card state.
-        */
-       return status & R1_READY_FOR_DATA &&
-              (R1_CURRENT_STATE(status) == R1_STATE_TRAN);
-}
-
-static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms,
-                           struct request *req, u32 *resp_errs)
-{
-       unsigned long timeout = jiffies + msecs_to_jiffies(timeout_ms);
-       int err = 0;
-       u32 status;
-
-       do {
-               bool done = time_after(jiffies, timeout);
-
-               err = __mmc_send_status(card, &status, 5);
-               if (err) {
-                       pr_err("%s: error %d requesting status\n",
-                              req->rq_disk->disk_name, err);
-                       return err;
-               }
-
-               /* Accumulate any response error bits seen */
-               if (resp_errs)
-                       *resp_errs |= status;
-
-               /*
-                * Timeout if the device never becomes ready for data and never
-                * leaves the program state.
-                */
-               if (done) {
-                       pr_err("%s: Card stuck in wrong state! %s %s status: %#x\n",
-                               mmc_hostname(card->host),
-                               req->rq_disk->disk_name, __func__, status);
-                       return -ETIMEDOUT;
-               }
-
-               /*
-                * Some cards mishandle the status bits,
-                * so make sure to check both the busy
-                * indication and the card state.
-                */
-       } while (!mmc_blk_in_tran_state(status));
-
-       return err;
-}
-
 static int mmc_blk_reset(struct mmc_blk_data *md, struct mmc_host *host,
                         int type)
 {
@@ -1685,7 +1648,7 @@ static int mmc_blk_fix_state(struct mmc_card *card, struct request *req)
 
        mmc_blk_send_stop(card, timeout);
 
-       err = card_busy_detect(card, timeout, req, NULL);
+       err = card_busy_detect(card, timeout, NULL);
 
        mmc_retune_release(card->host);
 
@@ -1909,7 +1872,7 @@ static int mmc_blk_card_busy(struct mmc_card *card, struct request *req)
        if (mmc_host_is_spi(card->host) || rq_data_dir(req) == READ)
                return 0;
 
-       err = card_busy_detect(card, MMC_BLK_TIMEOUT_MS, req, &status);
+       err = card_busy_detect(card, MMC_BLK_TIMEOUT_MS, &status);
 
        /*
         * Do not assume data transferred correctly if there are any error bits