Commit 23e09be2 authored Apr 24, 2022 by Bean Huo Committed by Ulf Hansson Apr 26, 2022

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>

parent 897ae3fe

drivers/mmc/core/block.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -609,11 +609,11 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card card, struct mmc_blk_data md,

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

		return err;