Commit 08b137d9 authored by Chaotian Jing's avatar Chaotian Jing Committed by Ulf Hansson
Browse files

mmc: core: Fix init_card in 52Mhz 



Suppose that we got a data crc error, and it triggers the mmc_reset.
mmc_reset will call mmc_send_status to see if HW reset was supported.
before issue CMD13, it will do retune, and if EMMC was in HS400 mode,
it will reduce frequency to 52Mhz firstly, then results in card init
was doing at 52Mhz.
The mmc_send_status was originally only done for mmc_test, should drop
it. And, rename the "eMMC hardware reset" to "Reset test", as we would
also be able to use the test for SD-cards.

Signed-off-by: default avatarChaotian Jing <chaotian.jing@mediatek.com>
Suggested-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Fixes: bd11e8bd ("mmc: core: Flag re-tuning is needed on CRC errors")
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 25cb62b7

drivers/mmc/card/mmc_test.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -2263,15 +2263,12 @@ static int mmc_test_profile_sglen_r_nonblock_perf(struct mmc_test_card *test) 
/*

/*

 * eMMC hardware reset.

 * eMMC hardware reset.

 */

 */

static int mmc_test_hw_reset(struct mmc_test_card *test)

static int mmc_test_reset(struct mmc_test_card *test)

{

{

	struct mmc_card *card = test->card;

	struct mmc_card *card = test->card;

	struct mmc_host *host = card->host;

	struct mmc_host *host = card->host;

	int err;

	int err;





	if (!mmc_card_mmc(card) || !mmc_can_reset(card))

		return RESULT_UNSUP_CARD;



	err = mmc_hw_reset(host);

	err = mmc_hw_reset(host);

	if (!err)

	if (!err)

		return RESULT_OK;

		return RESULT_OK;
@@ -2605,8 +2602,8 @@ static const struct mmc_test_case mmc_test_cases[] = { 
	},

	},





	{

	{

		.name = "eMMC hardware reset",

		.name = "Reset test",

		.run = mmc_test_hw_reset,

		.run = mmc_test_reset,

	},

	},

};

};

drivers/mmc/core/mmc.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -1924,7 +1924,6 @@ EXPORT_SYMBOL(mmc_can_reset); 
static int mmc_reset(struct mmc_host *host)

static int mmc_reset(struct mmc_host *host)

{

{

	struct mmc_card *card = host->card;

	struct mmc_card *card = host->card;

	u32 status;





	if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset)

	if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset)

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;
@@ -1937,12 +1936,6 @@ static int mmc_reset(struct mmc_host *host) 




	host->ops->hw_reset(host);

	host->ops->hw_reset(host);





	/* If the reset has happened, then a status command will fail */

	if (!mmc_send_status(card, &status)) {

		mmc_host_clk_release(host);

		return -ENOSYS;

	}



	/* Set initial state and call mmc_set_ios */

	/* Set initial state and call mmc_set_ios */

	mmc_set_initial_state(host);

	mmc_set_initial_state(host);

	mmc_host_clk_release(host);

	mmc_host_clk_release(host);

CRA Git | Maintained and supported by SUSTech CRA and CCSE