From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Torokhov Subject: Re: [Bug #12406] 2.6.28 thinks that my PS/2 mouse is a touchpad Date: Tue, 20 Jan 2009 01:19:54 -0800 Message-ID: <200901200119.59851.dmitry.torokhov@gmail.com> References: <20090120014507.GA1557@adopmeer.homeip.net> Mime-Version: 1.0 Content-Transfer-Encoding: base64 Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :user-agent:cc:references:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:message-id; bh=QKqD9JYgCgOlmhvzjhiEISZt5tWfFgKS11ayRkHp+4w=; b=Hc+0i75Iz+cq83wX0aFg/KkyDU1DjfGnmxuhMDlq8Xz/mVodUqElmLVuFLq/IfEr4P AITKrdw4v6EOGdkHHSxuNu705eRWZd4TGsGF698BImE4FDlCs16ZNZP1C9AztwPBkP6K vA8FFG7mD800WBVg9xAq3+pOPRSQP9Z7e0QOM= In-Reply-To: <20090120014507.GA1557-ZZpm67l/2hWBldXiawXZ59HuzzzSOjJt@public.gmane.org> Content-Disposition: inline Sender: kernel-testers-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: Content-Type: text/plain; charset="us-ascii" To: Arjan Opmeer Cc: "Rafael J. Wysocki" , Linux Kernel Mailing List , Kernel Testers List , "Alexander E. Patrakov" , Denys Vlasenko PiBPbiBNb24sIEphbiAxOSwgMjAwOSBhdCAxMDo0NTo0MlBNICswMTAwLCBSYWZhZWwgSi4gV3lz b2NraSB3cm90ZToKPiA+IFRoZSBmb2xsb3dpbmcgYnVnIGVudHJ5IGlzIG9uIHRoZSBjdXJyZW50 IGxpc3Qgb2Yga25vd24gcmVncmVzc2lvbnMKPiA+IGludHJvZHVjZWQgYmV0d2VlbiAyLjYuMjcg YW5kIDIuNi4yOC4gIFBsZWFzZSB2ZXJpZnkgaWYgaXQgc3RpbGwgc2hvdWxkCj4gPiBiZSBsaXN0 ZWQgYW5kIGxldCBtZSBrbm93IChlaXRoZXIgd2F5KS4KPgo+IFdlbGwuIERtaXRyeSBoYXNuJ3Qg cmVwbGllZCB5ZXQgdG8gbXkgc3VnZ2VzdGlvbiBob3cgdG8gZml4IHRoaXMgYXMKPiBwcmVzZW50 ZWQgaW4gdGhlIFBhdGNoIGVudHJ5LiBXaXRob3V0IGhlbHAgZnJvbSBoaW0gYXMgdGhlIExpbnV4 IGlucHV0Cj4gc3Vic3lzdGVtIG1haW50YWluZXIgdGhlcmUgaXMgbm90IGEgbG90IEkgY2FuIGRv Lgo+Cj4gVGhpcyBtZWFucyB0aGUgcmVncmVzc2lvbiBpcyBzdGlsbCBwcmVzZW50IGluIHRoZSBj dXJyZW50IDIuNi4yOSBnaXQgdHJlZS4KClNvcnJ5LCBtdXN0IGhhdmUgbWlzc2VkIHRoYXQuIEkg dGhpbmsgaXQncyBnb25uYSBiZSBhIGJpdCBjaGF0dHkgaWYKdXNlciBoYXBwZW5zIHRvIGhhdmUg TG9naXRlY2grKyBkZXZpY2UgYXR0YWNoZWQsIGhvd2V2ZXIgSSB0aGluayBpZgp3ZSBjb21wbGVt ZW50IGl0IHdpdGggdGhlIHBhdGNoIGJlbG93IEkgdGhpbmsgaXQgc2hvdWxkIHdvcmsgT0suCgot LSAKRG1pdHJ5CgpJbnB1dDogcHNtb3VzZSAtIG1vdmUgRWxhbnRlY2ggZGV0ZWN0aW9uIHRvd2Fy ZHMgZW5kIG9mIHRoZSBsaXN0CgpFbGFudGVjaCdkIGRldGVjdGlvbiByb3V0aW5lIG1pc2ZpcmVz IG9uIExvZ2l0ZWNoJ3MgZGV2aWNlcyBzbyBsZXQncwptb3ZlIGl0IGRvd24gdG8gcHJldmVudCBm YWxzZSBwb3NpdGl2ZXMuCgpTaWduZWQtb2ZmLWJ5OiBEbWl0cnkgVG9yb2tob3YgPGR0b3JAbWFp bC5ydT4KLS0tCgogZHJpdmVycy9pbnB1dC9tb3VzZS9wc21vdXNlLWJhc2UuYyB8ICAgMjYgKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDEgZmlsZXMgY2hhbmdlZCwgMTMgaW5zZXJ0aW9ucygr KSwgMTMgZGVsZXRpb25zKC0pCgoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvaW5wdXQvbW91c2UvcHNt b3VzZS1iYXNlLmMgYi9kcml2ZXJzL2lucHV0L21vdXNlL3BzbW91c2UtCmJhc2UuYwppbmRleCBm OGY4NmRlLi5lNDEwNmJhIDEwMDY0NAotLS0gYS9kcml2ZXJzL2lucHV0L21vdXNlL3BzbW91c2Ut YmFzZS5jCisrKyBiL2RyaXZlcnMvaW5wdXQvbW91c2UvcHNtb3VzZS1iYXNlLmMKQEAgLTY1MSwx OSArNjUxLDYgQEAgc3RhdGljIGludCBwc21vdXNlX2V4dGVuc2lvbnMoc3RydWN0IHBzbW91c2Ug KnBzbW91c2UsCiAJCW1heF9wcm90byA9IFBTTU9VU0VfSU1FWDsKIAl9CiAKLS8qCi0gKiBUcnkg RWxhbnRlY2ggdG91Y2hwYWQuCi0gKi8KLQlpZiAobWF4X3Byb3RvID4gUFNNT1VTRV9JTUVYICYm Ci0JCQllbGFudGVjaF9kZXRlY3QocHNtb3VzZSwgc2V0X3Byb3BlcnRpZXMpID09IDApIHsKLQkJ aWYgKCFzZXRfcHJvcGVydGllcyB8fCBlbGFudGVjaF9pbml0KHBzbW91c2UpID09IDApCi0JCQly ZXR1cm4gUFNNT1VTRV9FTEFOVEVDSDsKLS8qCi0gKiBJbml0IGZhaWxlZCwgdHJ5IGJhc2ljIHJl bGF0aXZlIHByb3RvY29scwotICovCi0JCW1heF9wcm90byA9IFBTTU9VU0VfSU1FWDsKLQl9Ci0K IAlpZiAobWF4X3Byb3RvID4gUFNNT1VTRV9JTUVYKSB7CiAJCWlmIChnZW5pdXNfZGV0ZWN0KHBz bW91c2UsIHNldF9wcm9wZXJ0aWVzKSA9PSAwKQogCQkJcmV0dXJuIFBTTU9VU0VfR0VOUFM7CkBA IC02NzksNiArNjY2LDE5IEBAIHN0YXRpYyBpbnQgcHNtb3VzZV9leHRlbnNpb25zKHN0cnVjdCBw c21vdXNlICpwc21vdXNlLAogCX0KIAogLyoKKyAqIFRyeSBFbGFudGVjaCB0b3VjaHBhZC4KKyAq LworCWlmIChtYXhfcHJvdG8gPiBQU01PVVNFX0lNRVggJiYKKwkJCWVsYW50ZWNoX2RldGVjdChw c21vdXNlLCBzZXRfcHJvcGVydGllcykgPT0gMCkgeworCQlpZiAoIXNldF9wcm9wZXJ0aWVzIHx8 IGVsYW50ZWNoX2luaXQocHNtb3VzZSkgPT0gMCkKKwkJCXJldHVybiBQU01PVVNFX0VMQU5URUNI OworLyoKKyAqIEluaXQgZmFpbGVkLCB0cnkgYmFzaWMgcmVsYXRpdmUgcHJvdG9jb2xzCisgKi8K KwkJbWF4X3Byb3RvID0gUFNNT1VTRV9JTUVYOworCX0KKworLyoKICAqIFJlc2V0IHRvIGRlZmF1 bHRzIGluIGNhc2UgdGhlIGRldmljZSBnb3QgY29uZnVzZWQgYnkgZXh0ZW5kZWQKICAqIHByb3Rv Y29sIHByb2Jlcy4gTm90ZSB0aGF0IHdlIGZvbGxvdyB1cCB3aXRoIGZ1bGwgcmVzZXQgYmVjYXVz ZQogICogc29tZSBtaWNlIHB1dCB0aGVtc2VsdmVzIHRvIHNsZWVwIHdoZW4gdGhleSBzZWUgUFNN T1VTRV9SRVNFVF9ESVMuCgAK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758701AbZATJVH (ORCPT ); Tue, 20 Jan 2009 04:21:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754802AbZATJUr (ORCPT ); Tue, 20 Jan 2009 04:20:47 -0500 Received: from mail-qy0-f11.google.com ([209.85.221.11]:59585 "EHLO mail-qy0-f11.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754756AbZATJUo (ORCPT ); Tue, 20 Jan 2009 04:20:44 -0500 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 :content-disposition:message-id; b=oK1K7md80L4Wo6Y1sqw5ltF+zkDP3s2dcq29TM/NFvPzpq8yJ540fa3kpuBFOelOYq 9HO0k9/rZuy+NdLDL/TVNViFIB3oTdAviBJkmYusJM0vKizoIrClb6z34pIhQfiSFGk7 7YJTmPSxXBdIDz8q5ivBvy5/53yZ/8QVIH2Ts= From: Dmitry Torokhov To: Arjan Opmeer Subject: Re: [Bug #12406] 2.6.28 thinks that my PS/2 mouse is a touchpad Date: Tue, 20 Jan 2009 01:19:54 -0800 User-Agent: KMail/1.10.3 (Linux/2.6.27.9-159.fc10.x86_64; KDE/4.1.3; x86_64; ; ) Cc: "Rafael J. Wysocki" , Linux Kernel Mailing List , Kernel Testers List , "Alexander E. Patrakov" , Denys Vlasenko References: <20090120014507.GA1557@adopmeer.homeip.net> In-Reply-To: <20090120014507.GA1557@adopmeer.homeip.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline Message-Id: <200901200119.59851.dmitry.torokhov@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by alpha id n0K9LBwM028804 > On Mon, Jan 19, 2009 at 10:45:42PM +0100, Rafael J. Wysocki wrote:> > The following bug entry is on the current list of known regressions> > introduced between 2.6.27 and 2.6.28. Please verify if it still should> > be listed and let me know (either way).>> Well. Dmitry hasn't replied yet to my suggestion how to fix this as> presented in the Patch entry. Without help from him as the Linux input> subsystem maintainer there is not a lot I can do.>> This means the regression is still present in the current 2.6.29 git tree. Sorry, must have missed that. I think it's gonna be a bit chatty ifuser happens to have Logitech++ device attached, however I think ifwe complement it with the patch below I think it should work OK. -- Dmitry Input: psmouse - move Elantech detection towards end of the list Elantech'd detection routine misfires on Logitech's devices so let'smove it down to prevent false positives. Signed-off-by: Dmitry Torokhov --- drivers/input/mouse/psmouse-base.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.cindex f8f86de..e4106ba 100644--- a/drivers/input/mouse/psmouse-base.c+++ b/drivers/input/mouse/psmouse-base.c@@ -651,19 +651,6 @@ static int psmouse_extensions(struct psmouse *psmouse, max_proto = PSMOUSE_IMEX; } -/*- * Try Elantech touchpad.- */- if (max_proto > PSMOUSE_IMEX &&- elantech_detect(psmouse, set_properties) == 0) {- if (!set_properties || elantech_init(psmouse) == 0)- return PSMOUSE_ELANTECH;-/*- * Init failed, try basic relative protocols- */- max_proto = PSMOUSE_IMEX;- }- if (max_proto > PSMOUSE_IMEX) { if (genius_detect(psmouse, set_properties) == 0) return PSMOUSE_GENPS;@@ -679,6 +666,19 @@ static int psmouse_extensions(struct psmouse *psmouse, } /*+ * Try Elantech touchpad.+ */+ if (max_proto > PSMOUSE_IMEX &&+ elantech_detect(psmouse, set_properties) == 0) {+ if (!set_properties || elantech_init(psmouse) == 0)+ return PSMOUSE_ELANTECH;+/*+ * Init failed, try basic relative protocols+ */+ max_proto = PSMOUSE_IMEX;+ }++/* * Reset to defaults in case the device got confused by extended * protocol probes. Note that we follow up with full reset because * some mice put themselves to sleep when they see PSMOUSE_RESET_DIS.{.n++%ݶw{.n+{G{ayʇڙ,jfhz_(階ݢj"mG?&~iOzv^m ?I