Received: by 2002:a89:d88:0:b0:1fa:5c73:8e2d with SMTP id eb8csp2098145lqb; Mon, 27 May 2024 07:50:16 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCV/1Lv4x4qsKvtmFGrJitshxnE4zK3nnY9moSIEFYags3b7S1ucoqgK0IAIyzPm/2Eoxwkj6Y/eXCvGsCMSjtwO0idInR23DDM5knfQIA== X-Google-Smtp-Source: AGHT+IGWrmb2BmK6z5V/t6YNeNuBx9v8n01B9GlteeCIswMZzIg367Xb7M32lNb8xhjqUp1kCfrK X-Received: by 2002:a17:906:cc58:b0:a59:d2ac:3856 with SMTP id a640c23a62f3a-a62642e714emr837922966b.22.1716821416231; Mon, 27 May 2024 07:50:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716821416; cv=pass; d=google.com; s=arc-20160816; b=kcm/JQBJ+AFIzmm9bg3rsJSmLwlpmYLg+/R2pvnz8JGcP92G+vLIEBzVe0pfeeHkyE ZvoYafJC3qx2FhRQOSbzZLuEKVA6Rzk+hYXmEpy5yAwYoSvVLuzlz18q0DPnqXKiWKGf JcLqsGpVD18bMlmPvQCYw5SVTFLeNPahzTrjqFBxNnwIMkeNIKViwDbuPpFG6ariu1eW KXrYp5O5k19/v1PZHCXzAxHvPAXAGz7YpgAtOhqYigmnJEejmldRltNGzgzRlThL5EeS ZWLDWu0aZKN4PxGsE+e5T3vDoBzKRaEfe+2n+LwljdVs3vLvUxNWcx93K0S8doE/PayE eEoQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=oR/qPL1kzxSZ2gp5atkIUwMWRIk8NB5HEU4jfgTR4DA=; fh=J+yvkFHRZLzJDRHjMyQEqw11J7BJ7Gr64Dd+/CZl+xw=; b=B8V7kvwPpWZ4Vie6eq3jhbKcvlWr6hq85hHok+RLlGLyQwRCIaqLmUr0oeO7LR72JS 0wLdnUeFbQ4IrzFzIeClCImv3Dg6L1hhUko+BbA9SpV2ODz0FIVL+59/O6y/bGXpPy8V tvkKuJuzHPQEjgpB7a6q2mSVU9F6sanF/T9YKsV7mo0M5hoZNfVQ7+H8LtKTlNmZfowv vMjgjIyfzDCaJObyAdFzSJY8EtobeaBhQdS/+HnK+NiAl4AJ+G16qAmo/gkiLS7rtbJb LyOHfKqX7lmuRcUchAryhiMj5ceKCgJ+/b+fKRU0a9pYAEvoBJyNhXXJUrIO1f2Egbh0 ujJA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tVA0uv9Q; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-190936-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-190936-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id a640c23a62f3a-a626cc6425asi401087766b.538.2024.05.27.07.50.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 May 2024 07:50:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-190936-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=tVA0uv9Q; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-190936-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-190936-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id F1D991F20D67 for ; Mon, 27 May 2024 14:50:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6FCFD16939B; Mon, 27 May 2024 14:19:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tVA0uv9Q" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DEA4169378; Mon, 27 May 2024 14:19:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716819582; cv=none; b=bwaVNF9dMIyMQEt6LZ2HW7z7mcBcYeXhXblLD3mvzjMe7hfMmFjPMwaKsXe0qGYWQsL2sRz9s2PlIJcZPzznQbNruSDA/qChpyKKeGvp+0rX/1HHNbSZ+kSX2fX/j3SOOyscf//2+kvH0GceuUYYerbicWKnpkqcPPD7Z8omNqw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716819582; c=relaxed/simple; bh=HksO7wi2Tu4etRYRKkyII0g6QFyH1LvtCOoKVJ36MLg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XsL8COQW1KP+4OxvmiTGBxDF23HWExodGYfs3CgExrmO/hqJ2GANy9/IrdHUHCcts2R3Y9WOf26y+6Lb1vzigaRYZC95Rz0oSYgvHRHUkLG/8c4FSoYT/h015ME4ZWg/VjvdxrvHkh9PQmzADg57i1kTEiRUifez61r4HbSdV0o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tVA0uv9Q; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 21EFDC32781; Mon, 27 May 2024 14:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716819582; bh=HksO7wi2Tu4etRYRKkyII0g6QFyH1LvtCOoKVJ36MLg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tVA0uv9Qm+44cXSkHStDJy0zM89Kpe8CmrF9swBuwJz0240yLv7l3IWWSIYtq8Mdo BKBa/xirAQeUnc0j53L6J/SUujcV8oSMJKxD1csNW9qUEn7mlpv/7bofUrLuHdZunU vD6ohsC6RjEmKAmmf24iP8OJTwwbwFV3x9dzyXRZRpo0e9wBHD2oDXBw9s5yO/tHYK EnIQgNEJlBQbzq0rq6CdnPAwtCQ17nWqkbaHizdPGRbIuyYY95qH0/5z8sAcWks2Q/ vvsGz+wV8Ws1z9kT+Lz69mofonKcVQFyZnrhiQeQcgUXqXVQVz9sLSAaKZCczvMlQH uuj7eZeI69TBA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Benjamin Tissoires , Peter Hutterer , Sasha Levin , jikos@kernel.org, linux-input@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 12/13] HID: bpf: add in-tree HID-BPF fix for the HP Elite Presenter Mouse Date: Mon, 27 May 2024 10:18:49 -0400 Message-ID: <20240527141901.3854691-12-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240527141901.3854691-1-sashal@kernel.org> References: <20240527141901.3854691-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.10.218 Content-Transfer-Encoding: 8bit From: Benjamin Tissoires [ Upstream commit 4e6d2a297dd5be26ad409b7a05b20bd033d1c95e ] Duplicate of commit 0db117359e47 ("HID: add quirk for 03f0:464a HP Elite Presenter Mouse"), but in a slightly better way. This time we actually change the application collection, making clearer for userspace what the second mouse is. Note that having both hid-quirks fix and this HID-BPF fix is not a problem at all. Link: https://lore.kernel.org/r/20240410-bpf_sources-v1-4-a8bf16033ef8@kernel.org Reviewed-by: Peter Hutterer Signed-off-by: Benjamin Tissoires Signed-off-by: Sasha Levin --- .../hid/bpf/progs/HP__Elite-Presenter.bpf.c | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 drivers/hid/bpf/progs/HP__Elite-Presenter.bpf.c diff --git a/drivers/hid/bpf/progs/HP__Elite-Presenter.bpf.c b/drivers/hid/bpf/progs/HP__Elite-Presenter.bpf.c new file mode 100644 index 0000000000000..3d14bbb6f2762 --- /dev/null +++ b/drivers/hid/bpf/progs/HP__Elite-Presenter.bpf.c @@ -0,0 +1,58 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (c) 2023 Benjamin Tissoires + */ + +#include "vmlinux.h" +#include "hid_bpf.h" +#include "hid_bpf_helpers.h" +#include + +#define VID_HP 0x03F0 +#define PID_ELITE_PRESENTER 0x464A + +HID_BPF_CONFIG( + HID_DEVICE(BUS_BLUETOOTH, HID_GROUP_GENERIC, VID_HP, PID_ELITE_PRESENTER) +); + +/* + * Already fixed as of commit 0db117359e47 ("HID: add quirk for 03f0:464a + * HP Elite Presenter Mouse") in the kernel, but this is a slightly better + * fix. + * + * The HP Elite Presenter Mouse HID Record Descriptor shows + * two mice (Report ID 0x1 and 0x2), one keypad (Report ID 0x5), + * two Consumer Controls (Report IDs 0x6 and 0x3). + * Prior to these fixes it registers one mouse, one keypad + * and one Consumer Control, and it was usable only as a + * digital laser pointer (one of the two mouses). + * We replace the second mouse collection with a pointer collection, + * allowing to use the device both as a mouse and a digital laser + * pointer. + */ + +SEC("fmod_ret/hid_bpf_rdesc_fixup") +int BPF_PROG(hid_fix_rdesc, struct hid_bpf_ctx *hctx) +{ + __u8 *data = hid_bpf_get_data(hctx, 0 /* offset */, 4096 /* size */); + + if (!data) + return 0; /* EPERM check */ + + /* replace application mouse by application pointer on the second collection */ + if (data[79] == 0x02) + data[79] = 0x01; + + return 0; +} + +SEC("syscall") +int probe(struct hid_bpf_probe_args *ctx) +{ + ctx->retval = ctx->rdesc_size != 264; + if (ctx->retval) + ctx->retval = -EINVAL; + + return 0; +} + +char _license[] SEC("license") = "GPL"; -- 2.43.0