Skip to content

Commit 23e09be

Browse files
beanhuoUlf Hansson
authored andcommitted
mmc: core: Allows to override the timeout value for ioctl() path
Occasionally, user-land applications initiate longer timeout values for certain commands through ioctl() system call. But so far we are still using a fixed timeout of 10 seconds in mmc_poll_for_busy() on the ioctl() path, even if a custom timeout is specified in the userspace application. This patch allows custom timeout values to override this default timeout values on the ioctl path. Cc: stable <stable@vger.kernel.org> Signed-off-by: Bean Huo <beanhuo@micron.com> Acked-by: Avri Altman <avri.altman@wdc.com> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Link: https://lore.kernel.org/r/20220423221623.1074556-3-huobean@gmail.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 897ae3f commit 23e09be

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/mmc/core/block.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -609,11 +609,11 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
609609

610610
if (idata->rpmb || (cmd.flags & MMC_RSP_R1B) == MMC_RSP_R1B) {
611611
/*
612-
* Ensure RPMB/R1B command has completed by polling CMD13
613-
* "Send Status".
612+
* Ensure RPMB/R1B command has completed by polling CMD13 "Send Status". Here we
613+
* allow to override the default timeout value if a custom timeout is specified.
614614
*/
615-
err = mmc_poll_for_busy(card, MMC_BLK_TIMEOUT_MS, false,
616-
MMC_BUSY_IO);
615+
err = mmc_poll_for_busy(card, idata->ic.cmd_timeout_ms ? : MMC_BLK_TIMEOUT_MS,
616+
false, MMC_BUSY_IO);
617617
}
618618

619619
return err;

0 commit comments

Comments
 (0)