From patchwork Fri Sep 4 05:18:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 45516 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n845Inhm022163 for ; Fri, 4 Sep 2009 05:18:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755489AbZIDFSp (ORCPT ); Fri, 4 Sep 2009 01:18:45 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755504AbZIDFSp (ORCPT ); Fri, 4 Sep 2009 01:18:45 -0400 Received: from mail-px0-f177.google.com ([209.85.216.177]:45645 "EHLO mail-px0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755489AbZIDFSo (ORCPT ); Fri, 4 Sep 2009 01:18:44 -0400 X-Greylist: delayed 797 seconds by postgrey-1.27 at vger.kernel.org; Fri, 04 Sep 2009 01:18:43 EDT Received: by pxi7 with SMTP id 7so446551pxi.1 for ; Thu, 03 Sep 2009 22:18:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :references:mime-version:content-type:content-disposition :in-reply-to:user-agent:message-id; bh=MTRs2nzv0SijOtKrPpXiK41lltTZDhfBThVuP8AaHJs=; b=EIoRAAWX8gVWT6DImeJq7GMgAZKPN6EeINjRVYhNE4OUdBzIObOoCdDeD/HACEtqPS eLKqVO3tCGwWMBbYd6ExofhN8IH7R/sCogeAtUuK/9Y2olYYaPMkAfGQWNp6nJn8ekHo S6LShRJN14/f6EBs5eFY3R8yPSIG1NbTRs7kQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:references:mime-version:content-type :content-disposition:in-reply-to:user-agent:message-id; b=ubeKpFB9OVPu2msQ6UeniTbx2mNSupJR/iJECqGepSACNuNYQZylYawT5G5yIACDHR MECAckkKO3jusYKpjavz62iEn9HCbgaa7TSd9godGKuHkfhjlFM/aiPETiRkFWuEAXA2 heFSLfeg4z+wJ1RxsOPyx5eTnwbxZrcsBM2ac= Received: by 10.114.29.15 with SMTP id c15mr9369017wac.148.1252041526568; Thu, 03 Sep 2009 22:18:46 -0700 (PDT) Received: from mailhub.coreip.homeip.net (c-24-6-153-137.hsd1.ca.comcast.net [24.6.153.137]) by mx.google.com with ESMTPS id 21sm199744pxi.3.2009.09.03.22.18.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 03 Sep 2009 22:18:44 -0700 (PDT) Date: Thu, 3 Sep 2009 22:18:41 -0700 From: Dmitry Torokhov To: "Dr. David Alan Gilbert" Cc: Jiri Kosina , "H. Peter Anvin" , linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Subject: Re: 2.6.{28,30} Keyboard not working on oldish machine References: <20090613230842.GA18347@gallifrey> <20090623185814.GB24108@gallifrey> <200906231106.37460.dmitry.torokhov@gmail.com> <20090628140452.GA15816@gallifrey> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090628140452.GA15816@gallifrey> User-Agent: Mutt/1.5.19 (2009-01-05) Message-Id: <20090904055139.4BEAB526EA5@mailhub.coreip.homeip.net> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org On Sun, Jun 28, 2009 at 03:04:52PM +0100, Dr. David Alan Gilbert wrote: > * Dmitry Torokhov (dmitry.torokhov@gmail.com) wrote: > > On Tuesday 23 June 2009 11:58:15 Dr. David Alan Gilbert wrote: > > > > > > Yep; I'm OK with the i8042.noaux from my point of view, but it's a > > > bit worrying that this used to work fine. There's obviously been > > > a change somewhere since 2.6.18 (and as I remember from the dmesg > > > the keyboard and aux ports are being initialised in different orders). > > > (Actually I say obviously since 2.6.18 - but the 2.6.18 I tried > > > I think I only used the debian version - I should go back and > > > see if I can do a vanilla one), but this box has been running > > > Linux since the time it was originally bought with loads of distros > > > and clean kernels years ago. > > > > > > While this machine is old, the motherboard was a pretty common one > > > at the time. > > > > > > > Any chance I could get dmesg with i8042.debug with 2.6.18? There was > > quite a large change back then when we got rid of the polling timer > > in i8042. > > Apologies for the delay; attached is the dmesg from the Debian 2.6.18 > in which keyboard works as previously described. > Sorry for taking so long to respond. The only vidible difference beween the old and the new way is that we don't "close" serio ports anymore if we fail to detect a mouse/keyboard. Could you please try the patch below and tell me if it helps? Thanks! diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index b53a015..a55ad99 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -264,6 +264,33 @@ static int i8042_aux_write(struct serio *serio, unsigned char c) I8042_CMD_MUX_SEND + port->mux); } + +/* + * i8042_aux_close attempts to clear AUX port state by disabling + * and then re-enabling it. + */ + +static void i8042_aux_close(struct serio *serio) +{ + i8042_ctr &= ~I8042_CTR_AUXINT; + if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) + printk(KERN_WARNING + "i8042.c: Can't write CTR while closing AUX port.\n"); + udelay(50); + + i8042_ctr &= ~I8042_CTR_AUXDIS; + i8042_ctr |= I8042_CTR_AUXINT; + if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) + printk(KERN_ERR + "i8042.c: Can't reactivate AUX port.\n"); + + /* + * See if there is any data appeared while we were messing with + * port state. + */ + i8042_interrupt(0, NULL); +} + /* * i8042_start() is called by serio core when port is about to finish * registering. It will mark port as existing so i8042_interrupt can @@ -1051,6 +1078,7 @@ static int __devinit i8042_create_aux_port(int idx) serio->write = i8042_aux_write; serio->start = i8042_start; serio->stop = i8042_stop; + serio->close = i8042_aux_close; serio->port_data = port; serio->dev.parent = &i8042_platform_device->dev; if (idx < 0) {