From patchwork Mon Feb 6 13:58:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastien Nocera X-Patchwork-Id: 53277 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2251621wrn; Mon, 6 Feb 2023 06:04:13 -0800 (PST) X-Google-Smtp-Source: AK7set/mnKDa0f6sKUZvPmt8ezf7RqTzcFDNYUDX5432MLYCJicf9D2ITqYTd86OoOOiU2e3B7A1 X-Received: by 2002:a17:903:24c:b0:198:94cb:82a5 with SMTP id j12-20020a170903024c00b0019894cb82a5mr21846912plh.4.1675692253029; Mon, 06 Feb 2023 06:04:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675692253; cv=none; d=google.com; s=arc-20160816; b=rarw6uBuqF7xftKJtj/Iz584eJzhYkTxxXDZ1FUUVqaQwN3jG3Xyz59S6TUqV+dYF2 o/0hncDdxOWuNzZJLB4T3JdXEX/at3QEtI2m3Dvwn2Q1AZVd8vQ5VhTqWy2HBT2y9IDE We5i1C6rFEFaCiSlues1qa8ZUfjJT1V8+SJdXjrPWYWgg74q99IlzVRXnCfVICIEXig6 AAEgS/Cli17LhJqfYILGu0uJqRasJvRHblkrDTy1br1y3bejOxnIFGA5bx/3BBHqGbk+ 5CmI3Qpc20wwcaPYTF047e1rMBHcWQCEjL7ECq4iKqYKYTQSOhVUSTY8aFlMqOlhung+ /qzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=g+y/j4PthGHY3Kj30JZXm8rTp7ymhl+JIKD3xUQCDQg=; b=ZSGit2bxwH5J5hyPo+T2+t3k8/RCzAAK5PqTBEPsQKZOzlyeVvR5T+lrmLUlo1njuT n2chuER14eflYwISzLngQtG2BmPSbT1uDHcX6Zn96019YoQkpY/ZIp1MwIXDdskyHu8f 5zAQjHe8rFb9RdvJgM0hghZ2bQugrf8pL3uC17yd6HKuqDZWHVgDJIJ/3CMsLc4vCW/i VJmyFaxoFx0K4+3RRCySHgfRodMK5KAvRW+OWQPkfF+7n87izMgsDl735/X7A71KwSgD F5lAUUBRvvjgIKiWAPcbtAyZBX1VSGVTnXrfHnfcvSKp8zWlIYYJoC20CDAJ1kNkc4wS hG3A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n18-20020a170902d2d200b0019623669853si13006893plc.576.2023.02.06.06.03.59; Mon, 06 Feb 2023 06:04:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229727AbjBFN7O (ORCPT + 99 others); Mon, 6 Feb 2023 08:59:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229763AbjBFN67 (ORCPT ); Mon, 6 Feb 2023 08:58:59 -0500 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2395C279BA; Mon, 6 Feb 2023 05:58:15 -0800 (PST) Received: (Authenticated sender: hadess@hadess.net) by mail.gandi.net (Postfix) with ESMTPSA id D532A60003; Mon, 6 Feb 2023 13:58:09 +0000 (UTC) From: Bastien Nocera To: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , "Peter F . Patel-Schneider" , =?utf-8?q?Filipe_La?= =?utf-8?q?=C3=ADns?= , Nestor Lopez Casado Subject: [PATCH 1/3] HID: logitech-hidpp: Add more debug statements Date: Mon, 6 Feb 2023 14:58:06 +0100 Message-Id: <20230206135808.8840-1-hadess@hadess.net> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757090679776040410?= X-GMAIL-MSGID: =?utf-8?q?1757090679776040410?= This should help us figure out some hairy problems with some devices. Signed-off-by: Bastien Nocera --- drivers/hid/hid-logitech-hidpp.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index f44ba7be3cc5..6386d3f023ca 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -338,8 +338,12 @@ static int hidpp_send_fap_command_sync(struct hidpp_device *hidpp, struct hidpp_report *message; int ret; - if (param_count > sizeof(message->fap.params)) + if (param_count > sizeof(message->fap.params)) { + hid_dbg(hidpp->hid_dev, + "Invalid number of parameters passed to command (%d != %ld)\n", + param_count, sizeof(message->fap.params)); return -EINVAL; + } message = kzalloc(sizeof(struct hidpp_report), GFP_KERNEL); if (!message) @@ -3440,11 +3444,17 @@ static int hi_res_scroll_enable(struct hidpp_device *hidpp) ret = hidpp10_enable_scrolling_acceleration(hidpp); multiplier = 8; } - if (ret) + if (ret) { + hid_dbg(hidpp->hid_dev, + "Could not enable hi-res scrolling: %d\n", ret); return ret; + } - if (multiplier == 0) + if (multiplier == 0) { + hid_dbg(hidpp->hid_dev, + "Invalid multiplier 0 from device, setting it to 1\n"); multiplier = 1; + } hidpp->vertical_wheel_counter.wheel_multiplier = multiplier; hid_dbg(hidpp->hid_dev, "wheel multiplier = %d\n", multiplier); From patchwork Mon Feb 6 13:58:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastien Nocera X-Patchwork-Id: 53281 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2251937wrn; Mon, 6 Feb 2023 06:04:39 -0800 (PST) X-Google-Smtp-Source: AK7set9+wSQMpKWLQVy7ZhjgK4leS3gl9fy5TDWKc0afQdmyjZd7+0kHll19rw0aCu0+z/I3CMzC X-Received: by 2002:a05:6a21:3a86:b0:b6:40ae:823e with SMTP id zv6-20020a056a213a8600b000b640ae823emr21345663pzb.5.1675692279502; Mon, 06 Feb 2023 06:04:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675692279; cv=none; d=google.com; s=arc-20160816; b=R8vAeLJB2YPToygOGpvXpY7QXzYtn54XiCuXjc7NFP7Uh26DavZJOXNEZqv003ub91 chVsqSzRzLe0I8dHjLjotjGWhhZA0HLCsVLrJpyegZkpOte04aHMLiah9knbitm+mtk3 iXg81nRmHR4s93TVJ44BvZE3MsChyvxiUhJM0GX/OApkkl+5BMCTrFxzwomxsm9Zvxjf NCFGc2Dj1a/cmEtbdR0rAgYrwYxXrKQuZwyeqBhbClbE2LosXXWAG3ZPuNKxwDICCiNj 7fdmXUFvyX1w0tX3qTEE5DBwE/0m/9kVf2ouhzq2xp1wCPh+KL5HlpDZAAMA/QE2dcAT sruA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=fQfROqObbYzkbeaDSfY6Gip7EqHisQIvJ3wDE7yee50=; b=EWkKZ6QjOXTvxacoOG7LUtN34ml8CtxyMtDiXOq+2tq6AZEkSJO3/sE1+muoy91w7p xvMCaAfVnTd/ZZwAtA7mJRjv1MCopHZB7TjPHjQwz82imNOwTo8F6iOyeQnYA7/bCvBI L8KTuNr8/oOk0ts1a2mdnHMtdk+LlX+tTBo0PzY4K4oAM+dGGtPa4tv2oh//MkCXw+93 0l0J6ZP5dpS36WUp8bmn2959+ugZWfqozfk8pfL/Qw61AvybNZqcKo3MLCJIvjA5tc6X NiZiUHUVJMr3ekYixPmjOVC1JmAqAArRrKIXEuuuxWRiM66jACDKtAnEqgmbB/9Lhi2K Iadg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t71-20020a63814a000000b004f2d18b40dbsi12087644pgd.79.2023.02.06.06.04.02; Mon, 06 Feb 2023 06:04:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229941AbjBFN7R (ORCPT + 99 others); Mon, 6 Feb 2023 08:59:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229744AbjBFN7E (ORCPT ); Mon, 6 Feb 2023 08:59:04 -0500 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::223]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07B7B212BA; Mon, 6 Feb 2023 05:58:19 -0800 (PST) Received: (Authenticated sender: hadess@hadess.net) by mail.gandi.net (Postfix) with ESMTPSA id D244E60005; Mon, 6 Feb 2023 13:58:14 +0000 (UTC) From: Bastien Nocera To: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , "Peter F . Patel-Schneider" , =?utf-8?q?Filipe_La?= =?utf-8?q?=C3=ADns?= , Nestor Lopez Casado Subject: [PATCH 2/3] HID: logitech-hidpp: Retry commands when device is busy Date: Mon, 6 Feb 2023 14:58:07 +0100 Message-Id: <20230206135808.8840-2-hadess@hadess.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230206135808.8840-1-hadess@hadess.net> References: <20230206135808.8840-1-hadess@hadess.net> MIME-Version: 1.0 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757090707555564728?= X-GMAIL-MSGID: =?utf-8?q?1757090707555564728?= Handle the busy error coming from the device or receiver. The documentation says a busy error can be returned when: " Device (or receiver) cannot answer immediately to this request for any reason i.e: - already processing a request from the same or another SW - pipe full " Signed-off-by: Bastien Nocera --- drivers/hid/hid-logitech-hidpp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 6386d3f023ca..ef497a82fe4e 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -295,6 +295,7 @@ static int hidpp_send_message_sync(struct hidpp_device *hidpp, */ *response = *message; +retry: ret = __hidpp_send_report(hidpp->hid_dev, message); if (ret) { @@ -321,6 +322,10 @@ static int hidpp_send_message_sync(struct hidpp_device *hidpp, response->report_id == REPORT_ID_HIDPP_VERY_LONG) && response->fap.feature_index == HIDPP20_ERROR) { ret = response->fap.params[1]; + if (ret == HIDPP20_ERROR_BUSY) { + dbg_hid("%s:got busy hidpp 2.0 error %02X, retrying\n", __func__, ret); + goto retry; + } dbg_hid("%s:got hidpp 2.0 error %02X\n", __func__, ret); goto exit; } From patchwork Mon Feb 6 13:58:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastien Nocera X-Patchwork-Id: 53278 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2251653wrn; Mon, 6 Feb 2023 06:04:16 -0800 (PST) X-Google-Smtp-Source: AK7set+7zUQvpDwxVMHLc3q/bwelwW4GXP3bxo+7KYvIoF08ZOumXHft4lLRp61ioCSsPGGfePG9 X-Received: by 2002:a17:902:e404:b0:199:109e:81d with SMTP id m4-20020a170902e40400b00199109e081dmr3589057ple.23.1675692256410; Mon, 06 Feb 2023 06:04:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675692256; cv=none; d=google.com; s=arc-20160816; b=0+Qc6Nsfsw192EFWw2al1zjH90IhI5KJJF0tB5zBjGiKXvvHXfxc6YD/Pe/41DDqbV D6iKd7CBA2cZCjr7x1EtLrGAoakDS/M5Jfz2sY2jKOiLNgR8gpVhl5QLSKl9VHq8z9ZW 7Q7dti04NEfcf375MPKnnxtmFEgzaVaj8CgzGpK0t0M6GPltwB+Qr1iL/yiJZMyh23CS 4lJUJ9YQ72EKDt8GiszwT4UUmBRdJqSjRwMtfSPchyjuPbs2Qh8lO2uMfDRwqSDX8I8b oZVBf8UCpvv0lE4U7QTGnrXAJ++HmyFMn8q8N+kwWxtIdXCj/pY9lM1WJkhN7O1IQwlA lmag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=iqN8WS2ep8kM4Oej1B7TTOQ8txTw+sCB8AxVnpENc44=; b=m9XsK0rLk7NKuqq5EpySj83SF19mpVqI8PVDC1rG3xAbVqTol5aXS6xHKwARiKO7IU dhTK8UpvPtzSsCrt9+IfYsSs4HruqbjMkhk4HYKWpdGwg+4oAVLCLTxNJRQfS94r/zOB kaqD3Dg4iJt9KuhTYDtJfdUNaYOEuu1LAIv5GQuT5xAIf4yVQ5YpqzC+urfwBfH8kSUw 9SUH0xr6y1mYjz++TkfEet+lE4IR9Q0zejuaGj7FeMvn3xubi3dF5mYMJg+3/IJuRlW0 x4+hMJYW8zvAu9OFglLKblmn38X6bgrB44dwOM9oVKtkAGwC00cPoP4RPUsfYotCvBww it3Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c11-20020a170902b68b00b00182d9015d42si10413177pls.225.2023.02.06.06.04.03; Mon, 06 Feb 2023 06:04:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230006AbjBFN7T (ORCPT + 99 others); Mon, 6 Feb 2023 08:59:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229944AbjBFN7F (ORCPT ); Mon, 6 Feb 2023 08:59:05 -0500 Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::223]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D94EEB46; Mon, 6 Feb 2023 05:58:22 -0800 (PST) Received: (Authenticated sender: hadess@hadess.net) by mail.gandi.net (Postfix) with ESMTPSA id 68B246000A; Mon, 6 Feb 2023 13:58:18 +0000 (UTC) From: Bastien Nocera To: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jiri Kosina , Benjamin Tissoires , "Peter F . Patel-Schneider" , =?utf-8?q?Filipe_La?= =?utf-8?q?=C3=ADns?= , Nestor Lopez Casado Subject: [PATCH 3/3] HID: logitech-hidpp: Add myself to authors Date: Mon, 6 Feb 2023 14:58:08 +0100 Message-Id: <20230206135808.8840-3-hadess@hadess.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230206135808.8840-1-hadess@hadess.net> References: <20230206135808.8840-1-hadess@hadess.net> MIME-Version: 1.0 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757090683368169977?= X-GMAIL-MSGID: =?utf-8?q?1757090683368169977?= Signed-off-by: Bastien Nocera --- drivers/hid/hid-logitech-hidpp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index ef497a82fe4e..fa0c8d1a89e3 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -30,6 +30,7 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR("Benjamin Tissoires "); MODULE_AUTHOR("Nestor Lopez Casado "); +MODULE_AUTHOR("Bastien Nocera "); static bool disable_tap_to_click; module_param(disable_tap_to_click, bool, 0644);