DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=from:to:subject:date:user-agent:cc:references:in-reply-to
         :mime-version:content-type:content-transfer-encoding:message-id;
        b=Kw4iWlaz/Y/18Pfh6WGKghILR/BrSUX++xaaE3uNAsx8TMAhFzxEkj3iMu7h/RtZ1J
         ml7FGfOUQytj/xo+tryQ3hLSUdfbTxZgGRoniTSxIqWmumltpE3I6q9aeAdVNz/gBNyY
         XoK4h8o4ZPDKRP06WYxxIG4IWBKGDIXPaZ+vI=
From: Arkadiusz Miskiewicz <a.miskiewicz@gmail.com>
To: "Winkler, Tomas" <tomas.winkler@intel.com>
Subject: Re: mei driver breaks suspend on 3.0git
Date: Sun, 12 Jun 2011 20:40:21 +0200
User-Agent: KMail/1.13.7 (Linux/3.0.0-rc2-00256-gb99ca60; KDE/4.6.4; x86_64; ; )
Cc: "Weil, Oren jer" <oren.jer.weil@intel.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
References: <201106121314.26394.a.miskiewicz@gmail.com> <201106122016.33399.a.miskiewicz@gmail.com> <201106122038.36623.a.miskiewicz@gmail.com>
In-Reply-To: <201106122038.36623.a.miskiewicz@gmail.com>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 8BIT
Message-Id: <201106122040.21950.a.miskiewicz@gmail.com>
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 2256
Lines: 64

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/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/