The patch titled sdio: don't use CMD[357] as part of a powered SDIO resume has been added to the -mm tree. Its filename is sdio-dont-use-cmd-as-part-of-a-powered-sdio-resume.patch
Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: sdio: don't use CMD[357] as part of a powered SDIO resume From: Chris Ball <c...@laptop.org> Seen on a Marvell 8686 SDIO card and Via VX855 controller: we must avoid sending CMD3/5/7 on a resume where power has been maintained, because the 8686 will refuse to respond to them and the MMC stack will give up on the card. Signed-off-by: Chris Ball <c...@laptop.org> Signed-off-by: Nicolas Pitre <n...@marvell.com> Cc: <linux-mmc@vger.kernel.org> Signed-off-by: Andrew Morton <a...@linux-foundation.org> --- drivers/mmc/core/sdio.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff -puN drivers/mmc/core/sdio.c~sdio-dont-use-cmd-as-part-of-a-powered-sdio-resume drivers/mmc/core/sdio.c --- a/drivers/mmc/core/sdio.c~sdio-dont-use-cmd-as-part-of-a-powered-sdio-resume +++ a/drivers/mmc/core/sdio.c @@ -224,7 +224,7 @@ static int sdio_enable_hs(struct mmc_car * we're trying to reinitialise. */ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, - struct mmc_card *oldcard) + struct mmc_card *oldcard, int powered_resume) { struct mmc_card *card; int err; @@ -235,9 +235,11 @@ static int mmc_sdio_init_card(struct mmc /* * Inform the card of the voltage */ - err = mmc_send_io_op_cond(host, host->ocr, &ocr); - if (err) - goto err; + if (!powered_resume) { + err = mmc_send_io_op_cond(host, host->ocr, &ocr); + if (err) + goto err; + } /* * For SPI, enable CRC as appropriate. @@ -262,7 +264,7 @@ static int mmc_sdio_init_card(struct mmc /* * For native busses: set card RCA and quit open drain mode. */ - if (!mmc_host_is_spi(host)) { + if (!powered_resume && !mmc_host_is_spi(host)) { err = mmc_send_relative_addr(host, &card->rca); if (err) goto remove; @@ -273,7 +275,7 @@ static int mmc_sdio_init_card(struct mmc /* * Select card, as all following commands rely on that. */ - if (!mmc_host_is_spi(host)) { + if (!powered_resume && !mmc_host_is_spi(host)) { err = mmc_select_card(card); if (err) goto remove; @@ -437,7 +439,8 @@ static int mmc_sdio_resume(struct mmc_ho /* Basic card reinitialization. */ mmc_claim_host(host); - err = mmc_sdio_init_card(host, host->ocr, host->card); + err = mmc_sdio_init_card(host, host->ocr, host->card, + (host->pm_flags & MMC_PM_KEEP_POWER)); mmc_release_host(host); /* @@ -507,7 +510,7 @@ int mmc_attach_sdio(struct mmc_host *hos /* * Detect and init the card. */ - err = mmc_sdio_init_card(host, host->ocr, NULL); + err = mmc_sdio_init_card(host, host->ocr, NULL, 0); if (err) goto err; card = host->card; _ Patches currently in -mm which might be from c...@laptop.org are sdio-dont-use-cmd-as-part-of-a-powered-sdio-resume.patch -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html