Received: by 10.213.65.68 with SMTP id h4csp704877imn; Fri, 6 Apr 2018 07:34:13 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+1uhyRX4SOPVEnI54s4ArpbxX9JMnBvldzKmZY9S4nowDX6cuYPFd7SKUxtoz3V+2lW/7W X-Received: by 2002:a17:902:28c4:: with SMTP id f62-v6mr27734550plb.19.1523025253113; Fri, 06 Apr 2018 07:34:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523025253; cv=none; d=google.com; s=arc-20160816; b=X33hjqTv8m0BWO3SwKydYr5EsgmwJot5S3Km4xDaVDw49uj4XIQIhFKzPp1PBx/PFK yHhEZS0qyU8JkhlhtHQi8nrnieWM+FyR7gxLnpCq2afmqoRqQDUSo6HYZ3dJ+DbowMSF s1gT1vhwIiJ+nBOH1/U/RV+udQ3V/aRi8qfgG2wlIRy2D6SpLV0ovnr6oeAcmeGFXMbW bKwFR+G5+kaiWY9zmu84CVxxzWScZ2C6jo/rJV6Tnu6w365VwPYriAwXIgGw1JZkmSTD 3ZMBhThN1/Vl+tqifmEzWbbILSJ7o6r22CcZw7yPjbDf8xqY2Z38nhTX0I/nYxQ9W0Ic mOwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=0vUK3/+0RI+baowPX8oFTzH6wD1tmj0Lz8OM5z/rJfA=; b=abNVObKbcgdDjd24GjjpRMeuBC3FDmRm+dbUWQCjXKjIxnSx5WXvoed/tqBII47QUU 8ms9XPyOsBqr+x2W8Wz5a0ukgGFqroEDRZUtS5hFD5KGAKWbs3/gbTbXXVYQOaaxBnAv Jp23+MMbbwlJre5pfxt6jNZIJPI9AbFjvNbFhtrejClfyiEMq8FXmwOULMY/1YnaIda4 7nSGVJtDdjOXYhI4GYlmgzrnjojdyGvRxzmHGvHr48tLsxvoECW1tG2TAAfdZCcV5T2s rNEtbIKpx3JakE9H4Z3NBL0G95ee7gcdun2RgLmJpfmoNsMAqdcNiK6eUhc+Ydn6rbnY V8UA== ARC-Authentication-Results: i=1; mx.google.com; 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 k64si7201448pge.113.2018.04.06.07.33.58; Fri, 06 Apr 2018 07:34:13 -0700 (PDT) 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; 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 S932109AbeDFNgW (ORCPT + 99 others); Fri, 6 Apr 2018 09:36:22 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:59162 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932079AbeDFNgU (ORCPT ); Fri, 6 Apr 2018 09:36:20 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id D3094DCD; Fri, 6 Apr 2018 13:36:19 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ondrej Zary , Dmitry Torokhov Subject: [PATCH 4.9 088/102] Input: i8042 - enable MUX on Sony VAIO VGN-CS series to fix touchpad Date: Fri, 6 Apr 2018 15:24:09 +0200 Message-Id: <20180406084343.920281560@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180406084331.507038179@linuxfoundation.org> References: <20180406084331.507038179@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ondrej Zary commit 04bb1719c4de94700056241d4c0fe3c1413f5aff upstream. The touch sensor buttons on Sony VAIO VGN-CS series laptops (e.g. VGN-CS31S) are a separate PS/2 device. As the MUX is disabled for all VAIO machines by the nomux blacklist, the data from touch sensor buttons and touchpad are combined. The protocol used by the buttons is probably similar to the touchpad protocol (both are Synaptics) so both devices get enabled. The controller combines the data, creating a mess which results in random button clicks, touchpad stopping working and lost sync error messages: psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 4 psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 1 psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 1 psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 1 psmouse serio1: TouchPad at isa0060/serio1/input0 lost sync at byte 1 psmouse serio1: issuing reconnect request Add a new i8042_dmi_forcemux_table whitelist with VGN-CS. With MUX enabled, touch sensor buttons are detected as separate device (and left disabled as there's currently no driver), fixing all touchpad problems. Signed-off-by: Ondrej Zary Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/serio/i8042-x86ia64io.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -530,6 +530,20 @@ static const struct dmi_system_id __init { } }; +static const struct dmi_system_id i8042_dmi_forcemux_table[] __initconst = { + { + /* + * Sony Vaio VGN-CS series require MUX or the touch sensor + * buttons will disturb touchpad operation + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "VGN-CS"), + }, + }, + { } +}; + /* * On some Asus laptops, just running self tests cause problems. */ @@ -1230,6 +1244,9 @@ static int __init i8042_platform_init(vo if (dmi_check_system(i8042_dmi_nomux_table)) i8042_nomux = true; + if (dmi_check_system(i8042_dmi_forcemux_table)) + i8042_nomux = false; + if (dmi_check_system(i8042_dmi_notimeout_table)) i8042_notimeout = true;