On Sun, 24 Apr 2022 at 00:16, Bean Huo huobean@gmail.com wrote:
From: Bean Huo beanhuo@micron.com
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
Applied for next, thanks!
Linus, I interpreted your earlier reply as a reviewed-by tag, so I have added that. Please tell me, if you want me to drop it.
Kind regards Uffe
drivers/mmc/core/block.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index b35e7a95798b..6cb701aa1abc 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -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;-- 2.34.1