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

Commit 8bc0678b authored by Seungwon Jeon's avatar Seungwon Jeon Committed by Chris Ball
Browse files

mmc: core: Separate the timeout value for cache-ctrl 



Turning the cache off implies flushing cache which doesn't define
maximum timeout unlike cache-on. This patch will apply the generic
CMD6 timeout only for cache-on. Additionally the kernel message is
added for checking failure case of cache-on.

Signed-off-by: default avatarSeungwon Jeon <tgih.jun@samsung.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 984589e5

drivers/mmc/core/core.c

+12 −9
Original line number Diff line number Diff line
@@ -2321,6 +2321,7 @@ EXPORT_SYMBOL(mmc_flush_cache); 
int mmc_cache_ctrl(struct mmc_host *host, u8 enable)

{

	struct mmc_card *card = host->card;

	unsigned int timeout;

	int err = 0;



	if (!(host->caps2 & MMC_CAP2_CACHE_CTRL) ||
@@ -2331,9 +2332,10 @@ int mmc_cache_ctrl(struct mmc_host *host, u8 enable) 
			(card->ext_csd.cache_size > 0)) {

		enable = !!enable;



		if (card->ext_csd.cache_ctrl ^ enable)

		if (card->ext_csd.cache_ctrl ^ enable) {

			timeout = enable ? card->ext_csd.generic_cmd6_time : 0;

			err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

					EXT_CSD_CACHE_CTRL, enable, 0);

					EXT_CSD_CACHE_CTRL, enable, timeout);

			if (err)

				pr_err("%s: cache %s error %d\n",

						mmc_hostname(card->host),
@@ -2342,6 +2344,7 @@ int mmc_cache_ctrl(struct mmc_host *host, u8 enable) 
			else

				card->ext_csd.cache_ctrl = enable;

		}

	}



	return err;

}

drivers/mmc/core/mmc.c

+11 −2
Original line number Diff line number Diff line
@@ -1077,14 +1077,23 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
	if ((host->caps2 & MMC_CAP2_CACHE_CTRL) &&

			card->ext_csd.cache_size > 0) {

		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

				EXT_CSD_CACHE_CTRL, 1, 0);

				EXT_CSD_CACHE_CTRL, 1,

				card->ext_csd.generic_cmd6_time);

		if (err && err != -EBADMSG)

			goto free_card;



		/*

		 * Only if no error, cache is turned on successfully.

		 */

		card->ext_csd.cache_ctrl = err ? 0 : 1;

		if (err) {

			pr_warning("%s: Cache is supported, "

					"but failed to turn on (%d)\n",

					mmc_hostname(card->host), err);

			card->ext_csd.cache_ctrl = 0;

			err = 0;

		} else {

			card->ext_csd.cache_ctrl = 1;

		}

	}



	if (!oldcard)