From patchwork Mon Feb 6 22:12:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastien Nocera X-Patchwork-Id: 53531 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2494561wrn; Mon, 6 Feb 2023 14:24:35 -0800 (PST) X-Google-Smtp-Source: AK7set/gyVmS3f5nqV1l5gnS3GaYUY62xb/RN/cE4aQq2Ss17y/NS+xIzxHefHQttS66H/DG4x2P X-Received: by 2002:a50:8adb:0:b0:4aa:a6a9:3730 with SMTP id k27-20020a508adb000000b004aaa6a93730mr1211427edk.19.1675722274954; Mon, 06 Feb 2023 14:24:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675722274; cv=none; d=google.com; s=arc-20160816; b=nXlKz6BJGHZpPkhMTVJnu+g3QhvJsuKCyDmtY3yM0keZJXLiwWHAIPoLkUG+ijFJ2j Pe+43OdSzlGpGAtRP3P4LF7zzjgOkZD3yq9F9ydgdLm0b+JsHrRK/0vhz2NDlplVFQK/ PaQ1hRMh2z7O+9mxUzHpvsKTHkKp8+xYS5Wx9j/PbU5P2Igwks4Lt3lbv/SFmV6Bcyvv fZDTbTa8A5GGsNiD71TuaQ469cy6Lc+ncb9hZevNmTK4d32W8tKiiW8YCivKObuCUi00 k444Wv5XKmBFXiFlKRmrFp+DSFY/TO73StJgL1SuTSjlvZ8QBgcVWS6WxEpxHnZuHnI5 oaWg== 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=u3uoPJw7v4+uofBGmwYXcYe24yJZXChjjN6h7eUEzng=; b=tOwf4/oQnpjik0+BJbk/zL/RQpzA/KmhioJUQHPdCU4q3aYBIOgtbBVhnrhhs85GHX aCI1GDuqwXjSiBkTHy1AxBFV2scWV0ybMINrsU/ui0ZvqyuyFovmr3E2a50wd1+pEzXK jtmhWJF2uZJUB6BK2ARQHDsxFwxxPvBFSInXSbzKXIff+TWnEjxhtU0cQrF8wgyTkr1U GIs2BvP+Rugo66gaFVTcc5IRyvX4J56gXBFRD+ExA5ZuZ91007qL9RP91z3GN+SPH9jq 85svt7H5PJG9q67IYW6KNlQtXiwiFOsnC9idq15JI9l+sT55pX37FTaxet4mkb6a3mKv eZOg== 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 d16-20020a056402079000b004aabc918760si2264481edy.146.2023.02.06.14.24.12; Mon, 06 Feb 2023 14:24:34 -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 S229847AbjBFWNH (ORCPT + 99 others); Mon, 6 Feb 2023 17:13:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229568AbjBFWNE (ORCPT ); Mon, 6 Feb 2023 17:13:04 -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 E970D1167E; Mon, 6 Feb 2023 14:13:00 -0800 (PST) Received: (Authenticated sender: hadess@hadess.net) by mail.gandi.net (Postfix) with ESMTPSA id 8C04560004; Mon, 6 Feb 2023 22:12:57 +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 v2 1/3] HID: logitech-hidpp: Add more debug statements Date: Mon, 6 Feb 2023 23:12:54 +0100 Message-Id: <20230206221256.129198-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?1757122160533727083?= X-GMAIL-MSGID: =?utf-8?q?1757122160533727083?= This should help us figure out some hairy problems with some devices. Signed-off-by: Bastien Nocera --- Fixed kernel test bot warning: drivers/hid/hid-logitech-hidpp.c: In function 'hidpp_send_fap_command_sync': >> drivers/hid/hid-logitech-hidpp.c:343:25: warning: format '%ld' expects argument of type 'long int', but argument 5 has type 'unsigned int' [-Wformat=] 343 | "Invalid number of parameters passed to command (%d != %ld)\n", | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/hid/hid-logitech-hidpp.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index f44ba7be3cc5..1952d8d3b6b2 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -338,8 +338,13 @@ 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 != %llu)\n", + param_count, + (unsigned long long) sizeof(message->fap.params)); return -EINVAL; + } message = kzalloc(sizeof(struct hidpp_report), GFP_KERNEL); if (!message) @@ -3440,11 +3445,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 22:12:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastien Nocera X-Patchwork-Id: 53529 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2493645wrn; Mon, 6 Feb 2023 14:22:27 -0800 (PST) X-Google-Smtp-Source: AK7set/9yvEbhVmZLLXj4Ttir2Ya4WG5q4bHR3be7cHYytEF4v59EIRMmG6voneIQ6iYQgHSasL7 X-Received: by 2002:a05:6a20:ce1c:b0:bc:e785:5ad5 with SMTP id ic28-20020a056a20ce1c00b000bce7855ad5mr572664pzb.35.1675722147654; Mon, 06 Feb 2023 14:22:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675722147; cv=none; d=google.com; s=arc-20160816; b=PiOfKqWN+b1aD0BfoonFo+upTHQvCDQCqbQI5CZDyLPC3q70LgIo6O5vsJfkjB/lRw b5J7Kx9TO+qnk0Ed0LL2cRbFqA0Jl+IErgH5QehbPyVTW5fawoXX0rQVk1lEicPgACE6 EceRbSMnNXgQc75GzNcpE7fJlN6tlwkcXkcIsGGCOhe7wox77tCuvWjQsp3kKQw8Hs8N GNfdM0nqEwtSemzIIThw8mH/sEyN5xABGBB9+LPaLMLM7FORm74nkQ1StdPXKu/cWV5u eJEKjNmubrppFAtt2O7E0/OrHDnYpHbfnVcAH1M5RCL7YNfG5Lm0SNCx24aVFWsHpcBK qR0w== 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=Zj64pYVuLcQyt++cUm2w4jZgCEbpefE6wT/YaTEa1WA=; b=qLU3J5NuUDhSfF5XhRoP/D+bIPiSy+mrprDtW0yQpImLH+daUSXOrM7ZtqBdfFr0Kl S4Pxyw1jHMACqEehb675AyG/s8BG3aAZAMS4WnftfP35OQqGVZ5hrp+jUrkHI0hTBseX JvTSs9ud9/9K4nsgxMmxGjqcs7udc0srXpilrFoji4i0oNfmfSd0jVyIFahfKtvh+92g gVmk5HF60VgKSXycP6Xkm0i4RVIvcIwAATYNn3Pl3FPUsJgd2sINW/NKy77XPp4SQSTc 0JTFZkfxOeNEItRcvXMAqbvMnKtw3dTiiFw74jEKCt1kt2m262YNsO5CJhyPg9cUCZHs 3ODQ== 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 s17-20020a639251000000b004d422660ff7si13670366pgn.244.2023.02.06.14.22.13; Mon, 06 Feb 2023 14:22:27 -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 S229806AbjBFWNG (ORCPT + 99 others); Mon, 6 Feb 2023 17:13:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229519AbjBFWNE (ORCPT ); Mon, 6 Feb 2023 17:13:04 -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 BD8C211E8A; Mon, 6 Feb 2023 14:13:02 -0800 (PST) Received: (Authenticated sender: hadess@hadess.net) by mail.gandi.net (Postfix) with ESMTPSA id DF99560003; Mon, 6 Feb 2023 22:12:59 +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 v2 2/3] HID: logitech-hidpp: Retry commands when device is busy Date: Mon, 6 Feb 2023 23:12:55 +0100 Message-Id: <20230206221256.129198-2-hadess@hadess.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230206221256.129198-1-hadess@hadess.net> References: <20230206221256.129198-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, 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?1757122026791657783?= X-GMAIL-MSGID: =?utf-8?q?1757122026791657783?= 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 --- Same as v1 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 1952d8d3b6b2..9e94026de437 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 22:12:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastien Nocera X-Patchwork-Id: 53532 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2494660wrn; Mon, 6 Feb 2023 14:24:48 -0800 (PST) X-Google-Smtp-Source: AK7set/ps/SQA6XmrKe/fG/6cFxmMjf4nrp+48qK2/lg1PUkoJMh+uHDw9rnGqM/Mkpiw4DojxQx X-Received: by 2002:a17:906:280f:b0:85f:5d72:1841 with SMTP id r15-20020a170906280f00b0085f5d721841mr864180ejc.39.1675722288026; Mon, 06 Feb 2023 14:24:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675722288; cv=none; d=google.com; s=arc-20160816; b=0OlhCLJHDOFh5q9ylCs1zxvFJ6q6tvOaz4dWR1r7RffeFBpGO+gqEh35rTHUmvT7w4 J9aRa24PRT3vz/BSpfU4yyr5Xw1+nTHtQqOzhDX55+I7amlEX+xibuwJVbb44OQnx9es p/grjpKpfA8Sudaur9fCQWiUXtClIuWYj9dEg9VxDwVg4diaimLI44vtomjWcIv4fhCi Rtwh44Gu+ubM3BSuzutdmfuC3QCdbjKjsRV6shNCtqlD0XXeF0c80GwkbwhZy5YUCjFU KMCWYDk9PHR7uTJUzs7gmeA2U7w05iohBl7loGH2xQ3ef48b50AMPkXaedGR+HiXmK6X tO8Q== 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=wTp47/gBN+5lLMJZozQ5m/SQDDAUP67NFYzSqTMijXA=; b=Hfgw/K7sCumdDt4kpe5BSNx4YWC594AQ53uV9+iXZ8Fttrf/ATztGQ3IFlI86lNV4t llw2Zw6pgsQygLVWmmEI+jpGesU1ptJWziBENMw5jP+MFwghDIBdZiEffbK/nGZboZIt WUgIUicpCVHfO3yzdJVAVhqiJDfdCyNXlAdsrAk+aUWLu9SyBNS2hJa22nr4izRbsG8d Q+oq0AAvYro1NCB5VT7+bFoqUuBiJxN80v2af1FSVx2AisVfcUrdFPqUKwhxWOrDIKUU swchT20Yt2NZySmW5bPH7QHY8L09Cto3VaX8/UykPo7Gv9Dcohqk9ZtzKqFWiLbKRN5T tKCQ== 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 21-20020a170906029500b00882ba4a133esi13223481ejf.404.2023.02.06.14.24.25; Mon, 06 Feb 2023 14:24:48 -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 S229568AbjBFWNJ (ORCPT + 99 others); Mon, 6 Feb 2023 17:13:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229781AbjBFWNF (ORCPT ); Mon, 6 Feb 2023 17:13: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 B315611E96; Mon, 6 Feb 2023 14:13:04 -0800 (PST) Received: (Authenticated sender: hadess@hadess.net) by mail.gandi.net (Postfix) with ESMTPSA id AEAA860006; Mon, 6 Feb 2023 22:13:01 +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 v2 3/3] HID: logitech-hidpp: Add myself to authors Date: Mon, 6 Feb 2023 23:12:56 +0100 Message-Id: <20230206221256.129198-3-hadess@hadess.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230206221256.129198-1-hadess@hadess.net> References: <20230206221256.129198-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?1757122173936698932?= X-GMAIL-MSGID: =?utf-8?q?1757122173936698932?= Signed-off-by: Bastien Nocera --- Same as v1 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 9e94026de437..03b77ca03081 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);