From patchwork Sat Dec 17 07:26:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 635330 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 18D3DC4167B for ; Sat, 17 Dec 2022 07:26:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230009AbiLQH0w (ORCPT ); Sat, 17 Dec 2022 02:26:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229508AbiLQH0v (ORCPT ); Sat, 17 Dec 2022 02:26:51 -0500 Received: from IND01-BMX-obe.outbound.protection.outlook.com (mail-bmxind01olkn2086.outbound.protection.outlook.com [40.92.103.86]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3B98E17; Fri, 16 Dec 2022 23:26:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hfMSRWp23f3YmHYdekfMU21wW9WTXIkq7HLanWhj5o6ovgBJZEIzRrnXche44ZUYg4e3DK5oXr5MKOJn3hrdXXxzrvG82xqLrLZniDhKkKzB5mrV14hDgZGpT9FoOVFxs6meiduYi1TUZtZnNVrpw+KjkMSLmiU0/c80ankum7/kffXKnkU6pmDvx1dgwE+Ul1Y88vyW4OfWsJ12Md61tTZ5BUuG1AIvJtEcEYg3ZxwBB/Snr4ueIFMZlKEkGIOTlleKUt0iFpwOOkn6kqZcyyV4Fc31hXFJzYv4fiRq3RpVOeMsIc2Yo4aBsNXn9/PUlD4Z3Pg72biYyTAvAMfT7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bk3If8EM1PQyR4GLuYT5i2TprxcQAc76MEJqrGYRHl8=; b=LEl3y4tt2PGaGl9QFTAq67OuHaQ6DXtootYXgAhloEcPZ7JGp/Innn4Gxg7O7jRwqIqv7BadG+/ZNrXg9WdF8KkZP9DwcE3AQMXtq5CUD/CGgFQy4uSxwjNCfLE1/9wgs58Cj2DjmCkMjV0RXvNGvgboCuP3HnCtUrSi4wbpjYtILUHkxPHGRcRboIOffCyz9MKB6sReosegTn8au49ayw8ZM0XuGSDwpRyPyX8cI0fwloMaLjaE6YxE6nS2sJCXWuJ9YnJCQXkkjTdilYq0iGB0RfXtnkC73verWhPXhilRBnXD86ljjyVblHU88q4/0pWrOgOSfafIhocy8UQvTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=live.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bk3If8EM1PQyR4GLuYT5i2TprxcQAc76MEJqrGYRHl8=; b=fFAnIpR1ffgpMh56jfOkGpqxjuxd0N7Qx9L2gD4i66y+NG+T6Egnz61WTOHVFpMF65bwDHbCD5Op41XpLLYGkRRLymVA7mvKKmjWQc6MWtdD+HfisarJs+SsBaW0WYP4agegkjuu5IaJ/kkFYMsFltw6hL8BnXF5cfP+qQWT18QAzaUJJTAXENtAAqHgXb6NcJjWK/Z9gh8lhCryqR8mjXcJuBLYNR5OQLV+bYbTF6jyCY8o1cIPUukjLEAwTAMA2ZTdjLw/zpEAyApwmjrfZ1wFpVZ0bykQna+5P7s+S33TYpbQOEAWnDintAtTxjs0KvPhnFyya/YRq3UmWvXrOQ== Received: from BM1PR01MB0931.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:2::9) by PN0PR01MB5690.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c01:62::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.11; Sat, 17 Dec 2022 07:26:42 +0000 Received: from BM1PR01MB0931.INDPRD01.PROD.OUTLOOK.COM ([fe80::9758:2410:fd85:511a]) by BM1PR01MB0931.INDPRD01.PROD.OUTLOOK.COM ([fe80::9758:2410:fd85:511a%7]) with mapi id 15.20.5924.016; Sat, 17 Dec 2022 07:26:42 +0000 From: Aditya Garg To: Jiri Kosina , "jkosina@suse.cz" , "benjamin.tissoires@redhat.com" , "jic23@kernel.org" , "srinivas.pandruvada@linux.intel.com" , "linux-input@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-iio@vger.kernel.org" CC: Orlando Chamberlain Subject: [PATCH] HID: Recognize sensors with application collections too. Thread-Topic: [PATCH] HID: Recognize sensors with application collections too. Thread-Index: AQHZEejpxeN0O9mCjEWaxsQGHt35aQ== Date: Sat, 17 Dec 2022 07:26:42 +0000 Message-ID: <8DA00FF4-DB08-4CEC-A5B4-47A71DC09C13@live.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [NbbNw7J8Oljuf0+P9kWkQurrURltQfrd] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BM1PR01MB0931:EE_|PN0PR01MB5690:EE_ x-ms-office365-filtering-correlation-id: 234b38e8-b765-4a31-7354-08dae0000b92 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: TMkiTrAxrWpI/5xyy8BIPDwGjorHtInvLDhFlnd+/aAdev0/PcAITFBsaRByYwSzzBLlscql3FfW+gbKzyDklCQYzoOuceAQpKGPyEWixQ5WsyEdP/FBNYDGsVg0GanbkiirpHZQ9VigZC9jTwa6TLOrCNEe0W/irj+EtLSbCCaGw0dWsW1CiPp45sXFEqZp+OxogC8K0ZK28z0j1jGiIUGWnwySlyct0IKindVFrPouHDnF5AAn0JjFYewLq7dnQRIx4gjKwKZqxyr9YD7QfKuYbM4RYRDVitfvsJk/eV4qyZXSC53NfLnUTyzAPL3sWIRR69JpSlzU7lfgVQrSjjj1iPV9hOjjHtGUk5BlEGExUAXSNiYJh65kGiu11eRp375vDKu22OnWgRlMmyi3WWtaktnxFO6/yNdfw3ZChHeUGq4juVTdI6vV270CrSqyS4EVfap/GEj9/hL8ZBJOq1ehawAALRPIcLsGpQPJioi5ZwKObRQ4HJyU+ZUgzX4ulsU8qgFNW/IlihDZW/O9x0rTHj7jLIjE6xJYs7I2b9WIorjdDWlRPbAAWpBonEGsU8YwnFrgLI61MfJ6lFtDcnK76RhTfEsAtxqbbZAxxd0= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?oKOEdrYBxkijcvZm4hYZ6s6z3Plf?= =?utf-8?q?8FaMLrtRITPW0cACGWio/xpdBR38uEMIwqcuAVDNEWKOCHr8svBoFxcYsthMEri6V?= =?utf-8?q?kZ2N9FNVNXgLvfvgO1bEd9x5wQrMHKMcnUHB4zRSBTh3OjcrdRHHKuWDW9b+Imzw8?= =?utf-8?q?HK1cQPIq8wM8nHp87YPYHTeJI5ExJVIkwF5Dm8b5DDkxOCKXWs4Sx1qW9EA+Hb2GE?= =?utf-8?q?gMczuBsyu4GJkc33qZvhADVnOTwrj5/4rCNSaiTPEBnPq+DzM2OHo3W9ZlbRcGmdf?= =?utf-8?q?DYRf3g4q7wqm/SnQM1rLXHoR+Zhe1PpcjhaLJej+Mwgs8D8pgV6PvaMzPjnDee27J?= =?utf-8?q?o//XiHwy1XT8X1RnYjfgs86LzX7R/vjAGy8Ino/Hv+1bZUJP3Xl8OxMIbHBTmWiEI?= =?utf-8?q?qb0l/FAfsXFuDHiAtdEeLNBfkPhDso1wCX0xTkDGzHd8u320aWEshwlgOltUEg6gS?= =?utf-8?q?XfhEgJkypPZkcO5rz4J+YKfKTGOJMZhbQPA4MnfzRCfkGdxSlLx+7RrFelZz/Yp7z?= =?utf-8?q?1HuKxMOMGY/WxPcx+9VikafIHbXlTRABgCxd8I8QoHrD2LU5vhL9kJTIQEESZId00?= =?utf-8?q?Ag2JJuDJmMYxTJp4rIoNndHrWZJfAJS93ri+YqN3C3c3NeBxDe5ffQURk44lIcky9?= =?utf-8?q?UegfuXLemlgunnuk34/sRTAyiyi1y0RUoYtfTkZsDwKxccNd9nZ2387HDj0N9zwgt?= =?utf-8?q?Puh6p++lvnJFO+hR50JOqg3XAZ1jX9Z4xMqHZDd8rkKe957KFT8C6D6Sm/6Znegxm?= =?utf-8?q?cY5ahDccyJrUANoBUN7w632v0T0gKIwzCBm7Lq1Zw2CYoRAtBqp7lihF1vHiwdCnQ?= =?utf-8?q?v78Qj97QX5ynFs1PA1G+4MxtRsGnfffGiyTx0ulEfX6JLlK5/b5MxtIOwAhVVlNQS?= =?utf-8?q?VG3tQlnsyYy44OAMuB7UAqKZW47kAle3vekyEBjHVDQLVZa+Jzg4wD8wI376D+5/i?= =?utf-8?q?LvUc9bGyAp4ZW4aOj4xJQ1DQArjGecic0w4IQLSitncARGEWoMvlH5TLV49YYexMG?= =?utf-8?q?aUiuzrvcXbtdEmy21WtO4KM5QjkyPMDUiuxATMMkH0MAPHLZvRxRXOwmcYp+CKdLh?= =?utf-8?q?SqKtltI5oB98O0uN1mSrtTHYChHEoakULJjpRFsg/1f/FDGCM5JvJNnoKM+klOG4O?= =?utf-8?q?cgsIq+d74lEwew7rqjiDCGVWo+Znz7rltj4SXsoSaQdOOpMCnmK7BIPIF5uM6W13X?= =?utf-8?q?K1omf9DyUG/PcV7QQxE/cHTkNUzvTMnwg6uzgxQ=3D=3D?= Content-ID: MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-42ed3.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BM1PR01MB0931.INDPRD01.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 234b38e8-b765-4a31-7354-08dae0000b92 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Dec 2022 07:26:42.4803 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN0PR01MB5690 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Ronald Tschalär According to HUTRR39 logical sensor devices may be nested inside physical collections or may be specified in multiple top-level application collections (see page 59, strategies 1 and 2). However, the current code was only recognizing those with physical collections. This issue turned up in recent MacBook Pro's which define the ALS in a top-level application collection. Signed-off-by: Ronald Tschalär Signed-off-by: Aditya Garg --- drivers/hid/hid-core.c | 3 ++- drivers/hid/hid-sensor-hub.c | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index b7f5566e338d..8fcd663b10e2 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -804,7 +804,8 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) int i; if (((parser->global.usage_page << 16) == HID_UP_SENSOR) && - type == HID_COLLECTION_PHYSICAL) + (type == HID_COLLECTION_PHYSICAL || + type == HID_COLLECTION_APPLICATION)) hid->group = HID_GROUP_SENSOR_HUB; if (hid->vendor == USB_VENDOR_ID_MICROSOFT && diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c index 6abd3e2a9094..d03dc4ca095f 100644 --- a/drivers/hid/hid-sensor-hub.c +++ b/drivers/hid/hid-sensor-hub.c @@ -397,7 +397,8 @@ int sensor_hub_input_get_attribute_info(struct hid_sensor_hub_device *hsdev, for (i = 0; i < report->maxfield; ++i) { field = report->field[i]; if (field->maxusage) { - if (field->physical == usage_id && + if ((field->physical == usage_id || + field->application == usage_id) && (field->logical == attr_usage_id || field->usage[0].hid == attr_usage_id) && @@ -506,7 +507,8 @@ static int sensor_hub_raw_event(struct hid_device *hdev, collection->usage); callback = sensor_hub_get_callback(hdev, - report->field[i]->physical, + report->field[i]->physical ?: + report->field[i]->application, report->field[i]->usage[0].collection_index, &hsdev, &priv); if (!callback) {