From patchwork Thu Jun 15 21:00:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Morandini X-Patchwork-Id: 693154 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 A1D4CEB64DA for ; Thu, 15 Jun 2023 21:00:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230081AbjFOVAZ (ORCPT ); Thu, 15 Jun 2023 17:00:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230459AbjFOVAY (ORCPT ); Thu, 15 Jun 2023 17:00:24 -0400 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2054.outbound.protection.outlook.com [40.107.249.54]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4268D193 for ; Thu, 15 Jun 2023 14:00:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tu4YngdbOFFU9ELM5GgGHU3Vjo3xl7LQewFxNGFLIVk3SCPEmM6g8HbCxWeKl4GCSozjVXpeTk7EdG0DGTenr7MXhapBvRt2cic6V7wwgKokO/dHz33wqDQl3Q9pk1AS1vvmHwEVwnWgl8JV3iO5GoCwr0yy2JnAiaGso6tQnfNcdsszU/0hCVV0/qc8Y80/GhNOKKpM4zbD+1rZ1oDZQduS013KEK31Dqpa4w3bx8TEVhF8WOjP34mkW5pmmyg0W3Bq7cjkxK6eYOybQsKTMIKmtneEzYBXKf88XdGX2X2SQCNQR+VSb1tXrW0TCV8TrueS2Sfjqu9EsArz+O3qwQ== 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=d134nqB7YNO4fLFG7QmCi/NGBTmIyiokAX/FyIuNoYM=; b=KlveN3JIEUug6qqKAuy3DECvFyJ+rfB2ZhHouHYSybmQKRkCnPA/hn7/84hFGeseWYn3nIeXYqFPtO/UDGTWt5BPFd0/ngLiHz1xtNgxCxVT59YfjxyBBTZ+Ew3p5M8fAjJzrZWGjh39beKDbGzTKhIbbtLQHxpDr4o/2ecUGSLPpTtsTPxE/6vA/F6T3YPTmR6aSjmeFpbk7Ai8vpzclWZPGGOlSkvcawPK5T3SffSi3wa7GDcS0qK+A917aGhtg94lDBFOrEObMY7mLJmVDyfGVcd9aLpZ+KlceWaEi3NRLk08h6Akameqd8dASwhCNW3K9PdS8BSiVWwtPTAlrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=polimi.it; dmarc=pass action=none header.from=polimi.it; dkim=pass header.d=polimi.it; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polimi.it; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=d134nqB7YNO4fLFG7QmCi/NGBTmIyiokAX/FyIuNoYM=; b=d1oCq6grUc0IbmnIt76LMj/AeUn/EnU8lf5APvKoH8IKE82bL6BKo+4KWVGaBekHBGnOPt/7R+2fdN1dhemCcu0xcEFgzznZyA8o85tH0s0EhvT/y2/jjMv/0cHRGI/5BqbI3FRyk1sBa/AIq/S91zcdhkXdp4ZPZ7P+uBj4WdhjX7L3Hvje7a1Z1Lq0NY7Op5mVERjd8VlBDpGqxsjTggAo64Ch29IQtPnPLudb8glqKYVsVbvAwy1OJcRHFEoBTmXLoIrmNmnnuV4jbAqsKL8r2hV0V5j7mLp08K0JW0OmgKhFlgvv/BdH3EqCL5hAzscv7hiBDJE7gSLdE+lVfA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=polimi.it; Received: from AM9P251MB0350.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:416::10) by AS1P251MB0502.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:4a4::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6477.38; Thu, 15 Jun 2023 21:00:21 +0000 Received: from AM9P251MB0350.EURP251.PROD.OUTLOOK.COM ([fe80::651:7435:58fc:9db8]) by AM9P251MB0350.EURP251.PROD.OUTLOOK.COM ([fe80::651:7435:58fc:9db8%3]) with mapi id 15.20.6477.028; Thu, 15 Jun 2023 21:00:21 +0000 Message-ID: Date: Thu, 15 Jun 2023 23:00:13 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Content-Language: en-US, it To: Jiri Kosina , Benjamin Tissoires , linux-input@vger.kernel.org From: Marco Morandini Subject: [PATCH RFC 1/1] HID: allow specifying quirks params for hid-core X-ClientProxiedBy: MR1P264CA0127.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:51::13) To AM9P251MB0350.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:416::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9P251MB0350:EE_|AS1P251MB0502:EE_ X-MS-Office365-Filtering-Correlation-Id: 6904f98f-c2b8-4fa0-908e-08db6de38825 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rfO7dvaXfGdRsxhaJmkbEtgVVbyK5HP3woNVXHGiO2TfIPMERCW+x+qBLZjvMMvYofcX9DGCH5wzXfmZXfigj6lFdWL91/nXhn0pbJbJKsXordyDuXeCxnfctuo8/2sgCseot9Ed93bnrgHX1Bq4MwiCCvE61NjfVWvMbbyoI18xfLPys00V7r/SuHqZjhT/l1tv+MdL51PTSUAhjQnvV73fCqo8dTtVRpePALwbQENXTwz5HK/PQYDWTRVVtA9I9IjxEsEXhAhGAqlSSIZzk4cfdCg3E+RP1FQ+6Z7WNfZoHpsG+ADA6SVhwcmk6ON0Nb5/zx9W2MIh+CJpvlZEB+vvnoekLbud+DcjtAx3Chm1kkeGPuJ5CztuyPTLWe4FzUCMGgErZZAVjWZYzrm/I9avDX5KNlJRBvX6ZzkZCBEWXNke9Ebdwn/Dt89SVBCZrudFedmjYhtbrwUMTWiMAm7ikMJ2AwKIYyV+jp0Gp3A+4u34zIcM/KwFnbmCPYKDVnMyC88XgQir82d3OnVrNKa3NAzhyDIZ37mxisJGi+60iUqQVbGshXhXGloxdcrDBLFuLLzweNBcm7i3gJnikNWnuFwEN3UR2rCHVM4KM4vEKzYt1mudKD14ANRVgw5tgYwp+/GH19n/lAyS2ooV3A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9P251MB0350.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(376002)(136003)(396003)(366004)(346002)(451199021)(6512007)(6506007)(478600001)(36756003)(186003)(6666004)(6486002)(2906002)(8936002)(786003)(316002)(41300700001)(44832011)(8676002)(86362001)(31696002)(31686004)(5660300002)(38100700002)(110136005)(2616005)(66946007)(66556008)(66476007)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?LEI5fmwxYnr7xjYXs9xPPBsL6B6L?= =?utf-8?q?Twlzypdg9DEFQ+Vo9t1lH9Q+w+bE2U3+c4HskuGJ5lMHzPHezzxU2FTdIRI/UvFFr?= =?utf-8?q?4t41+YuK2fk5Hq36xLFRgW41pffeQNAx37+pdxUTWs9I7zyjXRgutGxKvjiWndhta?= =?utf-8?q?Z3c0ggosrXFfK7LU4ifKsAK+6kqPFo3buwFWYzZ+hyeul/VqNIxvTpRWF+qlnFp+V?= =?utf-8?q?ajds2A72nErh1c0e9bLExYcIYVPk1GdioAOlE2Ywocg9mu4eGw3SfAj0CW0joFOVe?= =?utf-8?q?MfEusckYg+h15ZE8q8nFfNCcgNQgB2x2kncgrrlgYfsnJqtxm4HhDuJnZhwyMuzZb?= =?utf-8?q?+mBdH/aa2HFm9nmIPUi/M34TmElQTiDvpJBJi8Q9QxuXkJ8yalKDbCnmPcs2dVw7H?= =?utf-8?q?rEEnU1J9W6Eee240glg9CYYSJifve2XsQXJeQfij3YaYYZ3h9pQ0USkwdSm9WGJZC?= =?utf-8?q?NU4iE+F3kxkl/mN1rtsv46vjWXxQBNeAeUq9OPI/ShPVHCmEnq+DGyyH4qL7W90Ms?= =?utf-8?q?ofOkUmXLVcV07Cy20QF/vwO4V8VqQHJn987WMHBsEnJ38MIO2s0VNtaB2KoVvKcfw?= =?utf-8?q?x9sENigEOwZ+FAUi5FEh/piRLiru2taYzcX2rpB/gDR93A1lq1YTdE4l0TYK4/sMq?= =?utf-8?q?bKSlDKXmFeseivMlDt1p+jW0Nq1vG3rWVRXXG5xwe3saDlMAPHI7klOqsEh11oIDV?= =?utf-8?q?1rNVuoDadOZJCzzPdcsW29aDbQMb+Gqr6CGj+mwDwGSBIVuDs37MM39RG0nWyRwq+?= =?utf-8?q?fRFqSU+XXBxn90OFIbuUK8/gQp6Uen47CYsdR24d1pleacE2VlrA25+nNm8MPQab7?= =?utf-8?q?/1G5WZyr1ZEmXoyh+OQrqZ8KbX5gnAKQUBxMeVo5BeZccdUrDv0bFB5ZnNHL3VLXe?= =?utf-8?q?V96xW0oJTqCj6e8ZzboNfAvQ/1lEHVFbF4LFFcwyaxPOS2AmHNB4zCx3ISq8Q0yNL?= =?utf-8?q?XaqQPtmRNQAXLsbUO1ZfNR+Zl2qmUZxCAV1kwuYWxIQUvHzQyD13hOdp0tHH8A/Iv?= =?utf-8?q?WOQ4KzxZ7QBNfIs//0tk+f2jPXpzYLFLKGIQGmYlVJJwhMeILo+AC1I/uOH9VpXbf?= =?utf-8?q?UpWzHjXBQ1BbrzVA/zG4HHQAZPG9DqSIt0R1Ty3MXrPgkOzk078EMPyEE5dLTM4jw?= =?utf-8?q?IWp6Bp8MCbTxt66WefSrY1Xz7/C8FUI42GkIUkmjO570XX7bq3ihBeixm0KJ/6puj?= =?utf-8?q?OcsViLIWEZQJ3gLgkJSdva3J5AVa2UgmHwbWrl5TJVkFgtNlDjX4iGeLN1MTRPxO2?= =?utf-8?q?nDmu2oT7pozSKW9OiRLQpgTu6l32eACh+oSiAcHidYN8GeSIO+YpCpIrYfWfqVfMA?= =?utf-8?q?gX6yUZUpq47GzR207fRdxyPFOyX0IafFWHp94/25AqmT5aXrDSrmlPl2tZQ37adNM?= =?utf-8?q?5J53IH7T0/49vmI8IHCFkkfluhXPNGBtrT4pw4sRXSIoM07vGcGvuuJ2zVICjxgNt?= =?utf-8?q?wQlGVgtXosDjK1rT6or2q7LZ2p2fIzEElpxf180IPbEq05/GtvkB2zsqC6etfMrMJ?= =?utf-8?q?zcwh3howqHIhNFpi+8heNTSa8PkNLWNX/7L4/J9B1TOM6JxwIIRsESF9Tk92Zfg5n?= =?utf-8?q?GAfSq6mlQQ3?= X-OriginatorOrg: polimi.it X-MS-Exchange-CrossTenant-Network-Message-Id: 6904f98f-c2b8-4fa0-908e-08db6de38825 X-MS-Exchange-CrossTenant-AuthSource: AM9P251MB0350.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jun 2023 21:00:21.3207 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0a17712b-6df3-425d-808e-309df28a5eeb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KdwHFIzD8rATuVq1wtk0sJa+7YBemPbQ8rrxVbb/jHPv6aUDgW9IimG62e0NZRjHbVHR/qizV4+0eeDeoVsAVw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1P251MB0502 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Before this patch it was possible to specify quirks using run-time parameters only for the usbhid module. This patch introduces a quirks parameter for hid-core allowing to specify quirks as hid.quirks=BUS:vendorID:productID:quirks Signed-off-by: Marco Morandini --- drivers/hid/hid-core.c | 13 +++++++++++++ drivers/hid/hid-quirks.c | 33 +++++++++++++++++++++++++++++++++ include/linux/hid.h | 1 + 3 files changed, 47 insertions(+) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 22623eb4f72f..e1bdba978dbc 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -45,6 +45,13 @@ static int hid_ignore_special_drivers = 0; module_param_named(ignore_special_drivers, hid_ignore_special_drivers, int, 0600); MODULE_PARM_DESC(ignore_special_drivers, "Ignore any special drivers and handle all devices by generic driver"); +/* Quirks specified at module load time */ +static char *quirks_param[MAX_USBHID_BOOT_QUIRKS]; +module_param_array_named(quirks, quirks_param, charp, NULL, 0444); +MODULE_PARM_DESC(quirks, "Add/modify USB HID quirks by specifying " + " quirks=BUS:vendorID:productID:quirks" + " where BUS, vendorID, productID, and quirks are all in" + " 0x-prefixed hex"); /* * Register a new report for a device. */ @@ -2951,6 +2958,10 @@ static int __init hid_init(void) { int ret; + ret = hid_quirks_bus_init(quirks_param, MAX_USBHID_BOOT_QUIRKS); + if (ret) + goto usbhid_quirks_init_fail; + ret = bus_register(&hid_bus_type); if (ret) { pr_err("can't register hid bus\n"); @@ -2972,6 +2983,8 @@ static int __init hid_init(void) bus_unregister(&hid_bus_type); err: return ret; +usbhid_quirks_init_fail: + return ret; } static void __exit hid_exit(void) diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index 3983b4f282f8..40d3ba78ff73 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -1182,6 +1182,39 @@ static void hid_remove_all_dquirks(__u16 bus) } + +/** + * hid_quirks_bus_init - apply HID quirks specified at module load time + * @quirks_param: array of quirks strings (bus:vendor:product:quirks) + * @count: number of quirks to check + */ +int hid_quirks_bus_init(char **quirks_param, int count) +{ + struct hid_device_id id = { 0 }; + int n = 0, m; + unsigned short int bus, vendor, product; + u32 quirks; + + for (; n < count && quirks_param[n]; n++) { + + m = sscanf(quirks_param[n], "0x%hx:0x%hx:0x%hx:0x%x", + &bus, &vendor, &product, &quirks); + + id.bus = (__u16)bus; + id.vendor = (__u16)vendor; + id.product = (__u16)product; + + if (m != 4 || + hid_modify_dquirk(&id, quirks) != 0) { + pr_warn("Could not parse HID quirk module param %s\n", + quirks_param[n]); + } + } + + return 0; +} +EXPORT_SYMBOL_GPL(hid_quirks_bus_init); + /** * hid_quirks_init - apply HID quirks specified at module load time * @quirks_param: array of quirks strings (vendor:product:quirks) diff --git a/include/linux/hid.h b/include/linux/hid.h index 4e4c4fe36911..7f2e8ba7d783 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -1178,6 +1178,7 @@ int hid_report_raw_event(struct hid_device *hid, enum hid_report_type type, u8 * /* HID quirks API */ unsigned long hid_lookup_quirk(const struct hid_device *hdev); +int hid_quirks_bus_init(char **quirks_param, int count); int hid_quirks_init(char **quirks_param, __u16 bus, int count); void hid_quirks_exit(__u16 bus);