Re: [PATCH 2/2] mmc: core: reset sdio card properly on resume.

Ulf Hansson
2014-11-11T08:12:10Z

On 11 November 2014 01:17, NeilBrown <neilb@suse.de> wrote:
> On Mon, 10 Nov 2014 14:29:19 +0100 Ulf Hansson <ulf.hansson@linaro.org> wrote:
>
>> On 8 November 2014 01:14, NeilBrown <neilb@suse.de> wrote:
>> > mmc_sdio_power_restore calls
>> > mmc_send_if_cond(host, host->ocr_avail);
>> >
>> > ret = mmc_send_io_op_cond(host, 0, NULL);
>> >
>> > between mmc_go_idle() and mmc_sdio_init_card().
>> > mmc_sdio_resume needs to as well, else my libertas sdio wifi
>> > device doesn't resume properly from suspend.
>> >
>> > Signed-off-by: NeilBrown <neilb@suse.de>
>> > ---
>> > drivers/mmc/core/sdio.c | 8 ++++++--
>> > 1 file changed, 6 insertions(+), 2 deletions(-)
>> >
>> > diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
>> > index e636d9e99e4a..3f069a6f448f 100644
>> > --- a/drivers/mmc/core/sdio.c
>> > +++ b/drivers/mmc/core/sdio.c
>> > @@ -981,8 +981,12 @@ static int mmc_sdio_resume(struct mmc_host *host)
>> > if (mmc_card_is_removable(host) || !mmc_card_keep_power(host)) {
>> > sdio_reset(host);
>> > mmc_go_idle(host);
>> > - err = mmc_sdio_init_card(host, host->card->ocr, host->card,
>> > - mmc_card_keep_power(host));
>> > + mmc_send_if_cond(host, host->ocr_avail);
>>
>> /s /host->ocr_avail /host->card->ocr
>>
>> I would expect that to work. I do realize that "host->ocr_avail" is
>> being used in the ->power_restore() callback, but I think that's wrong
>> as well. Could you maybe verify that changing to host->card->ocr works
>> in this path as well? That's would of course be a separate patch.
>
> Hi Ulf,
> I made the substitution in mmc_sdio_resume and mmc_sdio_power_restore
> and my sdio device continues to work, including after resume.
>
> The host->card->ocr value is 0x10000, the host->ocr_avail value is 0x18000.

That makes sense.

The host->card->ocr mask has been negotiated at initialization between
the host and the card.

>
> If you like I'll send the two patches formally, but it might be a day or so.

Please do.

Kind regards
Uffe