From nobody Sat Jun 13 23:22:56 2026 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4E74E37F729 for ; Sat, 13 Jun 2026 17:51:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781373095; cv=none; b=NkXhNuKRQRBDwm5F+zH0ZNFe+5Hry9mRWIg9T/2nsYa5by6W17+GAPd352dar4lFgaIANqP7em3oBwFaCKMuwfJ4l9KbE/gAvjnxbDClYRhtjgyFWLmQAJZannSTGHLKZFM04+JeefcHmq2tvhvXf5UOSf0P4QoD9qhsNO1Wx70= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781373095; c=relaxed/simple; bh=9fOEpCdtDPZj2/ByXdkYWFrdKspWVJGHief7s9/d0k0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OltjiXeIU7wPqnSr/b7Z7pnHAZhY1T975tgtn6DR9+dnGoRlk+71cC5G9SCqbA6vZz0QS73/oIGlW8ctrD6mQv6aM5QQwNaOkmOCefIX4NoK4sJgwuQ0j1jlbdmHG0J4UcCB6SdzJZPw95ccOoZ6t8dzEmotaugSEBAo2G8pfcc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ekW7Z0RV; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ekW7Z0RV" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-490aaeabdb4so12945995e9.1 for ; Sat, 13 Jun 2026 10:51:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781373089; x=1781977889; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AehxM0UNqEe5kZS7d7XUHl9pA6EObzolVsbGhBp0Kys=; b=ekW7Z0RVCH0BC5TZxyc6cULRuRKKXM0HPe87wdns91XjT5/Qz777+O6hwW7FRijcIB 5MhFaZVBxVJE/HvZPvHw7mF4sq2qp/KQfr26zDrPRATMyHxoq9VFZHyIqA+b5pDtVqkz WclZsYTD/IlzL0+Gozv/A/m/sYymLzHM1K8JHG/3MZJLHMNtIla25HacepB45n0NLglf v68Q3S+Dmi+zO/VRnOxp38bCcdCcV37jilKPijlDZZxXWhK4wVSCBly9J+OpCLZLyg7j y17NGfVf4Xc/fF7btxqInMYrCgeiRpiEfxL6N6Fn812eE6A0PADqWWFcHMvm4Bs06cNm JvCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781373089; x=1781977889; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=AehxM0UNqEe5kZS7d7XUHl9pA6EObzolVsbGhBp0Kys=; b=JFNflM6yckIvDBkBfSywiFneZ3zt3AaMecKY3bBj22WDp3tH/QfR0rN7fhgyiawne9 cuBx03vnAVqOQL6mJiO8nA5Fq3Xv6kw2atz8O/jMlnkOd0pbY7jyddYRAvc7oe6uGYip FGdjCekTJa+8aVbuHF9lDPyi1U8qbGRL4wjt8BlMHRxPd9brlpOd/kLgeaCIaH/cbDXp MNhrXrMGDDXd3X0ejuvgt9JtIotzXulrJusjn/+/+/LZSDfh0Jo9Mcw9ZcOPPZstolll X9vmcZtK/N4e641ScWV89fv61K4MTV/zSCGL6iVBZuttxGEVGX225n98wYq3D4EGLA9v JkfA== X-Forwarded-Encrypted: i=1; AFNElJ9RGgJijhHPSvzgP6aFdV4I5X7xvgXAMtHSmSIBA3DT3YgVpTJNw/OVsu4YY+BW5tqAUbWFt8wJK6wTBis=@vger.kernel.org X-Gm-Message-State: AOJu0YyMABKZxaKlshZLs7Z43o3GbOx4/MvGElw+qiyqOp330hHmj1YM AHD5sx5ltiOG1GTLWr2Eb8DfC7Q7EOVnRuShM4bByMM9ukfx3ZmDV2qF X-Gm-Gg: Acq92OFEsiNqILi8NANH8KSw9CgkoJ5YATUmUu56BmDAinG+2IaXGaGs0FlJNU8ZKJr us/6ZK3iNMtr/Czx0Q2Hu0KQfO+i3iO6VRuLYS8nPZfqeYLXRN12Y4qOq2TyFf6gdhAd2XvHqjd 4f3LQiIhrdArmcLjdkXTgoxKyGGalDyFUdfRWRr5VP83Is3e2TngiHzr/uzIlNMvJw3szeAPgZJ z/uiPmn6d4L01zWgllHwMCgb8eyPHDkZvlbGbv26AAdGKs6HZCniZ1RsjLgc+IbqpqKTeRB7Z/r 7JOi3qXS57JBIdpuf75VPkqQsbwcuUtxWa5AzSsyXRO/08tWdVwGIkJkVS3P5+uiXhDlPySxAdQ edajgBrrBDoBKTtHWBZHrQs9iUSZS6bLIMzQsnEI5qt/+5MrqzztSTzzp+mFa3NWYxmivHX6lwe p+7m5kF6OBycl7Jg34Bhii8ZMUyOBQJ+igVGlT X-Received: by 2002:a05:600c:2104:b0:490:4ee0:82ff with SMTP id 5b1f17b1804b1-49220105292mr37554045e9.27.1781373089417; Sat, 13 Jun 2026 10:51:29 -0700 (PDT) Received: from localhost ([2602:61:7351:e600:a1d0:8426:3923:d48d]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4922033dd3esm91414545e9.8.2026.06.13.10.51.26 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Jun 2026 10:51:28 -0700 (PDT) From: Elliot Douglas To: linux-input@vger.kernel.org Cc: lains@riseup.net, hadess@hadess.net, jikos@kernel.org, bentiss@kernel.org, linux-kernel@vger.kernel.org, edouglas7358@gmail.com Subject: [PATCH 1/2] HID: logitech-hidpp: add HID++ 2.0 reprogrammable button support Date: Sat, 13 Jun 2026 10:51:08 -0700 Message-ID: <20260613175109.44365-2-edouglas7358@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260613175109.44365-1-edouglas7358@gmail.com> References: <20260613175109.44365-1-edouglas7358@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Some Logitech HID++ 2.0 mice can report diverted reprogrammable controls through HID++ feature 0x1b04, SpecialKeysMseButtons / REPROG_CONTROLS_V4, instead of the normal HID mouse report. Add a quirk-gated event path for those controls. The handler temporarily diverts verified per-product controls, parses divertedButtonsEvent as the current pressed-control list, and reports the corresponding evdev key state for every mapped control. Keep the control mappings in per-product profiles so adding support for another mouse does not change the evdev capabilities advertised by already-supported devices. Documentation for feature 0x1b04 describes divertedButtonsEvent as a list of currently pressed diverted buttons, which is the event format handled here. Link: https://lekensteyn.nl/files/logitech/x1b04_specialkeysmsebuttons.html Signed-off-by: Elliot Douglas --- drivers/hid/hid-logitech-hidpp.c | 215 +++++++++++++++++++++++++++++++ 1 file changed, 215 insertions(+) diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hi= dpp.c index 70ba1a5e40d8..24c9cfaa4f37 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -76,6 +76,7 @@ MODULE_PARM_DESC(disable_tap_to_click, #define HIDPP_QUIRK_HI_RES_SCROLL_1P0 BIT(28) #define HIDPP_QUIRK_WIRELESS_STATUS BIT(29) #define HIDPP_QUIRK_RESET_HI_RES_SCROLL BIT(30) +#define HIDPP_QUIRK_HIDPP_REPROG_CONTROLS_BTNS BIT(31) =20 /* These are just aliases for now */ #define HIDPP_QUIRK_KBD_SCROLL_WHEEL HIDPP_QUIRK_HIDPP_WHEELS @@ -205,6 +206,7 @@ struct hidpp_device { struct hidpp_scroll_counter vertical_wheel_counter; =20 u8 wireless_feature_index; + u8 reprog_controls_feature_index; =20 int hires_wheel_multiplier; u8 hires_wheel_feature_index; @@ -3601,6 +3603,209 @@ static int hidpp10_extra_mouse_buttons_raw_event(st= ruct hidpp_device *hidpp, return 1; } =20 +/* -----------------------------------------------------------------------= --- */ +/* HID++2.0 reprogrammable controls = */ +/* -----------------------------------------------------------------------= --- */ + +#define HIDPP_PAGE_REPROG_CONTROLS_V4 0x1b04 + +#define HIDPP_REPROG_CONTROLS_GET_COUNT 0x00 +#define HIDPP_REPROG_CONTROLS_GET_CID_INFO 0x10 +#define HIDPP_REPROG_CONTROLS_SET_CONTROL_REPORTING 0x30 + +#define HIDPP_REPROG_CONTROLS_FLAG_MOUSE BIT(0) +#define HIDPP_REPROG_CONTROLS_FLAG_DIVERT BIT(5) + +#define HIDPP_REPROG_CONTROLS_TEMPORARY_DIVERTED BIT(0) +#define HIDPP_REPROG_CONTROLS_CHANGE_TEMPORARY_DIVERT BIT(1) + +#define HIDPP_REPROG_CONTROLS_EVENT_DIVERTED 0x00 + +struct hidpp_reprog_control_mapping { + u16 control; + u16 code; +}; + +struct hidpp_reprog_controls_profile { + const struct hidpp_reprog_control_mapping *mappings; + unsigned int mapping_count; +}; + +static const struct hidpp_reprog_controls_profile * +hidpp20_reprog_controls_get_profile(struct hidpp_device *hidpp) +{ + return NULL; +} + +static int hidpp20_reprog_controls_get_count(struct hidpp_device *hidpp) +{ + struct hidpp_report response; + u8 feature_index =3D hidpp->reprog_controls_feature_index; + u8 cmd =3D HIDPP_REPROG_CONTROLS_GET_COUNT; + int ret; + + ret =3D hidpp_send_fap_command_sync(hidpp, feature_index, cmd, NULL, 0, + &response); + if (ret > 0) + return -EPROTO; + if (ret) + return ret; + + return response.fap.params[0]; +} + +static int hidpp20_reprog_controls_get_cid_info(struct hidpp_device *hidpp, + u8 index, u16 *control, + u8 *flags) +{ + struct hidpp_report response; + u8 feature_index =3D hidpp->reprog_controls_feature_index; + u8 cmd =3D HIDPP_REPROG_CONTROLS_GET_CID_INFO; + int ret; + + ret =3D hidpp_send_fap_command_sync(hidpp, feature_index, cmd, &index, + sizeof(index), &response); + if (ret > 0) + return -EPROTO; + if (ret) + return ret; + + *control =3D get_unaligned_be16(&response.fap.params[0]); + *flags =3D response.fap.params[4]; + + return 0; +} + +static bool hidpp20_reprog_controls_find_control(struct hidpp_device *hidp= p, + u16 control) +{ + int count, ret; + u16 cid; + u8 flags; + int i; + + count =3D hidpp20_reprog_controls_get_count(hidpp); + if (count < 0) + return false; + + for (i =3D 0; i < count; i++) { + ret =3D hidpp20_reprog_controls_get_cid_info(hidpp, i, &cid, + &flags); + if (ret) + return false; + + if (cid =3D=3D control) + return (flags & HIDPP_REPROG_CONTROLS_FLAG_MOUSE) && + (flags & HIDPP_REPROG_CONTROLS_FLAG_DIVERT); + } + + return false; +} + +static int hidpp20_reprog_controls_set_control_reporting(struct hidpp_devi= ce *hidpp, + u16 control, u8 flags) +{ + struct hidpp_report response; + u8 params[5]; + + put_unaligned_be16(control, ¶ms[0]); + params[2] =3D flags; + put_unaligned_be16(control, ¶ms[3]); + + return hidpp_send_fap_command_sync(hidpp, + hidpp->reprog_controls_feature_index, + HIDPP_REPROG_CONTROLS_SET_CONTROL_REPORTING, + params, sizeof(params), &response); +} + +static void hidpp20_reprog_controls_connect(struct hidpp_device *hidpp) +{ + const struct hidpp_reprog_controls_profile *profile; + u8 flags =3D HIDPP_REPROG_CONTROLS_TEMPORARY_DIVERTED | + HIDPP_REPROG_CONTROLS_CHANGE_TEMPORARY_DIVERT; + unsigned int i; + + if (!(hidpp->quirks & HIDPP_QUIRK_HIDPP_REPROG_CONTROLS_BTNS)) + return; + + profile =3D hidpp20_reprog_controls_get_profile(hidpp); + if (!profile) + return; + + if (hidpp_root_get_feature(hidpp, HIDPP_PAGE_REPROG_CONTROLS_V4, + &hidpp->reprog_controls_feature_index)) + return; + + for (i =3D 0; i < profile->mapping_count; i++) { + u16 control =3D profile->mappings[i].control; + + if (!hidpp20_reprog_controls_find_control(hidpp, control)) + continue; + + hidpp20_reprog_controls_set_control_reporting(hidpp, control, flags); + } +} + +static int hidpp20_reprog_controls_raw_event(struct hidpp_device *hidpp, + u8 *data, int size) +{ + const struct hidpp_reprog_controls_profile *profile; + const struct hidpp_reprog_control_mapping *mapping; + struct hidpp_report *report =3D (struct hidpp_report *)data; + u16 controls[4]; + bool pressed; + unsigned int i, j; + + if (!(hidpp->quirks & HIDPP_QUIRK_HIDPP_REPROG_CONTROLS_BTNS) || + !hidpp->input || + hidpp->reprog_controls_feature_index =3D=3D 0xff) + return 0; + + profile =3D hidpp20_reprog_controls_get_profile(hidpp); + if (!profile) + return 0; + + if (size < HIDPP_REPORT_LONG_LENGTH || + report->fap.feature_index !=3D hidpp->reprog_controls_feature_index || + report->fap.funcindex_clientid !=3D HIDPP_REPROG_CONTROLS_EVENT_DIVER= TED) + return 0; + + for (i =3D 0; i < ARRAY_SIZE(controls); i++) + controls[i] =3D get_unaligned_be16(&report->fap.params[i * 2]); + + for (i =3D 0; i < profile->mapping_count; i++) { + mapping =3D &profile->mappings[i]; + pressed =3D false; + + for (j =3D 0; j < ARRAY_SIZE(controls); j++) { + if (controls[j] =3D=3D mapping->control) { + pressed =3D true; + break; + } + } + + input_report_key(hidpp->input, mapping->code, pressed); + } + + input_sync(hidpp->input); + + return 1; +} + +static void hidpp20_reprog_controls_populate_input(struct hidpp_device *hi= dpp, + struct input_dev *input_dev) +{ + const struct hidpp_reprog_controls_profile *profile; + unsigned int i; + + profile =3D hidpp20_reprog_controls_get_profile(hidpp); + if (!profile) + return; + + for (i =3D 0; i < profile->mapping_count; i++) + input_set_capability(input_dev, EV_KEY, profile->mappings[i].code); +} + static void hidpp10_extra_mouse_buttons_populate_input( struct hidpp_device *hidpp, struct input_dev *input_dev) { @@ -3859,6 +4064,9 @@ static void hidpp_populate_input(struct hidpp_device = *hidpp, =20 if (hidpp->quirks & HIDPP_QUIRK_HIDPP_EXTRA_MOUSE_BTNS) hidpp10_extra_mouse_buttons_populate_input(hidpp, input); + + if (hidpp->quirks & HIDPP_QUIRK_HIDPP_REPROG_CONTROLS_BTNS) + hidpp20_reprog_controls_populate_input(hidpp, input); } =20 static int hidpp_input_configured(struct hid_device *hdev, @@ -3971,6 +4179,10 @@ static int hidpp_raw_hidpp_event(struct hidpp_device= *hidpp, u8 *data, return ret; } =20 + ret =3D hidpp20_reprog_controls_raw_event(hidpp, data, size); + if (ret !=3D 0) + return ret; + if (hidpp->quirks & HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS) { ret =3D hidpp10_consumer_keys_raw_event(hidpp, data, size); if (ret !=3D 0) @@ -4264,6 +4476,8 @@ static void hidpp_connect_event(struct work_struct *w= ork) return; } =20 + hidpp20_reprog_controls_connect(hidpp); + if (hidpp->quirks & HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS) { ret =3D hidpp10_consumer_keys_connect(hidpp); if (ret) @@ -4436,6 +4650,7 @@ static int hidpp_probe(struct hid_device *hdev, const= struct hid_device_id *id) hidpp->hid_dev =3D hdev; hidpp->name =3D hdev->name; hidpp->quirks =3D id->driver_data; + hidpp->reprog_controls_feature_index =3D 0xff; hid_set_drvdata(hdev, hidpp); =20 ret =3D hid_parse(hdev); --=20 2.54.0 From nobody Sat Jun 13 23:22:56 2026 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 24258372685 for ; Sat, 13 Jun 2026 17:51:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781373099; cv=none; b=VNdG4NE5HhnJOtopKk+w6wwplxUW75OPZfDWJoETC8ZhpaAjmsMswISz4pb2WKYwqBHHnw3pL1MTxTbEFJbcOWKdimxVWwA5eb1y6XQTUUE5C6leBIAS1MzP9ayZXVFKLJ1Z4i8Z1++jMFcQSSx7uMugXaCPLS3mzmj/9xHXWcg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781373099; c=relaxed/simple; bh=D6mo5lL8BXn1F6JUMRL4nZvmSxUl5EyOPXKc+HrizpE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MLWtZJyMT5+s2SITcAQooVICqke4mjamitnlynKrOsqM2esHFMifqROgWTZ9L4+O7WKuT+o/qtJaQySeGkgCXLk2a6HEu8sEbO8Kd55yMn94LK4IkqQ8WNNpH1S9g6kAcAjGODARgwCJdrDZm+BKPzZ8LghoSlNxZF8TJ0+aG8I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=N6GlrTER; arc=none smtp.client-ip=209.85.221.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="N6GlrTER" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-46015dc517aso1533820f8f.2 for ; Sat, 13 Jun 2026 10:51:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781373094; x=1781977894; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WiUuEZMXuY2KA8NP752vXyuw8+K685EPS2wquFqxvfs=; b=N6GlrTERjd8BtIH9+BUmqs7pdHzQVLZMEVI9Mngom+kATp6gbAQhr+0gANPKRCWO0v ed4nsGqwIG1ja6uuCQSUfZlWS6PKQW23LsGb0KKl+t+knW9nTaqT13/9IuhqjNTDiObh LvSWWjzoWSwGSZ7W6mKAfwInjVyU3/0pcR/g8xKR+BaDOqa5CnHU0E+lYFusWsmEzYuy oPX75icMJ4bPFn/ow0ikRMNNIHEx9CF6uWLE87AIwNQbrySHf40Lbv5sj+q6MzJg9a+P UKzVkfmvsSFFKKYTwBA0TiN7arFThsRej3SaxhvjRiCE1f6vgGSJyRRLzkZuaYKn354f thcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781373094; x=1781977894; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=WiUuEZMXuY2KA8NP752vXyuw8+K685EPS2wquFqxvfs=; b=IsXdPkI6/rpENQDvPbuAqLKq1J8eW6qNQ2bxylpA+Yf6DoToS+DzTDhKHZypWXdU9N iSpduWw8+58wC9K6jnTdGgaexTHyH3YO0kHwluRRI1Ie6ZxPJ++Ze1z+j2V8NxpcFG9w q/xbnM5JO19jKXSC9pX7sRfC0w2uldynY1J9vKMLhiCqkq8wtUxfmdDhoGaVj8slvQTP cQV4h60CQ5kda7K0dWsaZieO/MeCeX0r41F11O4jzzQO9jMtJAv99Vp8/zWCbl9wKONS CjhC2rjhKeQ+EObt5wrhW9fXsujpXdoKfJsf9SEO/V8San+x7UhhyvH/aBXNQ+aUt1vj E7Qw== X-Forwarded-Encrypted: i=1; AFNElJ9iWByxgvDvQXDhsFt7vQs2ijPTrKJUKekCk0e0yAGwduCAmHO/uw+PfImEKlEzXbplEOsUmSPKteQrZGo=@vger.kernel.org X-Gm-Message-State: AOJu0YwjHBVnRTVi3EJFDM7XZ1s3TTiQGB+ND9duWeVAPcdJM8rNGdCm XGmvZP6tS+jKUG7aJkx5eBsY0qaIz+3CzdF8S9Rzxg3ZO3Y3q+JdA3B7 X-Gm-Gg: Acq92OEocbXR/SJ5To37j47SxWkjln/oIosV5hnuo3C2Jr+c4u3fEM2oEEq6gz0Lq/q S7zkdQ+i4wzIogw9Hh1P7tAVUtGSGR/SIYU30yWF/pMVyxa48lBhJcY0+VYqKpwby2sWuB0spRx smArcl5lm7Jonatp28Ki1KTY5Yg5j/CnMf3EU23dPKFzjXGoHljplumVMSbWiHrJLoOyRhOAace a7AIoXnmIhDtnaBwJ/x0MAZUOdT4wSSAjqgjXY/UdGRbRkaJXSUoKZ7KJpDnrvjWM72gJk1RERy f0oG1q/J8pniQOFLcMgHHNN/6xOL6FD6ql939WhB2VBI9MOMLof1dAFBzWsNMqnYViS9jMhqWKo viQrSnTX0ZHXzrRna5hJ77ROCwIQX+IaqikdVkrKwolQzBEmusmvik64OwzEPm1qEBp0hTGv+yN ZN5LnYHa8FDROzl8Yx+1FqSU5GbA== X-Received: by 2002:a05:6000:4904:b0:45e:f302:95b with SMTP id ffacd0b85a97d-4606dbac755mr8978276f8f.37.1781373094191; Sat, 13 Jun 2026 10:51:34 -0700 (PDT) Received: from localhost ([2602:61:7351:e600:a1d0:8426:3923:d48d]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-4606f26f450sm18733492f8f.10.2026.06.13.10.51.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 13 Jun 2026 10:51:33 -0700 (PDT) From: Elliot Douglas To: linux-input@vger.kernel.org Cc: lains@riseup.net, hadess@hadess.net, jikos@kernel.org, bentiss@kernel.org, linux-kernel@vger.kernel.org, edouglas7358@gmail.com Subject: [PATCH 2/2] HID: logitech-hidpp: enable reprogrammable buttons on Signature M650 Date: Sat, 13 Jun 2026 10:51:09 -0700 Message-ID: <20260613175109.44365-3-edouglas7358@gmail.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260613175109.44365-1-edouglas7358@gmail.com> References: <20260613175109.44365-1-edouglas7358@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The Bluetooth Signature M650 exposes its side buttons through the normal mouse report, but the observed events are short click-like events emitted around release rather than physical press/release state. The device appears to use the held side-button state for its built-in gesture and side-button + wheel horizontal-scroll mode. As a result, holding a side button long enough can prevent the normal mouse report from emitting a usable button event at all. HID++ REPROG_CONTROLS_V4 diversion for control IDs 0x0053 and 0x0056 provides real press and release timing for those same controls. Logitech documents the Signature M650 side buttons as Back/Forward buttons, so report the diverted controls as BTN_BACK and BTN_FORWARD. Link: https://support.logi.com/hc/en-nz/articles/4414473810583-Getting-Star= ted-Signature-M650 Signed-off-by: Elliot Douglas --- drivers/hid/hid-logitech-hidpp.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hi= dpp.c index 24c9cfaa4f37..80108778ee80 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -3621,6 +3621,9 @@ static int hidpp10_extra_mouse_buttons_raw_event(stru= ct hidpp_device *hidpp, =20 #define HIDPP_REPROG_CONTROLS_EVENT_DIVERTED 0x00 =20 +#define HIDPP_REPROG_CONTROL_M650_BACK 0x0053 +#define HIDPP_REPROG_CONTROL_M650_FORWARD 0x0056 + struct hidpp_reprog_control_mapping { u16 control; u16 code; @@ -3631,9 +3634,24 @@ struct hidpp_reprog_controls_profile { unsigned int mapping_count; }; =20 +static const struct hidpp_reprog_control_mapping m650_reprog_control_mappi= ngs[] =3D { + { HIDPP_REPROG_CONTROL_M650_BACK, BTN_BACK }, + { HIDPP_REPROG_CONTROL_M650_FORWARD, BTN_FORWARD }, +}; + +static const struct hidpp_reprog_controls_profile m650_reprog_controls_pro= file =3D { + .mappings =3D m650_reprog_control_mappings, + .mapping_count =3D ARRAY_SIZE(m650_reprog_control_mappings), +}; + static const struct hidpp_reprog_controls_profile * hidpp20_reprog_controls_get_profile(struct hidpp_device *hidpp) { + switch (hidpp->hid_dev->product) { + case 0xb02a: + return &m650_reprog_controls_profile; + } + return NULL; } =20 @@ -4921,7 +4939,8 @@ static const struct hid_device_id hidpp_devices[] =3D= { { /* MX Vertical mouse over Bluetooth */ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb020) }, { /* Signature M650 over Bluetooth */ - HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb02a) }, + HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb02a), + .driver_data =3D HIDPP_QUIRK_HIDPP_REPROG_CONTROLS_BTNS }, { /* MX Master 3 mouse over Bluetooth */ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb023) }, { /* MX Anywhere 3 mouse over Bluetooth */ --=20 2.54.0