From patchwork Fri Dec 4 15:29:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 11951855 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B74C7C433FE for ; Fri, 4 Dec 2020 15:30:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 78C1D22B42 for ; Fri, 4 Dec 2020 15:30:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730365AbgLDPaP (ORCPT ); Fri, 4 Dec 2020 10:30:15 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:41498 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727997AbgLDPaO (ORCPT ); Fri, 4 Dec 2020 10:30:14 -0500 Received: from [111.196.65.193] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1klD1X-0002pv-M5; Fri, 04 Dec 2020 15:29:32 +0000 From: Hui Wang To: linux-input@vger.kernel.org, jikos@kernel.org, benjamin.tissoires@redhat.com Subject: [PATCH 1/2] HID: i2c-hid: expand the quirk lookup table to support dmi_table Date: Fri, 4 Dec 2020 23:29:11 +0800 Message-Id: <20201204152912.151604-1-hui.wang@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org After adding the dmi_table, we could apply the quirk to the specific machine, and the dmi_table is optional when define a quirk table, if not define the dmi_table, the lookup_quirk() works the same as before. Signed-off-by: Hui Wang --- drivers/hid/i2c-hid/i2c-hid-core.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c index aeff1ffb0c8b..953877cf1051 100644 --- a/drivers/hid/i2c-hid/i2c-hid-core.c +++ b/drivers/hid/i2c-hid/i2c-hid-core.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -166,6 +167,7 @@ static const struct i2c_hid_quirks { __u16 idVendor; __u16 idProduct; __u32 quirks; + const struct dmi_system_id *dmi_table; } i2c_hid_quirks[] = { { USB_VENDOR_ID_WEIDA, HID_ANY_ID, I2C_HID_QUIRK_SET_PWR_WAKEUP_DEV }, @@ -188,21 +190,20 @@ static const struct i2c_hid_quirks { * i2c_hid_lookup_quirk: return any quirks associated with a I2C HID device * @idVendor: the 16-bit vendor ID * @idProduct: the 16-bit product ID + * @table: struct i2c_hid_quirks table pointer + * @len: the 32-bit table length * * Returns: a u32 quirks value. */ -static u32 i2c_hid_lookup_quirk(const u16 idVendor, const u16 idProduct) +static u32 i2c_hid_lookup_quirk(const u16 idVendor, const u16 idProduct, + const struct i2c_hid_quirks *table, u32 len) { - u32 quirks = 0; - int n; + for (; len > 0; len--, table++) + if (table->idVendor == idVendor && table->idProduct == idProduct) + if (!table->dmi_table || dmi_check_system(table->dmi_table)) + return table->quirks; - for (n = 0; i2c_hid_quirks[n].idVendor; n++) - if (i2c_hid_quirks[n].idVendor == idVendor && - (i2c_hid_quirks[n].idProduct == (__u16)HID_ANY_ID || - i2c_hid_quirks[n].idProduct == idProduct)) - quirks = i2c_hid_quirks[n].quirks; - - return quirks; + return 0; } static int __i2c_hid_command(struct i2c_client *client, @@ -1133,7 +1134,8 @@ static int i2c_hid_probe(struct i2c_client *client, client->name, hid->vendor, hid->product); strlcpy(hid->phys, dev_name(&client->dev), sizeof(hid->phys)); - ihid->quirks = i2c_hid_lookup_quirk(hid->vendor, hid->product); + ihid->quirks = i2c_hid_lookup_quirk(hid->vendor, hid->product, i2c_hid_quirks, + ARRAY_SIZE(i2c_hid_quirks)); ret = hid_add_device(hid); if (ret) { From patchwork Fri Dec 4 15:29:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 11951857 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8E0DEC4361A for ; Fri, 4 Dec 2020 15:30:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4AB8C22B40 for ; Fri, 4 Dec 2020 15:30:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730378AbgLDPaU (ORCPT ); Fri, 4 Dec 2020 10:30:20 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:41510 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727997AbgLDPaU (ORCPT ); Fri, 4 Dec 2020 10:30:20 -0500 Received: from [111.196.65.193] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1klD1d-0002pv-K9; Fri, 04 Dec 2020 15:29:38 +0000 From: Hui Wang To: linux-input@vger.kernel.org, jikos@kernel.org, benjamin.tissoires@redhat.com Subject: [PATCH 2/2] HID: i2c-hid: Add a quirk to keep the power in shutdown Date: Fri, 4 Dec 2020 23:29:12 +0800 Message-Id: <20201204152912.151604-2-hui.wang@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201204152912.151604-1-hui.wang@canonical.com> References: <20201204152912.151604-1-hui.wang@canonical.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org On the latest Thinkpad Yoga laptop, the touchscreen module is wacom I2C WACF2200 (056a:5276), we found the touchscreen could not work after rebooting, needs to poweroff the machine then poweron the machine to let it work. It is highly possible that this is a BIOS issue, but the windows doesn't have this problem with the same BIOS. If keeping the power on when calling shutdown, the touchscreen could work after rebooting. Let us add a quirk for it and apply the quirk to this machine only. Signed-off-by: Hui Wang --- drivers/hid/hid-ids.h | 1 + drivers/hid/i2c-hid/i2c-hid-core.c | 20 ++++++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index f170feaac40b..ecc1d4040b6f 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -1223,6 +1223,7 @@ #define USB_VENDOR_ID_WACOM 0x056a #define USB_DEVICE_ID_WACOM_GRAPHIRE_BLUETOOTH 0x81 #define USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH 0x00BD +#define USB_DEVICE_ID_WACOM_5276 0x5276 #define USB_VENDOR_ID_WALTOP 0x172f #define USB_DEVICE_ID_WALTOP_SLIM_TABLET_5_8_INCH 0x0032 diff --git a/drivers/hid/i2c-hid/i2c-hid-core.c b/drivers/hid/i2c-hid/i2c-hid-core.c index 953877cf1051..7c6d5b8175fd 100644 --- a/drivers/hid/i2c-hid/i2c-hid-core.c +++ b/drivers/hid/i2c-hid/i2c-hid-core.c @@ -51,7 +51,7 @@ #define I2C_HID_QUIRK_BOGUS_IRQ BIT(4) #define I2C_HID_QUIRK_RESET_ON_RESUME BIT(5) #define I2C_HID_QUIRK_BAD_INPUT_SIZE BIT(6) - +#define I2C_HID_QUIRK_KEEP_PWR_ON_SHUTDOWN BIT(7) /* flags */ #define I2C_HID_STARTED 0 @@ -183,6 +183,20 @@ static const struct i2c_hid_quirks { I2C_HID_QUIRK_RESET_ON_RESUME }, { USB_VENDOR_ID_ITE, I2C_DEVICE_ID_ITE_LENOVO_LEGION_Y720, I2C_HID_QUIRK_BAD_INPUT_SIZE }, + { + .idVendor = USB_VENDOR_ID_WACOM, + .idProduct = USB_DEVICE_ID_WACOM_5276, + .quirks = I2C_HID_QUIRK_KEEP_PWR_ON_SHUTDOWN, + .dmi_table = (const struct dmi_system_id []) { + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "LENOVO_MT_20XY_BU_Think_FM_ThinkPad X1 Yoga Gen 6"), + } + }, + {} + } + }, { 0, 0 } }; @@ -1182,7 +1196,9 @@ static void i2c_hid_shutdown(struct i2c_client *client) { struct i2c_hid *ihid = i2c_get_clientdata(client); - i2c_hid_set_power(client, I2C_HID_PWR_SLEEP); + if (!(ihid->quirks & I2C_HID_QUIRK_KEEP_PWR_ON_SHUTDOWN)) + i2c_hid_set_power(client, I2C_HID_PWR_SLEEP); + free_irq(client->irq, ihid); i2c_hid_acpi_shutdown(&client->dev);