| Message ID | 20190905075318.15554-3-chaotian.jing@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2,1/2] mmc: block: make the card_busy_detect() more generic | expand |
> > > currently there is no CMD13 polling and other code to wait card > change to transfer state after R1B command completed. and this > polling operation cannot do in user space, because other request > may coming before the CMD13 from user space. > > Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> Reviewed-by: Avri Altman <avri.altman@wdc.com>
On Thu, 5 Sep 2019 at 09:53, Chaotian Jing <chaotian.jing@mediatek.com> wrote: > > currently there is no CMD13 polling and other code to wait card > change to transfer state after R1B command completed. and this > polling operation cannot do in user space, because other request > may coming before the CMD13 from user space. > > Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> Both patch 1 and patch2, looks like material for stable, so unless someone objects I am adding a tag for that. Moreover, I updated the changelogs, also according to suggestions from Avri and then applied both patches for next, thanks! Kind regards Uffe > --- > drivers/mmc/core/block.c | 146 +++++++++++++++------------------------ > 1 file changed, 55 insertions(+), 91 deletions(-) > > diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c > index aa7c19f7e298..ee1fd7df4ec8 100644 > --- a/drivers/mmc/core/block.c > +++ b/drivers/mmc/core/block.c > @@ -408,38 +408,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; > @@ -468,6 +436,58 @@ static int ioctl_do_sanitize(struct mmc_card *card) > 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) > { > @@ -611,16 +631,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; > @@ -970,58 +986,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, > - 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_reset(struct mmc_blk_data *md, struct mmc_host *host, > int type) > { > -- > 2.18.0 >
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index aa7c19f7e298..ee1fd7df4ec8 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -408,38 +408,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; @@ -468,6 +436,58 @@ static int ioctl_do_sanitize(struct mmc_card *card) 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) { @@ -611,16 +631,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; @@ -970,58 +986,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, - 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_reset(struct mmc_blk_data *md, struct mmc_host *host, int type) {
currently there is no CMD13 polling and other code to wait card change to transfer state after R1B command completed. and this polling operation cannot do in user space, because other request may coming before the CMD13 from user space. Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com> --- drivers/mmc/core/block.c | 146 +++++++++++++++------------------------ 1 file changed, 55 insertions(+), 91 deletions(-)