apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'mmc-v4.3-rc5' of git://git.linaro.org/people/ulf.hansson/mmc

Browse Source 
Pull MMC bugfix from Ulf Hansson:
 "Here's yet another MMC fix intended for v4.3 rc7.  I don't expect to
  send any further pull requests for 4.3 rc[n].

  MMC core:
   - Don't re-tune in the reset sequence to allow re-init of the card"

* tag 'mmc-v4.3-rc5' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: core: Fix init_card in 52Mhz
This commit is contained in:
Linus Torvalds
2015-10-22 06:31:27 +09:00
parent be0e1987bc 08b137d90e
commit 7f67786330
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/mmc/card/mmc_test.c
+3 -6
View File
@@ -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
-7
View File
@@ -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);