Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3576307imu; Tue, 18 Dec 2018 00:15:28 -0800 (PST) X-Google-Smtp-Source: AFSGD/Vv1T9TeaZzEnmcnJHeXpNtfd7KVkNC0EGA5hfp68Uj3KQOVB6fENooJxvhBeryIOnH3+4Y X-Received: by 2002:a17:902:d202:: with SMTP id t2mr15831673ply.193.1545120928805; Tue, 18 Dec 2018 00:15:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545120928; cv=none; d=google.com; s=arc-20160816; b=mLPn1ZrRpKEvFsLYV2tzNW1joIV/aq3T3mQpejgDutZfsRl5RyTgjDLIQ3ZGW9m33d c/MNVuK+iZJDw4xfPFUFZsItG1/Qaq01eVGcnv+3Lz+LOqE8hms3xdEJ6L9zUTa858jv tN2FOLCsVn5pfExrP1bTUxu+yIB0wSzGxdLvMRob0Zf9UWByAciLzFB0I34j2bZMRmHw 0mkf8YSrBjDsHBJYRP2zlaNi7eQW2+RAmUc9XS4LoS7ttK4bfsM0uD9HacC7/gNks5wp 26GrBjW/5yH4511g4znN1XpuTf0A6a0vu+2K7GNVmZRi714ByEALS/kGJcfHaz3d0z4Z UoTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature:dkim-signature; bh=oEDn4BHFT7oXk5FuKxZWoA9UUkbiQMdy3mV2/mo0F8E=; b=kRmfznzHzmgXaxlJcUqCmUfJN8YzPaFBaNEgo304gc5TE644AHXCMQ7uDWKSFo3t6Q E31ziWLoPUuo/LRHyAPf0N5wP10WtBYNNiuB9y1QJyFeuFrbDDGMSCvytjXDd8YGf2s8 L7Zp/Z2opJaHM3Xp/85gMgj+NbW9sOPn9Zjc5Tt+Sav4cG4tg/cJNHtS7XTijS/t9R39 TSb9kXfD9PTzTDVuZl1ZhlIEsLC9cNJU6jLMvL9pRF9HLZHUBQa8CRobQKhx+BBdm6MU /8iNkEjd3RSQxGBqEaxer2TDj+M53HqulrQbZIoW3Bw2sXoqQMrDhIgkXMVP3+xLuDSg T9xQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@who-t.net header.s=fm1 header.b=j2gYtUn3; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=whHcDSd2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 206si12152949pga.240.2018.12.18.00.15.13; Tue, 18 Dec 2018 00:15:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@who-t.net header.s=fm1 header.b=j2gYtUn3; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=whHcDSd2; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726451AbeLRINz (ORCPT + 99 others); Tue, 18 Dec 2018 03:13:55 -0500 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:57063 "EHLO wout2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726316AbeLRINy (ORCPT ); Tue, 18 Dec 2018 03:13:54 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id ED45C1199; Tue, 18 Dec 2018 03:13:50 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Tue, 18 Dec 2018 03:13:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=who-t.net; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm1; bh=oEDn4BHFT7oXk5FuKxZWoA9UUkb iQMdy3mV2/mo0F8E=; b=j2gYtUn3wE+43CVzILdbZCJLfLyzGhfcFF6GRm3BzZn xPLtSp+B+RMLCptJktikUeq3LIg5+VDmLd6f179o6NjnQdN0qP5wf8YhLxE85m7o RL1YY60xq5s5VbC2gCNLMjMad6NTR8i4wpIwRoL0bZCTnRuvu9EhI4UsewIo0ai4 LFx6mvjCUFc6Z5vkZh60VUEpw1K1Uw57CwIIDXlQ0XM7yDapIqDdNXOr0LXnbpZM wyIF08UoKxHQkb8xLK08VWQAXwC4OgG9adO2B4HY7CLaa4RYrqQxgfN8c/m4T5zg B52ZCJcvTe488hgXWD/MAXOsnWLicEjkTUlCoPtveNw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=oEDn4B HFT7oXk5FuKxZWoA9UUkbiQMdy3mV2/mo0F8E=; b=whHcDSd2GUH5CEJBbjsh6N eHM7UUhOqixEY5DpkP4+NClE+Jn2RHx253t++9u378kVD9AIzUGrck3WCJPSa86L EKNoKgA2sV80vjak5N9htUv9DuT1FHh7DKQ6NMfmNyC/b7LlKYcDcwNO/LciIB9o v1DJjT+s8A6VysCxMDtGM6FUAgGELqqFoGDx1rFSLBlk1MApdug75Oij0pPIXVty 2QIv3NUDAR8mnuGJggk4kPb90qYSCh2lqzGF+abEOqQpbzXSKypmLgeFC544qBD6 WHiY0q1wLET4yl+qyuRqd3sDnRqFv5xPTTJNQocBngCulAVk7A90TUinOI6hCGPw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedtkedrudeigedguddukecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfhuthenuceurghilhhouhhtmecu fedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepfffhvffukf hfgggtuggjfgesthdtredttdervdenucfhrhhomheprfgvthgvrhcujfhuthhtvghrvghr uceophgvthgvrhdrhhhuthhtvghrvghrseifhhhoqdhtrdhnvghtqeenucffohhmrghinh eplhgruhhntghhphgrugdrnhgvthdprghrtghhlhhinhhugidrohhrghenucfkphepudei jedrudejledrudeiiedrvdelnecurfgrrhgrmhepmhgrihhlfhhrohhmpehpvghtvghrrd hhuhhtthgvrhgvrhesfihhohdqthdrnhgvthenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from jelly (167-179-166-29.a7b3a6.bne.nbn.aussiebb.net [167.179.166.29]) by mail.messagingengine.com (Postfix) with ESMTPA id 22CA1E436E; Tue, 18 Dec 2018 03:13:46 -0500 (EST) Date: Tue, 18 Dec 2018 18:13:43 +1000 From: Peter Hutterer To: Benjamin Tissoires Cc: Dmitry Torokhov , kt.liao@emc.com.tw, Aaron Ma , Kai Heng Feng , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH] Input: elantech - Disable elan-i2c for P52 and P72 Message-ID: <20181218081343.GA4701@jelly> References: <20181212154205.24025-1-benjamin.tissoires@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181212154205.24025-1-benjamin.tissoires@redhat.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 12, 2018 at 04:42:05PM +0100, Benjamin Tissoires wrote: > The current implementation of elan_i2c is known to not support those > 2 laptops. > > A proper fix is to tweak both elantech and elan_i2c to transmit the > correct information from PS/2, which would make a bad candidate for > stable. > > So to give us some time for fixing the root of the problem, disable > elan_i2c for the devices we know are not behaving properly. > > Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1803600 > Link: https://bugs.archlinux.org/task/59714 > Fixes: df077237cf55 Input: elantech - detect new ICs and setup Host Notify for them > > Cc: stable@vger.kernel.org # v4.18+ > Signed-off-by: Benjamin Tissoires Acked-by: Peter Hutterer Cheers, Peter > --- > drivers/input/mouse/elantech.c | 18 ++++++++++++++++-- > 1 file changed, 16 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c > index 2d95e8d93cc7..830ae9f07045 100644 > --- a/drivers/input/mouse/elantech.c > +++ b/drivers/input/mouse/elantech.c > @@ -1767,6 +1767,18 @@ static int elantech_smbus = IS_ENABLED(CONFIG_MOUSE_ELAN_I2C_SMBUS) ? > module_param_named(elantech_smbus, elantech_smbus, int, 0644); > MODULE_PARM_DESC(elantech_smbus, "Use a secondary bus for the Elantech device."); > > +static const char * const i2c_blacklist_pnp_ids[] = { > + /* > + * these are known to not be working properly as bits are missing > + * in elan_i2c > + */ > + "LEN2131", /* ThinkPad P52 w/ NFC */ > + "LEN2132", /* ThinkPad P52 */ > + "LEN2133", /* ThinkPad P72 w/ NFC */ > + "LEN2134", /* ThinkPad P72 */ > + NULL > +}; > + > static int elantech_create_smbus(struct psmouse *psmouse, > struct elantech_device_info *info, > bool leave_breadcrumbs) > @@ -1802,10 +1814,12 @@ static int elantech_setup_smbus(struct psmouse *psmouse, > > if (elantech_smbus == ELANTECH_SMBUS_NOT_SET) { > /* > - * New ICs are enabled by default. > + * New ICs are enabled by default, unless mentioned in > + * i2c_blacklist_pnp_ids. > * Old ICs are up to the user to decide. > */ > - if (!ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version)) > + if (!ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version) || > + psmouse_matches_pnp_id(psmouse, i2c_blacklist_pnp_ids)) > return -ENXIO; > } > > -- > 2.19.2 >