Re: mei driver breaks suspend on 3.0git

[Arkadiusz Miskiewicz <a.miskiewicz@gmail.com>]

On Sunday 12 of June 2011, Arkadiusz Miskiewicz wrote:
> On Sunday 12 of June 2011, Arkadiusz Miskiewicz wrote:
> > On Sunday 12 of June 2011, Winkler, Tomas wrote:
> > > > -----Original Message-----
> > > > From: Weil, Oren jer
> > > > Sent: Sunday, June 12, 2011 8:36 PM
> > > > To: Arkadiusz Miskiewicz
> > > > Cc: Winkler, Tomas; linux-kernel@vger.kernel.org
> > > > Subject: RE: mei driver breaks suspend on 3.0git
> > > > 
> > > > >It's thinkpad t400 with
> > > > >00:03.0 Communication controller [0780]: Intel Corporation Mobile 4
> > > > >Series Chipset MEI Controller [8086:2a44] (rev 07)
> > > > 
> > > > Can you send us more details? Does it happened in stress? How do I
> > > > reproduce
> > > > it?
> > 
> > No stress. This is my daily use notebook and I simply suspend to ram when
> > sitting under X in kde4.
> > 
> > > > Can you send us the debug prints?
> > 
> > Attached. suspend starts, tries to resume devices, MEI suspend fails
> > causing whole suspend to be aborted.
> 
> Shouldn't ret > 0 in mei_wd_stop to be "success"?

I meant this one:

        ret = wait_event_interruptible_timeout(dev->wait_stop_wd,
                                        dev->wd_stopped, 10 * HZ);


And that was possible untested solution that relies on wd being stopped and 
not anything else.

> 
> diff --git a/drivers/staging/mei/wd.c b/drivers/staging/mei/wd.c
> index 2564b03..608245a 100644
> --- a/drivers/staging/mei/wd.c
> +++ b/drivers/staging/mei/wd.c
> @@ -171,8 +171,10 @@ int mei_wd_stop(struct mei_device *dev, bool preserve)
>         mutex_lock(&dev->device_lock);
>         if (!dev->wd_stopped)
>                 dev_dbg(&dev->pdev->dev, "stop wd failed to complete.\n");
> -       else
> +       else {
> +               ret = 0;
>                 dev_dbg(&dev->pdev->dev, "stop wd complete.\n");
> +       }
> 
>         if (preserve)
>                 dev->wd_timeout = wd_timeout;


-- 
Arkadiusz Miśkiewicz        PLD/Linux Team
arekm / maven.pl            http://ftp.pld-linux.org/