| Message ID | 20210504161222.101536-4-ulf.hansson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Initital support for new power/perf features for SD cards | expand |
On Tue, May 4, 2021 at 6:12 PM Ulf Hansson <ulf.hansson@linaro.org> wrote: > To make the code a bit more understandable, let's move the check about > whether polling is allowed or not, out to the caller instead. In this way, > we can also drop the send_status in-parameter, so let's do that. > > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
On 2021/5/5 0:12, Ulf Hansson wrote: > To make the code a bit more understandable, let's move the check about > whether polling is allowed or not, out to the caller instead. In this way, > we can also drop the send_status in-parameter, so let's do that. Everytime I check the parameters for busy polling, I have to look very closely to make sure what the true or false stands for. So reducing the parameters here make sense. Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com> > > Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> > --- > drivers/mmc/core/mmc_ops.c | 27 +++++++++++++-------------- > 1 file changed, 13 insertions(+), 14 deletions(-) > > diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c > index 66ae699a410f..ccaee1cb7ff5 100644 > --- a/drivers/mmc/core/mmc_ops.c > +++ b/drivers/mmc/core/mmc_ops.c > @@ -465,8 +465,7 @@ static int mmc_busy_status(struct mmc_card *card, bool retry_crc_err, > } > > static int __mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, > - bool send_status, bool retry_crc_err, > - enum mmc_busy_cmd busy_cmd) > + bool retry_crc_err, enum mmc_busy_cmd busy_cmd) > { > struct mmc_host *host = card->host; > int err; > @@ -475,16 +474,6 @@ static int __mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, > bool expired = false; > bool busy = false; > > - /* > - * In cases when not allowed to poll by using CMD13 or because we aren't > - * capable of polling by using ->card_busy(), then rely on waiting the > - * stated timeout to be sufficient. > - */ > - if (!send_status && !host->ops->card_busy) { > - mmc_delay(timeout_ms); > - return 0; > - } > - > timeout = jiffies + msecs_to_jiffies(timeout_ms) + 1; > do { > /* > @@ -518,7 +507,7 @@ static int __mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, > int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, > enum mmc_busy_cmd busy_cmd) > { > - return __mmc_poll_for_busy(card, timeout_ms, true, false, busy_cmd); > + return __mmc_poll_for_busy(card, timeout_ms, false, busy_cmd); > } > > bool mmc_prepare_busy_cmd(struct mmc_host *host, struct mmc_command *cmd, > @@ -591,8 +580,18 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, > mmc_host_is_spi(host)) > goto out_tim; > > + /* > + * If the host doesn't support HW polling via the ->card_busy() ops and > + * when it's not allowed to poll by using CMD13, then we need to rely on > + * waiting the stated timeout to be sufficient. > + */ > + if (!send_status && !host->ops->card_busy) { > + mmc_delay(timeout_ms); > + goto out_tim; > + } > + > /* Let's try to poll to find out when the command is completed. */ > - err = __mmc_poll_for_busy(card, timeout_ms, send_status, retry_crc_err, > + err = __mmc_poll_for_busy(card, timeout_ms, retry_crc_err, > MMC_BUSY_CMD6); > if (err) > goto out; >
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 66ae699a410f..ccaee1cb7ff5 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -465,8 +465,7 @@ static int mmc_busy_status(struct mmc_card *card, bool retry_crc_err, } static int __mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, - bool send_status, bool retry_crc_err, - enum mmc_busy_cmd busy_cmd) + bool retry_crc_err, enum mmc_busy_cmd busy_cmd) { struct mmc_host *host = card->host; int err; @@ -475,16 +474,6 @@ static int __mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, bool expired = false; bool busy = false; - /* - * In cases when not allowed to poll by using CMD13 or because we aren't - * capable of polling by using ->card_busy(), then rely on waiting the - * stated timeout to be sufficient. - */ - if (!send_status && !host->ops->card_busy) { - mmc_delay(timeout_ms); - return 0; - } - timeout = jiffies + msecs_to_jiffies(timeout_ms) + 1; do { /* @@ -518,7 +507,7 @@ static int __mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, enum mmc_busy_cmd busy_cmd) { - return __mmc_poll_for_busy(card, timeout_ms, true, false, busy_cmd); + return __mmc_poll_for_busy(card, timeout_ms, false, busy_cmd); } bool mmc_prepare_busy_cmd(struct mmc_host *host, struct mmc_command *cmd, @@ -591,8 +580,18 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, mmc_host_is_spi(host)) goto out_tim; + /* + * If the host doesn't support HW polling via the ->card_busy() ops and + * when it's not allowed to poll by using CMD13, then we need to rely on + * waiting the stated timeout to be sufficient. + */ + if (!send_status && !host->ops->card_busy) { + mmc_delay(timeout_ms); + goto out_tim; + } + /* Let's try to poll to find out when the command is completed. */ - err = __mmc_poll_for_busy(card, timeout_ms, send_status, retry_crc_err, + err = __mmc_poll_for_busy(card, timeout_ms, retry_crc_err, MMC_BUSY_CMD6); if (err) goto out;
To make the code a bit more understandable, let's move the check about whether polling is allowed or not, out to the caller instead. In this way, we can also drop the send_status in-parameter, so let's do that. Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> --- drivers/mmc/core/mmc_ops.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) -- 2.25.1