Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26c6f614 authored by Ulf Hansson's avatar Ulf Hansson Committed by Greg Kroah-Hartman
Browse files

mmc: core: Default to generic_cmd6_time as timeout in __mmc_switch() 



commit 533a6cfe08f96a7b5c65e06d20916d552c11b256 upstream

All callers of __mmc_switch() should now be specifying a valid timeout for
the CMD6 command. However, just to be sure, let's print a warning and
default to use the generic_cmd6_time in case the provided timeout_ms
argument is zero.

In this context, let's also simplify some of the corresponding code and
clarify some related comments.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Link: https://lore.kernel.org/r/20200122142747.5690-4-ulf.hansson@linaro.org


Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b8b755f6

drivers/mmc/core/mmc_ops.c

+7 −9
Original line number Diff line number Diff line
@@ -458,10 +458,6 @@ static int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, 
	bool expired = false;

	bool busy = false;



	/* We have an unspecified cmd timeout, use the fallback value. */

	if (!timeout_ms)

		timeout_ms = MMC_OPS_TIMEOUT_MS;



	/*

	 * 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
@@ -534,6 +530,12 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, 


	mmc_retune_hold(host);



	if (!timeout_ms) {

		pr_warn("%s: unspecified timeout for CMD6 - use generic\n",

			mmc_hostname(host));

		timeout_ms = card->ext_csd.generic_cmd6_time;

	}



	/*

	 * If the cmd timeout and the max_busy_timeout of the host are both

	 * specified, let's validate them. A failure means we need to prevent
@@ -542,7 +544,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, 
	 * which also means they are on their own when it comes to deal with the

	 * busy timeout.

	 */

	if (!(host->caps & MMC_CAP_NEED_RSP_BUSY) && timeout_ms &&

	if (!(host->caps & MMC_CAP_NEED_RSP_BUSY) &&

	    host->max_busy_timeout && (timeout_ms > host->max_busy_timeout))

		use_r1b_resp = false;
@@ -554,10 +556,6 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, 
	cmd.flags = MMC_CMD_AC;

	if (use_r1b_resp) {

		cmd.flags |= MMC_RSP_SPI_R1B | MMC_RSP_R1B;

		/*

		 * A busy_timeout of zero means the host can decide to use

		 * whatever value it finds suitable.

		 */

		cmd.busy_timeout = timeout_ms;

	} else {

		cmd.flags |= MMC_RSP_SPI_R1 | MMC_RSP_R1;