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

Commit 87f761b6 authored by Venkatraman S's avatar Venkatraman S Committed by Chris Ball
Browse files

mmc: core: Revert "skip card initialization if power class selection fails" 



This reverts commit 3d93576e(skip card initialization if
power class selection fails).
Problem has been reported when this is used with eMMC4.41
card with Tegra Platform. Till the issue is root caused,
bus width selection failure should not be treated as fatal.

Reported-by: default avatarMarc Dietrich <marvin24@gmx.de>
Signed-Off-by: default avatarVenkatraman S <svenkatr@ti.com>
CC: Ulf Hansson <ulf.hansson@stericsson.com>
CC: Subhash Jadavani <subhashj@codeaurora.org>
CC: Saugata Das <saugata.das@linaro.org>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 5db9a4d9

drivers/mmc/core/mmc.c

+11 −7
Original line number Diff line number Diff line
@@ -717,10 +717,6 @@ static int mmc_select_powerclass(struct mmc_card *card, 
				 card->ext_csd.generic_cmd6_time);

	}



	if (err)

		pr_err("%s: power class selection for ext_csd_bus_width %d"

		       " failed\n", mmc_hostname(card->host), bus_width);



	return err;

}
@@ -1104,7 +1100,9 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
				EXT_CSD_BUS_WIDTH_8 : EXT_CSD_BUS_WIDTH_4;

		err = mmc_select_powerclass(card, ext_csd_bits, ext_csd);

		if (err)

			goto err;

			pr_warning("%s: power class selection to bus width %d"

				   " failed\n", mmc_hostname(card->host),

				   1 << bus_width);

	}



	/*
@@ -1136,7 +1134,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
			err = mmc_select_powerclass(card, ext_csd_bits[idx][0],

						    ext_csd);

			if (err)

				goto err;

				pr_warning("%s: power class selection to "

					   "bus width %d failed\n",

					   mmc_hostname(card->host),

					   1 << bus_width);



			err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

					 EXT_CSD_BUS_WIDTH,
@@ -1164,7 +1165,10 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, 
			err = mmc_select_powerclass(card, ext_csd_bits[idx][1],

						    ext_csd);

			if (err)

				goto err;

				pr_warning("%s: power class selection to "

					   "bus width %d ddr %d failed\n",

					   mmc_hostname(card->host),

					   1 << bus_width, ddr);



			err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,

					 EXT_CSD_BUS_WIDTH,