From patchwork Fri Jul 14 15:34:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marco Morandini X-Patchwork-Id: 703024 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 1DA7EC04A94 for ; Fri, 14 Jul 2023 15:35:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236385AbjGNPfC (ORCPT ); Fri, 14 Jul 2023 11:35:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235215AbjGNPfA (ORCPT ); Fri, 14 Jul 2023 11:35:00 -0400 Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2063.outbound.protection.outlook.com [40.107.105.63]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADF5F2D79 for ; Fri, 14 Jul 2023 08:34:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gpYcgc3tHKIHIAe0JzDG3UHh7636+wMMZQk28XEhFlfaG0CHhTthxCVpHr6iTW21sWVORO6tJFQbF0r1E2KAQHk75F+xih2GFGnLhYDfFz9ijVA+tQ2pceopZzbWpfZEwgPl5Cr96mWFpPoeoDtiEzUnvyZnYUYnhiTueys+fpENWj187nvYEmxbJCOrqHzilx4gCjeem50bCjNx+H9Zlf0LCOdnxERiwDTYtFvDRmjpMxj4obR8jq9rPSjccCBlckxrYVFK9dRKBKomzjVOjwhjsUauZFgH/onG6aj2ILewgIeujWDgvy3YnAFSodcu1/f04bsPGnS9u2K7ubtfbQ== 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=jQ7oAea+CjI0Fv7HPEiqo50koB9YWBwlVh5SNH2fkyU=; b=DTHIAlpTaeHGt9QxC74oWNISwuwc/kcl5rVbThqK28OhKzJFNfZei3x+8PI5RXdaVjZEhAGq4QLM5MvLQ7BSEBShLD9ZnXcnRpREub7JyaMA4ldNQSGQkUpYFV2a/A/h5HMJGDWU/1yqMKPMVhHOZKO7OMw+9BmeQluXbz9QcIYVzQM9o8Ww/WTuCxo3hYdV4ndpDVVs2ddIqCSzQIHDpG+Yo6THGetdGU34vnbzFpICQmQhpR1fDtfTtImluI1LOrm2WnudLr6HGMDUIVIa3wW/PUWhyvfVD+HbvkJUwwqg67Pa05G40V/NKlgXLokmBT6qJ1fA14PkxZLskGaLbQ== 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=jQ7oAea+CjI0Fv7HPEiqo50koB9YWBwlVh5SNH2fkyU=; b=oxl6gMCw2Tp1F+48EsJkex7/kNnInxWD8MRAMJFQPmyTOmaD6QB1K/YWDjHZbIrJCkrjM3XGxf0ou23yE8YVsOGRyUXAGivnL/XJ4+M9lAbUuRCNp6EOAy9lMOwIh+BvSyriA0osTmNn7g3SOHoHUGK0QgBzZJg6t3Wp/xzzAo2RXW6sPQozbcTM12DNdkPh6Xczh37vFxotDb31o6LIrKQlWLC4uOfMSQWedHJlaeCVK/gHfWk4ZmKicuwyO90+6VgUo9Df0j37ikRFqWTf7bKz4S3tlSX46hUkejihkG9BDrhOyEtID+AcHQ2Glf4dAGGvi1pS1vyqaJuVUdBleQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=polimi.it; Received: from PAXP251MB0348.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:20b::10) by GV2P251MB0900.EURP251.PROD.OUTLOOK.COM (2603:10a6:150:a9::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.27; Fri, 14 Jul 2023 15:34:53 +0000 Received: from PAXP251MB0348.EURP251.PROD.OUTLOOK.COM ([fe80::7b05:e472:3184:13f6]) by PAXP251MB0348.EURP251.PROD.OUTLOOK.COM ([fe80::7b05:e472:3184:13f6%4]) with mapi id 15.20.6565.028; Fri, 14 Jul 2023 15:34:52 +0000 Message-ID: <5dbf769a-b815-390d-d9dd-d055eedf59ed@polimi.it> Date: Fri, 14 Jul 2023 17:34:41 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 From: Marco Morandini Subject: [PATCH resend] HID: allow specifying quirks params for hid-core To: Jiri Kosina , Benjamin Tissoires , linux-input@vger.kernel.org Content-Language: en-US, it X-ClientProxiedBy: FR0P281CA0076.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:1e::6) To PAXP251MB0348.EURP251.PROD.OUTLOOK.COM (2603:10a6:102:20b::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXP251MB0348:EE_|GV2P251MB0900:EE_ X-MS-Office365-Filtering-Correlation-Id: 4c4b4161-b49b-44c1-c4b5-08db847fde47 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +8gM5mqOuW84qjI0O2eu55SvFq4eucRaiDKcuVzCgHxmI7Yi1BjRiPMqyB18zuDp4Mkq/C602WCt0d5d9oNLymTc0ZHxvZFydsH2O+7Kjg2xb7GoovNiQ7giWm8G5ywq+WDj974KayJ0BwrS3dtUCMu34H3aeK8IRhUyILVj3dZa5Nhy3A3MSJObfH0bAB7ADVeVJrnAwbhpnVmq3NxnkogypdWjjqsjEk+kkayInaBk5Ed997QUb/ZxwfNmJDdoQRd1q/cNIDIWvko7Pa7ZOcTnsoqpmpkcZsTZIY/dcF+Gz1GXgUY9u+yBCjYmF0WdNpMv6qowJPA2/nMHC5inFDwE1+ULhSWWYT1P6wAjPfubA0RrOyczTAVh3mpuqkp8MIBnyxc6RlLwkpPjHcq4GA2a3axgodCHA4RjuEeErpRuJL0F9LR1n5ycOv2ukwa7gNW5YMealPTXTdsh/XVtjA7F/Qb5OsbRh6AAkIh1VFXFU16XEwwIBcupNuj72JG42ashD9DeRVHYTu9hsusa2gbvxeHSa2WSrfIzfvo+u+rDGQgrGgP+x6ovQcJFY6IyIJ02ylOt4RbGnGoUyLzKNd3zMjwxTL6Kfu/MCCIkhgZ2Imi1b3wkbRsBXXq1cN6NciuUQoPmdSDqXoZu6CGZjA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAXP251MB0348.EURP251.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230028)(4636009)(376002)(136003)(346002)(366004)(396003)(39860400002)(451199021)(31686004)(6486002)(110136005)(6666004)(478600001)(2616005)(36756003)(86362001)(31696002)(2906002)(26005)(186003)(6506007)(6512007)(316002)(38100700002)(66556008)(66476007)(66946007)(41300700001)(786003)(8936002)(8676002)(5660300002)(44832011)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Zzo5zOYoEAPi7eVEgIsW5eO6Av8C?= =?utf-8?q?ZoCdXuK6ncumj839AjqOBvrxknrIZBzhukd+b1R/KgXP/6m1jydW6+oeW2p5ghccM?= =?utf-8?q?TYt/hPKBM7krWsCswUwc641lVgbLsokZmoB+X3Ywe6zIIQsuCLZqXfI5HtvMBT6CY?= =?utf-8?q?Z0UKoZkqrJqsgnvdsenNAB3DvwQBN2KPjy21jeVRpNkYWWuNAftJod8ciLw/HO0tc?= =?utf-8?q?TtIXQ2MQ79q7NCowUOvy4AqfNfcgj5IoAJtJTs/g2SOnXyfKp/zrHZbDhVyQIf/uB?= =?utf-8?q?LoUiNOzEgByUOCQQUCOgT+AkUeao4OWjjtgm1PfRuAaxjP1yCChQsK/PaLuWR3O/8?= =?utf-8?q?EfHykdJtCFXMog1a37NOwUkm0+F4oDL+NpFwngKnlQmN2ufCuSSygJxqSOhFjIAZL?= =?utf-8?q?mYW/+QiAtcoUyY+Uk2wG1P3+CO/hPVzEp/n5FJrEDm8I+Q4L6igCxKLvaHFAqoCBv?= =?utf-8?q?XvLRjVqmwVnOhcxuViuM6fYYKA0leId6GA6M0ecRSpZAvyKoc0uOR4e0iTSTEFIGI?= =?utf-8?q?RP3VC0zHnGweSBBOA6N1Cvi0kI3a2mscsGQBjneV0RZq644N8Bsr1b+ZTn8TsF6Tg?= =?utf-8?q?A3v6DbpxaUGvVbf9Y2uEtbnsvbSIY1PXjG5rwcWcrg7NFjSAnxc5MPp/gmRqmYDS3?= =?utf-8?q?muyN8fTMCDH2n+56cOXMsccodzpRfx8up1UEbCDqZDxtS/Igs+FjjvoHtuvqGxXOm?= =?utf-8?q?RGTACAccYfniup4XWgWkF73ZPWoyRJmnF0FNeLxBgFvBcSBnikmX0dXnrL+9/NGtK?= =?utf-8?q?f6AR2FIFfM3TfK93LZ2RtrytmDQ+xAo+GGFU1Wg8WvrTqs9rhuxNMcieVPBAZ6PPZ?= =?utf-8?q?FeRMwDVGvz2yPJWpDGNMPBKZkHN6HS9afgXXCWQzPHkw8PD3aDanZMi48Tyn2HHfF?= =?utf-8?q?iS2hxcbXEcBpwpb5URh2nPfT9kT3ISSYBAVKyNYzLSUXImNkaHCy8QM10l50PgRX/?= =?utf-8?q?K+qRpoMvP8BHUivn23gvQAWYP7Aahp85nwsLbL38gjOGiQ0KjUN5RUXB/3CbLdXvy?= =?utf-8?q?Ks5YnDh1v9CfJwmobPEnNHm/bDtz/CP82gneuA/bKkkwmJlpKYNMMoLNDkqwqF/Di?= =?utf-8?q?S9cD0oYwaQjbMMFM67PLkwn6SzbhzJrMgH0KJVPWtv9rZZefM0AnP+HYvcwroHngh?= =?utf-8?q?7KJUe16w6psfLSdOCWIbIj6E9hiLO1p3mNFEb6SBgJIq6cglPyCwe6YDP+p5ASFVg?= =?utf-8?q?Lv5HZhIQ0IqlD2+PR+tSn6DC+70qc9gSJbLIQ6s0wzhTvF5HidDTHL3NnngHasuRG?= =?utf-8?q?ZgnGO6RqXZGR0or6VkIN3YFdT1RvX8f0bqbKuUQgvZfUY0fjRhNxVcXCsDU7brF6W?= =?utf-8?q?cB/ZgG/VLJ69nHQyxnTE5T3cG3nyBgGrZkUlOyeRy9s33DQa3YtNW8SHH92shEvum?= =?utf-8?q?OPvlJBvdAssZEhRHLeIoda3tUS+hQan0em+4aCzFfaxGEoxaiHk4Ez+Xd4uDlIp50?= =?utf-8?q?2aTJy4MAJ8xGsGypYDPvOxZqONhW2q+40iaTEWtVhCu/jcSLYOPsR9DAoAQjmy2QA?= =?utf-8?q?+UTjipq3ZazX?= X-OriginatorOrg: polimi.it X-MS-Exchange-CrossTenant-Network-Message-Id: 4c4b4161-b49b-44c1-c4b5-08db847fde47 X-MS-Exchange-CrossTenant-AuthSource: PAXP251MB0348.EURP251.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2023 15:34:52.9507 (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: p6bEw7Pau7N0m8uBxec1IL9nihFBbQTvQgOwNWMGcRERoTf7s6eZdGf672kmknSR7VpoycZC+aJTpbIm6AZ3BQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2P251MB0900 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 --- I don't know if this is a good idea or not. If it was for me, I'd get rid of the usbhid parameters and of the duplicated hid_quirks_init, forcing everyone to specify the bus, but I fear this could be a regression for user space. 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);