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

Commit 5533d9ed authored by Wolfram Sang's avatar Wolfram Sang Committed by Greg Kroah-Hartman
Browse files

mmc: core: complete HS400 before checking status 



[ Upstream commit b0e370b95a3b231d0fb5d1958cce85ef57196fe6 ]

We don't have a reproducible error case, yet our BSP team suggested that
the mmc_switch_status() command in mmc_select_hs400() should come after
the callback into the driver completing HS400 setup. It makes sense to
me because we want the status of a fully setup HS400, so it will
increase the reliability of the mmc_switch_status() command.

Reported-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Fixes: ba6c7ac3 ("mmc: core: more fine-grained hooks for HS400 tuning")
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 2da80536

drivers/mmc/core/mmc.c

+3 −3
Original line number Diff line number Diff line
@@ -1209,13 +1209,13 @@ static int mmc_select_hs400(struct mmc_card *card) 
	mmc_set_timing(host, MMC_TIMING_MMC_HS400);

	mmc_set_bus_speed(card);



	if (host->ops->hs400_complete)

		host->ops->hs400_complete(host);



	err = mmc_switch_status(card);

	if (err)

		goto out_err;



	if (host->ops->hs400_complete)

		host->ops->hs400_complete(host);



	return 0;



out_err: