From patchwork Sun Mar 24 19:10:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladislav Dalechyn X-Patchwork-Id: 10867655 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36E15139A for ; Sun, 24 Mar 2019 19:10:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1528F291FD for ; Sun, 24 Mar 2019 19:10:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 06AD82920A; Sun, 24 Mar 2019 19:10:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7871291FD for ; Sun, 24 Mar 2019 19:10:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726751AbfCXTKn (ORCPT ); Sun, 24 Mar 2019 15:10:43 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:43777 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726317AbfCXTKm (ORCPT ); Sun, 24 Mar 2019 15:10:42 -0400 Received: by mail-lj1-f195.google.com with SMTP id f18so5907226lja.10; Sun, 24 Mar 2019 12:10:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=s4XMDtv4uR2ZMI74IYGqkqsq1j/pfbpeRW5BwCZw+AA=; b=OLuOXJvHT/EJaLXh3NI0fc3BM54QMz9rYngAOeQw3p01XxmGctDQNzKSkyKkk0NDbk qQkHItmqdmyHcIuVKyo/OZy4nhuqpx/t/8T4YNG6h6OG6f+g7hoyo0UtJcwL5I6/IT/+ 6NILrTmlDM/Smdts6elUwZHYJvZHWRNGsffsU1WP0KtWWuzc3/wxavpK15j+FHs3gMk8 jiQXs/UGc/waBtqh4B4AxNtY4UCfYZXCtKFRapZrkRQ3J8/QQ2syDeXmzcVJUOVGv/5W ClBvt16KBOFKaQHBrIlC9XLQ9jB/Yq1DjBp6d22tkErxdUnFNGGlKRS5taJ92O7BQuMF gaVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=s4XMDtv4uR2ZMI74IYGqkqsq1j/pfbpeRW5BwCZw+AA=; b=hvNhKuKCG4it+SnHGXUnqLJqkYI1wjYl+t7vX1ZTyeq1TR4k34McuCpyE20Yo9Rbvk hNmfjs3xZZ8h6JVYcPEXrFbYbyvSxz07e5DDfyrD7m8ivj5AtHXixY8dNpvFLDC22MrD O3D0Ktz3eFT94+BfvooKVuk/BDwVcv3e94tFgIR6qpfPVdI9qQsVu68uGWwWgt4qDh6V N+FQtdsBOVlq4DzEUODGO56xwjg1Bi1pO6+vLO0MRUMP24pt9OMBSwVJIXik9tyUV3+w udysRhvJ3Ieqip1iLrkDXeIDdOSE15qciOtJaAo/YZP/YyB4PSFhibvBG57WRhV2wgif bmeg== X-Gm-Message-State: APjAAAVgC2ramhCXUq7ugZzUDm4Z8/MdEJR68tU+Kib6KkIkZ9cDD17Z XLplseaulBYcuZrbyEYWNhw= X-Google-Smtp-Source: APXvYqxnER9pEOWanbuiJQ/Z+9M/WODKrYWhBk7di8U3JHFsidWH6HxanSJ1u+b2G5gb1nHDbGfmqA== X-Received: by 2002:a2e:42cf:: with SMTP id h76mr11201434ljf.95.1553454640295; Sun, 24 Mar 2019 12:10:40 -0700 (PDT) Received: from parrot.lan ([77.47.204.16]) by smtp.gmail.com with ESMTPSA id x2sm1957228lfg.59.2019.03.24.12.10.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Mar 2019 12:10:39 -0700 (PDT) From: Vladislav Dalechyn X-Google-Original-From: Vladislav Dalechyn To: jikos@kernel.org, benjamin.tissoires@redhat.com, kai.heng.feng@canonical.com, swboyd@chromium.org, bigeasy@linutronix.de, dtor@chromium.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: h0tw4t3r Subject: [PATCH] ELAN touchpad i2c_hid bugs fix Date: Sun, 24 Mar 2019 21:10:35 +0200 Message-Id: <20190324191035.18705-1-hotwater438@tutanota.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: h0tw4t3r Description: The ELAN1200:04F3:303E touchpad exposes several issues, all caused by an error setting the correct IRQ_TRIGGER flag: - i2c_hid incoplete error flood in journalctl; - Five finger tap kill's module so you have to restart it; - Two finger scoll is working incorrect and sometimes even when you raised one of two finger still thinks that you are scrolling Fix all of these with a new quirk that corrects the trigger flag announced by the ACPI tables. (edge-falling). Reason behind moving i2c_hid_init_irq section described below: i2c_hid_init_irq now checks for a quirk, so we must setup the quirks before we init the irq, and we cannot setup the quirk earlier, so we must init the irq later. Signed-off-by: Vladislav Dalechyn --- drivers/hid/hid-ids.h | 1 + drivers/hid/i2c-hid/i2c-hid-core.c | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index b6d93f4ad037..660b4e0e912e 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -389,6 +389,7 @@ #define USB_DEVICE_ID_TOSHIBA_CLICK_L9W 0x0401 #define USB_DEVICE_ID_HP_X2 0x074d #define USB_DEVICE_ID_HP_X2_10_COVER 0x0755 +#define I2C_DEVICE_ID_ELAN_TOUCHPAD 0x303e #define USB_VENDOR_ID_ELECOM 0x056e #define USB_DEVICE_ID_ELECOM_BM084 0x0061 diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c index 90164fed08d3..9b417914411f 100644 --- a/drivers/hid/i2c-hid/i2c-hid-core.c +++ b/drivers/hid/i2c-hid/i2c-hid-core.c @@ -51,6 +51,7 @@ #define I2C_HID_QUIRK_NO_RUNTIME_PM BIT(2) #define I2C_HID_QUIRK_DELAY_AFTER_SLEEP BIT(3) #define I2C_HID_QUIRK_BOGUS_IRQ BIT(4) +#define I2C_HID_QUIRK_FORCE_TRIGGER_FALLING BIT(5) /* flags */ #define I2C_HID_STARTED 0 @@ -182,8 +183,10 @@ static const struct i2c_hid_quirks { I2C_HID_QUIRK_NO_RUNTIME_PM }, { I2C_VENDOR_ID_GOODIX, I2C_DEVICE_ID_GOODIX_01F0, I2C_HID_QUIRK_NO_RUNTIME_PM }, + { USB_VENDOR_ID_ELAN, I2C_DEVICE_ID_ELAN_TOUCHPAD, + I2C_HID_QUIRK_BOGUS_IRQ | I2C_HID_QUIRK_FORCE_TRIGGER_FALLING }, { USB_VENDOR_ID_ELAN, HID_ANY_ID, - I2C_HID_QUIRK_BOGUS_IRQ }, + I2C_HID_QUIRK_BOGUS_IRQ }, { 0, 0 } }; @@ -854,6 +857,8 @@ static int i2c_hid_init_irq(struct i2c_client *client) if (!irq_get_trigger_type(client->irq)) irqflags = IRQF_TRIGGER_LOW; + if (ihid->quirks & I2C_HID_QUIRK_FORCE_TRIGGER_FALLING) + irqflags = IRQF_TRIGGER_FALLING; ret = request_threaded_irq(client->irq, NULL, i2c_hid_irq, irqflags | IRQF_ONESHOT, client->name, ihid); @@ -1123,14 +1128,10 @@ static int i2c_hid_probe(struct i2c_client *client, if (ret < 0) goto err_pm; - ret = i2c_hid_init_irq(client); - if (ret < 0) - goto err_pm; - hid = hid_allocate_device(); if (IS_ERR(hid)) { ret = PTR_ERR(hid); - goto err_irq; + goto err_pm; } ihid->hid = hid; @@ -1149,11 +1150,15 @@ static int i2c_hid_probe(struct i2c_client *client, ihid->quirks = i2c_hid_lookup_quirk(hid->vendor, hid->product); + ret = i2c_hid_init_irq(client); + if (ret < 0) + goto err_mem_free; + ret = hid_add_device(hid); if (ret) { if (ret != -ENODEV) hid_err(client, "can't add hid device: %d\n", ret); - goto err_mem_free; + goto err_irq; } if (!(ihid->quirks & I2C_HID_QUIRK_NO_RUNTIME_PM)) @@ -1161,12 +1166,12 @@ static int i2c_hid_probe(struct i2c_client *client, return 0; +err_irq: + free_irq(client->irq, ihid); + err_mem_free: hid_destroy_device(hid); -err_irq: - free_irq(client->irq, ihid); - err_pm: pm_runtime_put_noidle(&client->dev); pm_runtime_disable(&client->dev);