Commit 4f111d04 authored by Bean Huo's avatar Bean Huo Committed by Ulf Hansson
Browse files

mmc: core: Use userland specified timeout value for eMMC sanitize 



As the density increases, the 4-minute timeout value for sanitize is no
longer feasible. At the same time, devices of different densities have
different timeout values, which makes it difficult to use a common timeout
value. Therefore, let's pass down the userland-specified sanitize timeout
value so it can be used.

Signed-off-by: default avatarBean Huo <beanhuo@micron.com>
Link: https://lore.kernel.org/r/20210402092432.25069-2-huobean@gmail.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 2970134b

drivers/mmc/core/block.c

+1 −1
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md, 


	if ((MMC_EXTRACT_INDEX_FROM_ARG(cmd.arg) == EXT_CSD_SANITIZE_START) &&

	    (cmd.opcode == MMC_SWITCH))

		return mmc_sanitize(card);

		return mmc_sanitize(card, idata->ic.cmd_timeout_ms);



	mmc_wait_for_req(card->host, &mrq);

drivers/mmc/core/mmc_ops.c

+5 −2
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ int mmc_cmdq_disable(struct mmc_card *card) 
}

EXPORT_SYMBOL_GPL(mmc_cmdq_disable);



int mmc_sanitize(struct mmc_card *card)

int mmc_sanitize(struct mmc_card *card, unsigned int timeout_ms)

{

	struct mmc_host *host = card->host;

	int err;
@@ -1020,12 +1020,15 @@ int mmc_sanitize(struct mmc_card *card) 
		return -EOPNOTSUPP;

	}



	if (!timeout_ms)

		timeout_ms = MMC_SANITIZE_TIMEOUT_MS;



	pr_debug("%s: Sanitize in progress...\n", mmc_hostname(host));



	mmc_retune_hold(host);



	err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_SANITIZE_START,

			 1, MMC_SANITIZE_TIMEOUT_MS);

			 1, timeout_ms);

	if (err)

		pr_err("%s: Sanitize failed err=%d\n", mmc_hostname(host), err);

drivers/mmc/core/mmc_ops.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ void mmc_run_bkops(struct mmc_card *card); 
int mmc_flush_cache(struct mmc_card *card);

int mmc_cmdq_enable(struct mmc_card *card);

int mmc_cmdq_disable(struct mmc_card *card);

int mmc_sanitize(struct mmc_card *card);

int mmc_sanitize(struct mmc_card *card, unsigned int timeout_ms);



#endif