Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752562Ab0BYHHo (ORCPT ); Thu, 25 Feb 2010 02:07:44 -0500 Received: from ksp.mff.cuni.cz ([195.113.26.206]:41204 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752342Ab0BYHHm (ORCPT ); Thu, 25 Feb 2010 02:07:42 -0500 Date: Thu, 25 Feb 2010 08:03:03 +0100 From: Pavel Machek To: Dmitry Torokhov Cc: Alan Jenkins , linux-input@vger.kernel.org, linux-kernel Subject: Re: [PATCH] Input: serio - re-add thaw (and add freeze) Message-ID: <20100225070302.GB1601@ucw.cz> References: <4B69C7AA.7000904@tuffmail.co.uk> <20100203191112.GC30600@core.coreip.homeip.net> <4B6A9FD7.5040207@tuffmail.co.uk> <9b2b86521002160848q3e75d02aqe432376de2a5b732@mail.gmail.com> <20100216172233.GA14229@core.coreip.homeip.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20100216172233.GA14229@core.coreip.homeip.net> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2513 Lines: 72 On Tue 2010-02-16 09:22:33, Dmitry Torokhov wrote: > On Tue, Feb 16, 2010 at 04:48:30PM +0000, Alan Jenkins wrote: > > On 2/4/10, Alan Jenkins wrote: > > > Dmitry Torokhov wrote: > > >> On Wed, Feb 03, 2010 at 06:59:54PM +0000, Alan Jenkins wrote: > > >> > > >>> 633aae2 "Input: i8042 - switch to using dev_pm_ops" > > >>> removed handling for PMSG_THAW, causing obscure breakage. > > >>> > > >>> It can break if you press keys during hibernation, > > >>> which causes subsequent keypresses to be lost - > > >>> so you can't cancel s2disk by pressing backspace - > > >>> and then just before system poweroff you get > > >>> "psmouse.c: Failed to deactivate mouse". > > >>> > > >>> So let's add the thaw handler back. > > >>> > > >>> Also set the freeze handler. It looks like PMSG_FREEZE > > >>> didn't do anything in the past, but I think that must > > >>> have been an oversight. > > >>> > > >> > > >> We do not need to do anything special at freeze time that is why there > > >> wasn't freeze handler. And so thaw should be pretty much noop as well. > > > > Ok, so I did some more mindless fiddling. It seems that all it needs > > is to call the interrupt handler at thaw time. > > > > Yep, this makes more sense. If you happen to press the key(s) while > interrupts are off the keyboard controller becomes "jammed". Your sign > off please? Dmitry wants your Signed-off-by: line, to easily apply the patch. Pavel > > Regards > > Alan > > > > diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c > > index d84a36e..b54aee7 100644 > > --- a/drivers/input/serio/i8042.c > > +++ b/drivers/input/serio/i8042.c > > @@ -1161,9 +1161,17 @@ static int i8042_pm_restore(struct device *dev) > > return 0; > > } > > > > +static int i8042_pm_thaw(struct device *dev) > > +{ > > + i8042_interrupt(0, NULL); > > + > > + return 0; > > +} > > + > > static const struct dev_pm_ops i8042_pm_ops = { > > .suspend = i8042_pm_reset, > > .resume = i8042_pm_restore, > > + .thaw = i8042_pm_thaw, > > .poweroff = i8042_pm_reset, > > .restore = i8042_pm_restore, > > }; > -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -- 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/