Commit 5e52a168 authored by Bean Huo's avatar Bean Huo Committed by Ulf Hansson
Browse files

mmc: core: Add a retries parameter to __mmc_switch function 



Add command retries parameter to __mmc_switch(), let caller
pass retries according to the caller's condition.

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


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

drivers/mmc/core/mmc.c

+11 −11
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ static int mmc_select_hs(struct mmc_card *card) 
	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

			   EXT_CSD_HS_TIMING, EXT_CSD_TIMING_HS,

			   card->ext_csd.generic_cmd6_time, MMC_TIMING_MMC_HS,

			   true, true);

			   true, true, MMC_CMD_RETRIES);

	if (err)

		pr_warn("%s: switch to high-speed failed, err:%d\n",

			mmc_hostname(card->host), err);
@@ -1100,7 +1100,7 @@ static int mmc_select_hs_ddr(struct mmc_card *card) 
			   ext_csd_bits,

			   card->ext_csd.generic_cmd6_time,

			   MMC_TIMING_MMC_DDR52,

			   true, true);

			   true, true, MMC_CMD_RETRIES);

	if (err) {

		pr_err("%s: switch to bus width %d ddr failed\n",

			mmc_hostname(host), 1 << bus_width);
@@ -1168,7 +1168,7 @@ static int mmc_select_hs400(struct mmc_card *card) 
	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

			   EXT_CSD_HS_TIMING, val,

			   card->ext_csd.generic_cmd6_time, 0,

			   false, true);

			   false, true, MMC_CMD_RETRIES);

	if (err) {

		pr_err("%s: switch to high-speed from hs200 failed, err:%d\n",

			mmc_hostname(host), err);
@@ -1210,7 +1210,7 @@ static int mmc_select_hs400(struct mmc_card *card) 
	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

			   EXT_CSD_HS_TIMING, val,

			   card->ext_csd.generic_cmd6_time, 0,

			   false, true);

			   false, true, MMC_CMD_RETRIES);

	if (err) {

		pr_err("%s: switch to hs400 failed, err:%d\n",

			 mmc_hostname(host), err);
@@ -1256,7 +1256,7 @@ int mmc_hs400_to_hs200(struct mmc_card *card) 
	val = EXT_CSD_TIMING_HS;

	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING,

			   val, card->ext_csd.generic_cmd6_time, 0,

			   false, true);

			   false, true, MMC_CMD_RETRIES);

	if (err)

		goto out_err;
@@ -1272,7 +1272,7 @@ int mmc_hs400_to_hs200(struct mmc_card *card) 
	/* Switch HS DDR to HS */

	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_BUS_WIDTH,

			   EXT_CSD_BUS_WIDTH_8, card->ext_csd.generic_cmd6_time,

			   0, false, true);

			   0, false, true, MMC_CMD_RETRIES);

	if (err)

		goto out_err;
@@ -1287,7 +1287,7 @@ int mmc_hs400_to_hs200(struct mmc_card *card) 
	      card->drive_strength << EXT_CSD_DRV_STR_SHIFT;

	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_HS_TIMING,

			   val, card->ext_csd.generic_cmd6_time, 0,

			   false, true);

			   false, true, MMC_CMD_RETRIES);

	if (err)

		goto out_err;
@@ -1371,7 +1371,7 @@ static int mmc_select_hs400es(struct mmc_card *card) 
	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

			   EXT_CSD_HS_TIMING, EXT_CSD_TIMING_HS,

			   card->ext_csd.generic_cmd6_time, 0,

			   false, true);

			   false, true, MMC_CMD_RETRIES);

	if (err) {

		pr_err("%s: switch to hs for hs400es failed, err:%d\n",

			mmc_hostname(host), err);
@@ -1405,7 +1405,7 @@ static int mmc_select_hs400es(struct mmc_card *card) 
	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

			   EXT_CSD_HS_TIMING, val,

			   card->ext_csd.generic_cmd6_time, 0,

			   false, true);

			   false, true, MMC_CMD_RETRIES);

	if (err) {

		pr_err("%s: switch to hs400es failed, err:%d\n",

			mmc_hostname(host), err);
@@ -1470,7 +1470,7 @@ static int mmc_select_hs200(struct mmc_card *card) 
		err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

				   EXT_CSD_HS_TIMING, val,

				   card->ext_csd.generic_cmd6_time, 0,

				   false, true);

				   false, true, MMC_CMD_RETRIES);

		if (err)

			goto err;

		old_timing = host->ios.timing;
@@ -1975,7 +1975,7 @@ static int mmc_poweroff_notify(struct mmc_card *card, unsigned int notify_type) 


	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

			EXT_CSD_POWER_OFF_NOTIFICATION,

			notify_type, timeout, 0, false, false);

			notify_type, timeout, 0, false, false, MMC_CMD_RETRIES);

	if (err)

		pr_err("%s: Power Off Notification timed out, %u\n",

		       mmc_hostname(card->host), timeout);

drivers/mmc/core/mmc_ops.c

+4 −3
Original line number Diff line number Diff line
@@ -532,12 +532,13 @@ int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, 
 *	@timing: new timing to change to

 *	@send_status: send status cmd to poll for busy

 *	@retry_crc_err: retry when CRC errors when polling with CMD13 for busy

 *	@retries: number of retries

 *

 *	Modifies the EXT_CSD register for selected card.

 */

int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,

		unsigned int timeout_ms, unsigned char timing,

		bool send_status, bool retry_crc_err)

		bool send_status, bool retry_crc_err, unsigned int retries)

{

	struct mmc_host *host = card->host;

	int err;
@@ -577,7 +578,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, 
		cmd.flags |= MMC_RSP_SPI_R1 | MMC_RSP_R1;

	}



	err = mmc_wait_for_cmd(host, &cmd, MMC_CMD_RETRIES);

	err = mmc_wait_for_cmd(host, &cmd, retries);

	if (err)

		goto out;
@@ -612,7 +613,7 @@ int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, 
		unsigned int timeout_ms)

{

	return __mmc_switch(card, set, index, value, timeout_ms, 0,

			    true, false);

			    true, false, MMC_CMD_RETRIES);

}

EXPORT_SYMBOL_GPL(mmc_switch);

drivers/mmc/core/mmc_ops.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, 
		      enum mmc_busy_cmd busy_cmd);

int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,

		unsigned int timeout_ms, unsigned char timing,

		bool send_status, bool retry_crc_err);

		bool send_status, bool retry_crc_err, unsigned int retries);

int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,

		unsigned int timeout_ms);

void mmc_run_bkops(struct mmc_card *card);