From patchwork Thu May 28 16:37:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 6499981 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 42CF3C0020 for ; Thu, 28 May 2015 16:37:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8FFFD204AF for ; Thu, 28 May 2015 16:37:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2631E2049E for ; Thu, 28 May 2015 16:37:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753816AbbE1Qhw (ORCPT ); Thu, 28 May 2015 12:37:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35856 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754167AbbE1Qhv (ORCPT ); Thu, 28 May 2015 12:37:51 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 862A535010F; Thu, 28 May 2015 16:37:51 +0000 (UTC) Received: from shalem.localdomain (vpn1-7-128.ams2.redhat.com [10.36.7.128]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4SGbnpu002802 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 28 May 2015 12:37:50 -0400 Message-ID: <5567445D.6070700@redhat.com> Date: Thu, 28 May 2015 18:37:49 +0200 From: Hans de Goede User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Martin Herkt , linux-input@vger.kernel.org CC: Dmitry Torokhov , Ulrik De Bie , George Moutsopoulos Subject: Re: [PATCH] input: elantech.c: add more exceptions to fw version signature check References: <1432830570-31406-1-git-send-email-lachs0r@srsfckn.biz> In-Reply-To: <1432830570-31406-1-git-send-email-lachs0r@srsfckn.biz> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, T_TVD_MIME_EPI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Martin, On 28-05-15 18:29, Martin Herkt wrote: > This makes the driver work with the ElanTech touchpad of my > ASUS PU551LD laptop (fw signature 0x480f0a). There may be more > touchpads with firmware versions in the 0x4? range, so I've added > those to the exception as well. I actually send a patch fixing the exact same bug earlier today... > diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c > index 79363b6..cd3e2a3 100644 > --- a/drivers/input/mouse/elantech.c > +++ b/drivers/input/mouse/elantech.c > @@ -1379,7 +1379,8 @@ static bool elantech_is_signature_valid(const unsigned char *param) > * Some models have a revision higher then 20. Meaning param[2] may > * be 10 or 20, skip the rates check for these. > */ > - if (param[0] == 0x46 && (param[1] & 0xef) == 0x0f && param[2] < 40) > + if (param[0] >= 0x40 && param[0] < 0x50 && This is wrong, the bits of param[0] which define the hw version of the touchpads are in the low nibble, so your check will also match older touchpads where we do not want to skip the rare check. > + (param[1] & 0xef) == 0x0f && param[2] < 40) > return true; > > for (i = 0; i < ARRAY_SIZE(rates); i++) I've attached my patch, which actually checks the low nibble of param[0]. It has already been tested on an Asus PU551LA laptop, so it should work for your laptop too. Regards, Hans From 9778e462805c95ed626290094a22af09ba879fef Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Thu, 30 Apr 2015 10:29:38 +0200 Subject: [PATCH 1/3] elantech: Fix detection of touchpads where the revision matches a known rate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make the check to skip the rate check more lax, so that it applies to all hw_version 4 models. This fixes the touchpad not being detected properly on Asus PU551LA laptops. Cc: stable@vger.kernel.org Reported-and-tested-by: David Zafra Gómez Signed-off-by: Hans de Goede --- drivers/input/mouse/elantech.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index 79363b6..e605303 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c @@ -1379,7 +1379,8 @@ static bool elantech_is_signature_valid(const unsigned char *param) * Some models have a revision higher then 20. Meaning param[2] may * be 10 or 20, skip the rates check for these. */ - if (param[0] == 0x46 && (param[1] & 0xef) == 0x0f && param[2] < 40) + if ((param[0] & 0x0f) >= 0x06 && (param[1] & 0xaf) == 0x0f && + param[2] < 40) return true; for (i = 0; i < ARRAY_SIZE(rates); i++) -- 2.4.1