From patchwork Sat Jan 23 18:03:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Filipe_La=C3=ADns?= X-Patchwork-Id: 12041761 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=-23.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, 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 CAA6BC433E0 for ; Sat, 23 Jan 2021 18:04:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9274B22DFA for ; Sat, 23 Jan 2021 18:04:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726151AbhAWSEg (ORCPT ); Sat, 23 Jan 2021 13:04:36 -0500 Received: from mail.archlinux.org ([95.216.189.61]:34388 "EHLO mail.archlinux.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726131AbhAWSEd (ORCPT ); Sat, 23 Jan 2021 13:04:33 -0500 Received: from localhost.localdomain (unknown [IPv6:2001:8a0:f268:e600:5751:e3e4:7880:ec9c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ffy00) by mail.archlinux.org (Postfix) with ESMTPSA id 6D90938F939; Sat, 23 Jan 2021 18:03:48 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-ed25519; t=1611425028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q42KVgTFPR8rBZqsr1Y9WH/B7SfoCRG4aXTrCdBjvuY=; b=IppKFZH4yGpmHh03o30rEwnKRgHjYtBk+nWpHffD08KHbMG8yrimrJLH2ganN69jqEmwcW Z+dUMRKcYLC3iBDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-rsa; t=1611425028; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q42KVgTFPR8rBZqsr1Y9WH/B7SfoCRG4aXTrCdBjvuY=; b=hV70y/yxdZyNLEVsUeXSsLImc7lGO3akNSwJn3hLNx93ufa6OKi7bVq4Df96E6Mr7n17DI FGu6BNjeqykes2hYVuAnQx/MEXMBGM+t4RzzhrSpkVY45fcbm6uZLHE/trYvkrFGC3dVj/ 0DnOrOuGUnIvTJf+GmfeESuZNqpGFhpPbyiTJrUSSsMIhLPQepEDVazwRXjorc0vQzZWA/ mRnTgWUqO/UjaU5g3+uiKSRxM4glcJh3G3ofqjVdWF0oy0+1feTfPyBmyCCttg5e5Eh8N8 0fae6aTHLw4glGbocRZqnyDKxMkZeQnCR9icuJ1X7gjTUt98MfbQyKl2rqAn4epzDowhG5 nUaOUCiGe9icW3Rs+rUvMCoX26RFaniCvScFHsOoPFRY1avwhEHNhy8kU4wPo+e7bHqQAA 2dpttwNCBYBKgQK74S4FHiv5tqYST/DC1JxwEmMH9SkJX1KwOxIPlIZJ4iW8+eGq95451b OCH4N17zjK+pX2KLFWjwblkwMmF83IAIPjfnpPRit2k7LQNxyJbSAaRwZHZwYAJFZ7NYHU HpvCgmO3sfhdM/Gixnj5VBndnRNg7qinavWUVM8YGO6lZMEt/l1lxegdQXi+4gXAxUv/Vd 1R9Xd382VG+drJnPUue7aaGsPcV3TDxj8WvPa73cAildhQoFkq4Fs= From: =?utf-8?q?Filipe_La=C3=ADns?= To: Jiri Kosina , Benjamin Tissoires , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Filipe_La=C3=ADns?= Subject: [PATCH 1/2] HID: logitech-dj: add support for the new lightspeed receiver iteration Date: Sat, 23 Jan 2021 18:03:33 +0000 Message-Id: <20210123180334.3062995-1-lains@archlinux.org> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Authentication-Results: mail.archlinux.org; auth=pass smtp.auth=ffy00 smtp.mailfrom=lains@archlinux.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Filipe Laíns Tested with the G Pro X Superlight. libratbag sees the device, as expected, and input events are passing trough. https://github.com/libratbag/libratbag/pull/1122 The receiver has a quirk where the moused interface doesn't have a report ID, I am not sure why, perhaps they forgot. All other interfaces have report IDs so I am left scratching my head. Since this driver doesn't have a quirk system, I simply implemented it as a different receiver type, which is true, it just wouldn't be the prefered approach :P Signed-off-by: Filipe Laíns --- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-logitech-dj.c | 49 +++++++++++++++++++++++++---------- 2 files changed, 37 insertions(+), 13 deletions(-) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 4c5f23640f9c..8eac3c93fa38 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -803,6 +803,7 @@ #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1 0xc539 #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1 0xc53f #define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_POWERPLAY 0xc53a +#define USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_2 0xc547 #define USB_DEVICE_ID_SPACETRAVELLER 0xc623 #define USB_DEVICE_ID_SPACENAVIGATOR 0xc626 #define USB_DEVICE_ID_DINOVO_DESKTOP 0xc704 diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c index 1401ee2067ca..6596c81947a8 100644 --- a/drivers/hid/hid-logitech-dj.c +++ b/drivers/hid/hid-logitech-dj.c @@ -114,6 +114,7 @@ enum recvr_type { recvr_type_dj, recvr_type_hidpp, recvr_type_gaming_hidpp, + recvr_type_gaming_hidpp_missing_mse_report_id, /* lightspeed receiver missing the mouse report ID */ recvr_type_mouse_only, recvr_type_27mhz, recvr_type_bluetooth, @@ -1360,6 +1361,7 @@ static int logi_dj_ll_parse(struct hid_device *hid) dbg_hid("%s: sending a mouse descriptor, reports_supported: %llx\n", __func__, djdev->reports_supported); if (djdev->dj_receiver_dev->type == recvr_type_gaming_hidpp || + djdev->dj_receiver_dev->type == recvr_type_gaming_hidpp_missing_mse_report_id || djdev->dj_receiver_dev->type == recvr_type_mouse_only) rdcat(rdesc, &rsize, mse_high_res_descriptor, sizeof(mse_high_res_descriptor)); @@ -1605,19 +1607,35 @@ static int logi_dj_raw_event(struct hid_device *hdev, data[0] = data[1]; data[1] = 0; } - /* - * Mouse-only receivers send unnumbered mouse data. The 27 MHz - * receiver uses 6 byte packets, the nano receiver 8 bytes. - */ - if (djrcv_dev->unnumbered_application == HID_GD_MOUSE && - size <= 8) { - u8 mouse_report[9]; - - /* Prepend report id */ - mouse_report[0] = REPORT_TYPE_MOUSE; - memcpy(mouse_report + 1, data, size); - logi_dj_recv_forward_input_report(hdev, mouse_report, - size + 1); + + + if (djrcv_dev->unnumbered_application == HID_GD_MOUSE) { + /* + * Mouse-only receivers send unnumbered mouse data. The 27 MHz + * receiver uses 6 byte packets, the nano receiver 8 bytes. + */ + if (size <= 8) { + u8 mouse_report[9]; + + /* Prepend report id */ + mouse_report[0] = REPORT_TYPE_MOUSE; + memcpy(mouse_report + 1, data, size); + logi_dj_recv_forward_input_report(hdev, mouse_report, + size + 1); + + /* + * A variant of the ligtpseed receivers is missing the mouse + * report ID. + */ + } else if (djrcv_dev->type == recvr_type_gaming_hidpp_missing_mse_report_id) { + u8 mouse_report[17]; + + /* Prepend report id */ + mouse_report[0] = REPORT_TYPE_MOUSE; + memcpy(mouse_report + 1, data, size); + logi_dj_recv_forward_input_report(hdev, mouse_report, + size + 1); + } } return false; @@ -1688,6 +1706,7 @@ static int logi_dj_probe(struct hid_device *hdev, case recvr_type_dj: no_dj_interfaces = 3; break; case recvr_type_hidpp: no_dj_interfaces = 2; break; case recvr_type_gaming_hidpp: no_dj_interfaces = 3; break; + case recvr_type_gaming_hidpp_missing_mse_report_id: no_dj_interfaces = 3; break; case recvr_type_mouse_only: no_dj_interfaces = 2; break; case recvr_type_27mhz: no_dj_interfaces = 2; break; case recvr_type_bluetooth: no_dj_interfaces = 2; break; @@ -1886,6 +1905,10 @@ static const struct hid_device_id logi_dj_receivers[] = { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_1), .driver_data = recvr_type_gaming_hidpp}, + { /* Logitech lightspeed receiver (0xc547) */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, + USB_DEVICE_ID_LOGITECH_NANO_RECEIVER_LIGHTSPEED_1_2), + .driver_data = recvr_type_gaming_hidpp_missing_mse_report_id}, { /* Logitech 27 MHz HID++ 1.0 receiver (0xc513) */ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER), .driver_data = recvr_type_27mhz}, From patchwork Sat Jan 23 18:03:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Filipe_La=C3=ADns?= X-Patchwork-Id: 12041763 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=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,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 D9C78C433DB for ; Sat, 23 Jan 2021 18:04:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AD1C4230FC for ; Sat, 23 Jan 2021 18:04:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726198AbhAWSEl (ORCPT ); Sat, 23 Jan 2021 13:04:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725765AbhAWSEf (ORCPT ); Sat, 23 Jan 2021 13:04:35 -0500 Received: from mail.archlinux.org (mail.archlinux.org [IPv6:2a01:4f9:c010:3052::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5BDBC06174A; Sat, 23 Jan 2021 10:03:54 -0800 (PST) Received: from localhost.localdomain (unknown [IPv6:2001:8a0:f268:e600:5751:e3e4:7880:ec9c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ffy00) by mail.archlinux.org (Postfix) with ESMTPSA id 8C46A38F93A; Sat, 23 Jan 2021 18:03:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-rsa; t=1611425031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pUy5GRn6iAd0774+zrvt/xxLsLy5Gfph7I887BlZzNk=; b=UZgc6Oy5ZTKAZ8K/7Ctl9s4xaalUQ0/9rnhUoQKQ9dN/pOd+gSILq86FxTlF373Yq95WTE M8B4qA++psNGCpoNBzAOJ2RYYY4ToMrqyW3qb0BRS5XWMDmJIKNOYPDFWU6B4Vh0M6MQRp OAWaInpTQ5oKvRt0QqToPpScvHrBDvOFl/LNpn5rcB9AAX5PvdZd8IsxaooHjC29kIt7vc YhznEn0vC55BTOFJCUGakum85SweF6/ld8T3hMEJuJaJSF5lh6JaSOuCp7lPV2qyUT1a+X Gwn3WrA08+xUc/fTZ6JJFAlsXXQw3QvksNQ87DI7n2KajOS31N22okwNAyCjiWpCvlirQP DWByboxNTxXanzIEMWlQzI+31lERsSZsBedO5U7aHHMh2WmDduuttOC1t3KkDnyLiH27XP FR/HZGgur73cThhoVBHPgP8Rd75scZ5Z3NocF8K/Vu1ooj3N7r/JG7vGwlm8KljTxwONIP 1uHr9I17w3Gi369Y6ECbyuvwql5yC39l2i6lXtt63xGp87WI3a+1MnY//LqdcjYtIqqvWM Hq71RHSYmERhfGL4L0o3TlDlhL4pHoA0dNZAx1FbRo5qAG/3NVOsuRn3M55aTNpqMTFIH6 MR7k75vXgFTcHeeRdF3yXtV2cwOhEG49zwRsWN0qfT/IapMQtiQIM= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=archlinux.org; s=dkim-ed25519; t=1611425031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pUy5GRn6iAd0774+zrvt/xxLsLy5Gfph7I887BlZzNk=; b=noC/7x4rdVIF6TIIpPH6gRDnKKvdwV8Dh1v1QhdRRC+my3IExMwH+AujrLW22mX6LXKjM0 hIi/YnKi2uRn2SAw== From: =?utf-8?q?Filipe_La=C3=ADns?= To: Jiri Kosina , Benjamin Tissoires , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?utf-8?q?Filipe_La=C3=ADns?= Subject: [PATCH 2/2] HID: logitech-hidpp: add support for the G Pro X Superlight over USB Date: Sat, 23 Jan 2021 18:03:34 +0000 Message-Id: <20210123180334.3062995-2-lains@archlinux.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210123180334.3062995-1-lains@archlinux.org> References: <20210123180334.3062995-1-lains@archlinux.org> MIME-Version: 1.0 Authentication-Results: mail.archlinux.org; auth=pass smtp.auth=ffy00 smtp.mailfrom=lains@archlinux.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Filipe Laíns Tested and is working :) Signed-off-by: Filipe Laíns --- drivers/hid/hid-logitech-hidpp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 291c6b4d26b7..54a289510a7d 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -4268,6 +4268,8 @@ static const struct hid_device_id hidpp_devices[] = { .driver_data = HIDPP_QUIRK_CLASS_G920 | HIDPP_QUIRK_FORCE_OUTPUT_REPORTS}, { /* Logitech G Pro Gaming Mouse over USB */ HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC088) }, + { /* Logitech G Pro X Superlight Gaming Mouse over USB */ + HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0xC094) }, { /* MX5000 keyboard over Bluetooth */ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb305),