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

Commit 9b034c3f authored by Venkat Gopalakrishnan's avatar Venkat Gopalakrishnan
Browse files

mmc: sd: Error out on bus speed switch failure 



Treat bus speed switch failures as error and don't fall back on
default speed. The card status could indicate that the current
function is busy and cannot be switched. Attempt to reinit the
bus speed switch again instead of falling back to default speed.
Silently falling back to lower speed could cause performance issues.

CRs-Fixed: 849567
Change-Id: I4fcd51b82e41746620a68a0a0eb5a18d630ccbea
Signed-off-by: default avatarVenkat Gopalakrishnan <venkatg@codeaurora.org>
parent 4c5e5900

drivers/mmc/core/sd.c

+10 −8
Original line number Diff line number Diff line
@@ -377,9 +377,9 @@ int mmc_sd_switch_hs(struct mmc_card *card) 
		goto out;



	if ((status[16] & 0xF) != 1) {

		pr_warn("%s: Problem switching card into high-speed mode!\n",

			mmc_hostname(card->host));

		err = 0;

		pr_warn("%s: Problem switching card into high-speed mode!, status:%x\n",

			mmc_hostname(card->host), (status[16] & 0xF));

		err = -EBUSY;

	} else {

		err = 1;

	}
@@ -525,15 +525,17 @@ static int sd_set_bus_speed_mode(struct mmc_card *card, u8 *status) 
	if (err)

		return err;



	if ((status[16] & 0xF) != card->sd_bus_speed)

		pr_warn("%s: Problem setting bus speed mode!\n",

			mmc_hostname(card->host));

	else {

	if ((status[16] & 0xF) != card->sd_bus_speed) {

		pr_warn("%s: Problem setting bus speed mode(%u)! max_dtr:%u, timing:%u, status:%x\n",

			mmc_hostname(card->host), card->sd_bus_speed,

			card->sw_caps.uhs_max_dtr, timing, (status[16] & 0xF));

		err = -EBUSY;

	} else {

		mmc_set_timing(card->host, timing);

		mmc_set_clock(card->host, card->sw_caps.uhs_max_dtr);

	}



	return 0;

	return err;

}



/* Get host's max current setting at its current voltage */