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

Commit 4509f847 authored by Ulf Hansson's avatar Ulf Hansson Committed by Chris Ball
Browse files

mmc: core: Add ignore_crc flag to __mmc_switch 



Instead of handle specific adaptations, releated to certain switch
operations, inside __mmc_switch, push this to be handled by the caller
instead.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent 1d4d7744

drivers/mmc/core/core.c

+2 −1
Original line number Diff line number Diff line
@@ -285,7 +285,8 @@ void mmc_start_bkops(struct mmc_card *card, bool from_exception) 
	}



	err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

			EXT_CSD_BKOPS_START, 1, timeout, use_busy_signal, true);

			EXT_CSD_BKOPS_START, 1, timeout,

			use_busy_signal, true, false);

	if (err) {

		pr_warn("%s: Error %d starting bkops\n",

			mmc_hostname(card->host), err);

drivers/mmc/core/mmc.c

+7 −6
Original line number Diff line number Diff line
@@ -856,8 +856,8 @@ static int mmc_select_hs200(struct mmc_card *card) 


	/* switch to HS200 mode if bus width set successfully */

	if (!err)

		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

				 EXT_CSD_HS_TIMING, 2, 0);

		err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

				EXT_CSD_HS_TIMING, 2, 0, true, true, true);

err:

	return err;

}
@@ -1074,9 +1074,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
		    host->caps2 & MMC_CAP2_HS200)

			err = mmc_select_hs200(card);

		else if	(host->caps & MMC_CAP_MMC_HIGHSPEED)

			err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

			err = __mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

					EXT_CSD_HS_TIMING, 1,

					 card->ext_csd.generic_cmd6_time);

					card->ext_csd.generic_cmd6_time,

					true, true, true);



		if (err && err != -EBADMSG)

			goto free_card;
@@ -1400,7 +1401,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, true, false);

			notify_type, timeout, true, false, false);

	if (err)

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

		       mmc_hostname(card->host), timeout);

drivers/mmc/core/mmc_ops.c

+10 −9
Original line number Diff line number Diff line
@@ -405,17 +405,18 @@ int mmc_spi_set_crc(struct mmc_host *host, int use_crc) 
 *                   timeout of zero implies maximum possible timeout

 *	@use_busy_signal: use the busy signal as response type

 *	@send_status: send status cmd to poll for busy

 *	@ignore_crc: ignore CRC errors when sending status cmd to poll for busy

 *

 *	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, bool use_busy_signal, bool send_status)

		unsigned int timeout_ms, bool use_busy_signal, bool send_status,

		bool ignore_crc)

{

	int err;

	struct mmc_command cmd = {0};

	unsigned long timeout;

	u32 status = 0;

	bool ignore_crc = false;



	BUG_ON(!card);

	BUG_ON(!card->host);
@@ -445,14 +446,13 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, 
		return 0;



	/*

	 * Must check status to be sure of no errors

	 * If CMD13 is to check the busy completion of the timing change,

	 * disable the check of CRC error.

	 * CRC errors shall only be ignored in cases were CMD13 is used to poll

	 * to detect busy completion.

	 */

	if (index == EXT_CSD_HS_TIMING &&

	    !(card->host->caps & MMC_CAP_WAIT_WHILE_BUSY))

		ignore_crc = true;

	if (card->host->caps & MMC_CAP_WAIT_WHILE_BUSY)

		ignore_crc = false;



	/* Must check status to be sure of no errors. */

	timeout = jiffies + msecs_to_jiffies(MMC_OPS_TIMEOUT_MS);

	do {

		if (send_status) {
@@ -501,7 +501,8 @@ EXPORT_SYMBOL_GPL(__mmc_switch); 
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, true, true);

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

				false);

}

EXPORT_SYMBOL_GPL(mmc_switch);

include/linux/mmc/core.h

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ extern int mmc_wait_for_app_cmd(struct mmc_host *, struct mmc_card *, 
	struct mmc_command *, int);

extern void mmc_start_bkops(struct mmc_card *card, bool from_exception);

extern int __mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int, bool,

			bool);

			bool, bool);

extern int mmc_switch(struct mmc_card *, u8, u8, u8, unsigned int);

extern int mmc_send_ext_csd(struct mmc_card *card, u8 *ext_csd);