From patchwork Thu Aug 8 12:08:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aditya Garg X-Patchwork-Id: 13757317 Received: from IND01-MAX-obe.outbound.protection.outlook.com (mail-maxind01olkn2107.outbound.protection.outlook.com [40.92.102.107]) (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 0C99518C32B; Thu, 8 Aug 2024 12:08:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.92.102.107 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723118900; cv=fail; b=PmMT6oTpmrvYZREAB/bJMeJ5surlEe6jcD3sk1cbnTbKp+y0EvsIgc3KMNV6ELqtGCY8INUVzBB1m5ay9apTCyNVSqnF6X0zxOhjAO3HMes+7I/y4Hf2EyPC/eBZiBEHCoagRHaNfnSNn5cvwaaMgMW6NwY8dJwQ1pAeF1EZI+o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723118900; c=relaxed/simple; bh=Ga/M1/3AQHeq+4L170paz3HOKdDlLhcATXvdBhfkEks=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=OA/payRR6hmQZ8osn7feqcyJ6Fl3Hy/TKXe69Mdkcp0Uxo8YuYip9qaPUIG/ORsfvZgPRQVwbLcY/gcQa3+2Bz9z06C8LXJefFR+oSlbruFAGwU7u7VQme1YSPKzr4RnHwuknDT5azPNZXAPYlVQQGJJJqwm754SmUKI2cp4IsA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com; spf=pass smtp.mailfrom=live.com; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b=u3FS+7M4; arc=fail smtp.client-ip=40.92.102.107 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=live.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=live.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=live.com header.i=@live.com header.b="u3FS+7M4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pCTr5im2/kXCcXWvLu+Id8g8j0hgDm0VBaCuGJmml0YMiGZlGc1eLzEQadfoWUwESQMEYFUe+O2w7Dj0y7NDHaPURZ3AEZU90rMdqCOVL3q95Z8Ac1h9t+Yw0x8TjcE+pp7h1Z3B9/iwjK180y7zp6ezETk6EoxF4X9fK2R85YCQGMeFLfAo5XMRCzaPMnDfquOKwMo9YIsS33N91TneQRZw/UG8/I6xv0GNBzetqgTeTCAEgh95vigAH8RNKIfQEM59uXnfY5F9nrsLY+d5ZVLL1HjIyKzwjKQKHl+3+KOnvMZypfUZJjepzIYirdLMPyOaY8KAkHe++6PrTp+FDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=Ga/M1/3AQHeq+4L170paz3HOKdDlLhcATXvdBhfkEks=; b=NQQK9JjyUqQkWls1ZtNFLZNiDq4Zgtldy0fQnPD/pp5EDOWpHdSub1azdmmoS75WIR/K6dqPtDX5pkLcqaGzhWP1QxCEiaaH2xqy3RZiLDXfaLuq4XLR5IpE6B2EdFy+xdTAVbD8WpsrvMgv0ZfiSIKkac2ho3I2ZYMaihPXgqVzsmTSgd8Dsw+SEd8t2KQZuBu+X7Oju6YEnJXPxy+oKpjteqbC0L1sEpv1cx4epsdDEaxzj5RUr2Z2p1yDxynYF1HS1s9rTGIz8Q7JepH/6SjlbgCOSzTMpuVBmomQ+77WqnGJRG5/iVyxuO/fIKTtRs/l38d7kfdj/RxVVGCFwg== 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=Ga/M1/3AQHeq+4L170paz3HOKdDlLhcATXvdBhfkEks=; b=u3FS+7M4HTFlPI+VTTJwIletmiBg6O2BC8HHTaNOatzx8XA3+WNx8mLqwtKtVJ8KYjTTcrXorF5OZoBzZ0ev1UF6XZfiBBK49/iZLCwkV9eZzKFMvAaDvOXCYReq0HSepbcYMrmYF+JD5wE3ZZRbUid8aa5dluK2UfeNbK2BNukzmE+PTYQ6JYyP3adk9Pc6g2L+Kfp06p9Wm1aCDwHmtshEgnNGd1QW6QeOOXj2JJujAofm9ozB4s3f+YiQjK0ft1oDy7ARi8yM0qz859NZdsj1HFCmff827PTG1kwLQTtZoEcyXCFZi0biLwQUOHbkoeQAlADZ+EinoE1/EcdxAQ== Received: from MA0P287MB0217.INDP287.PROD.OUTLOOK.COM (2603:1096:a01:b3::9) by PN0P287MB1715.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:18a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.14; Thu, 8 Aug 2024 12:08:11 +0000 Received: from MA0P287MB0217.INDP287.PROD.OUTLOOK.COM ([fe80::98d2:3610:b33c:435a]) by MA0P287MB0217.INDP287.PROD.OUTLOOK.COM ([fe80::98d2:3610:b33c:435a%5]) with mapi id 15.20.7849.013; Thu, 8 Aug 2024 12:08:11 +0000 From: Aditya Garg To: "tzimmermann@suse.de" , "maarten.lankhorst@linux.intel.com" , "mripard@kernel.org" , "airlied@gmail.com" , "daniel@ffwll.ch" , Jiri Kosina , "bentiss@kernel.org" CC: Kerem Karabay , Linux Kernel Mailing List , "dri-devel@lists.freedesktop.org" , "linux-input@vger.kernel.org" , Orlando Chamberlain Subject: [PATCH RESEND v2 2/9] HID: hid-appletb-kbd: add driver for the keyboard mode of Apple Touch Bars Thread-Topic: [PATCH RESEND v2 2/9] HID: hid-appletb-kbd: add driver for the keyboard mode of Apple Touch Bars Thread-Index: AQHa6YujF+uxoOhCKkG6z2qpy9Z2/w== Date: Thu, 8 Aug 2024 12:08:11 +0000 Message-ID: References: <752D8EEA-EE3B-4854-9B5E-F412AFA20048@live.com> In-Reply-To: <752D8EEA-EE3B-4854-9B5E-F412AFA20048@live.com> Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [+4SJvMX/OKF0gfYC2N/Sy7og+IDQnSGnLkZHX/HVEsvLiX6WkDoAA3iXv/SS2F776fdbzjAKnBw=] x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MA0P287MB0217:EE_|PN0P287MB1715:EE_ x-ms-office365-filtering-correlation-id: e6f9b903-385e-47ad-4357-08dcb7a2c617 x-microsoft-antispam: BCL:0;ARA:14566002|15080799003|461199028|8060799006|19110799003|440099028|3412199025|102099032; x-microsoft-antispam-message-info: M7KOWfROYO2XpTCQfyHHvhly/+o7MrkeEOmktwJWcmDiSGy1NpXzMD+FrZHRWg/TWVhqgrWu9TmVO7houGlhCsv8L/DScsFrFiLz27NSTv4UIhAl6YQFQeFW6uvCAx2dRPhrBRvO1kOxjHFee2usqVs0PJrhxz2HCT+ug39s7ixE/5wmKcBaPMcf+5bcJSOUGycSu8fXSIp+RHe35RpDC3NUHouEhFhADC44Awr8567PCI2WpFqiqtYI8EpsSQKfc2TfOVMXr41tD4uCTqVNc4ac63qLe3YiZehSvErzuI7n6Kuf/4tW0GdmZz1s+mcqawgtZ0+Q87PjlPmKSh957wk2dLsdBEElSb9VIb2psigio+xREMq+ntfcZI0dU1NtxUR4ETnGCyWtaZDHKWNR739yNi41wS+p3PDmkg4u0haE63pp7iUaBKiaBkNkRfY6cc0i79qHUPjK522SxPULh5l92BK+8C/W5kK9sodWwux6pCqjpjMX1gx9dheyDgii3qQfxGIcihIBSr4jVRsBTMXhKKZ47kVM7M2Xd2mFzV6OkxZN5oEz0a3FWvvFdGOzq6vs75qLs7S8Zt3sfpBs638n17+Z6STNbylaPw1z2xGH3ytsdz6E2YQ4R49gzFHnsF0r5NTibHf3A6gwh5k8Rs4OIozN+/6vJNeavX+8GhK0WI0kzstMggfG+UYXUghU x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?2aMzrzN+d7tDLxZoTBaAbTxuqymm?= =?utf-8?q?9Laj3laP22eKd25Vj5B6DxguawDwtDDtB9Gj+HaxEMdusJw1iGXf6bcDNrWz3lAWe?= =?utf-8?q?MtQONWniMOu13BcZktANNxAlXjXk8u+cNVLnWmMoBZ99y+aC99isBT4nXgyZ8Vt7v?= =?utf-8?q?M4Q3SEyF7/dINkErMFZwh8LrJIN4z2yneXhEKjcV6uw/+0i0DRdee6JcqkO0bKQKD?= =?utf-8?q?/u9yFxx9pWN870TwlihxDyh9HpwHZs4irPB1Z7Ncwl3Uj5kY3mJrepwwFTwzVWk6p?= =?utf-8?q?kjkF8cdR2jE7UNVI8ohI3ljgbjesljvh0FBmSdzNIEs9Rl9upfPQCDocXM+h3JmiT?= =?utf-8?q?GysB25Qx8Fnr8y8B2unD8Xwjjxq6pSmrr8mr4ndGsvUNwJkf4yiVZsP/YK7UrgmNi?= =?utf-8?q?L7AwZ54oE3WdJiyXGOiId7TQVLiOFAMkWbWfN1Q5rKHGEENYuFAzfmoEMc+SWn/Vh?= =?utf-8?q?B9SBF1w2N9DRcq/qjp9C3ipkt0/uZ3epOBmSsotwW2VbBXeALmh5ndaG8LN+D1f7Y?= =?utf-8?q?8oNfsKTKct6bQRM9vHa/HDZ7eBIuMFjS47FGbS1jq4pMMnSxFxLUGMyCaLPHlekPA?= =?utf-8?q?LMy/H+NCTB0Ea1c2BUkRIGWnJhsO8tAnBFbT4t1BSd3gZjGwKtO0SB/72A8RS82BW?= =?utf-8?q?K7FJCDPt1vv/5BkbSNppLmdU9uUCaP5r1nw7Oig9rzsnDiNKMpckMYjtSTCBuG7yB?= =?utf-8?q?wULVu9ZQBQl6hRBVYyMJSgb3/qABhXhPRcQsUzG23F8L9684OPYT4qzIrF9RWAiXU?= =?utf-8?q?wFL/7dFrPtx39eZyRRrVd1VhdXRaQWmiK1VSwUxKAEHh/7XV2wHQfd/DXJFy3HPWT?= =?utf-8?q?Z9L82LexzjQGgfg0fqPapbTTDdU1+hhS/wd0rSexGWjAlakLBQSJ8g7W0gkFCRo8I?= =?utf-8?q?Rqtoey3M9SYJPu1ZsJ/yo6AJrayzErlFH+8Gdy6ngIfca1mcEr63bSUq3AAI/m/f+?= =?utf-8?q?MIp9a+AuZm7yrQPCNk5L4BRX5S92fIyytxzEu2EPwcjj7Duv1fDbZDi4ge602clVd?= =?utf-8?q?Z2wahfwZQdOqqbYluZvLb6mRwIN7ArFQ18iAq96OaoFfh8opWhnqv1RtAoY+0gtq/?= =?utf-8?q?W4ItLhx9cB2Cab9og5+NYQKGqS5lj7SQLCAQLc8IOdcUyC0g/oZqR72m8D+nqp1Hh?= =?utf-8?q?gXfZAnhTVVZQvGmdRVVISVkjc0hCuJSugXN5N35nJ9St4e9aKwLgdhfJhxPq2oUtG?= =?utf-8?q?PT+uoGSmaw+6j1jGM51hrhhYi/46aHXvYdg+29z8/6Y2ei7X+2+DVQA1zs32Xe5gI?= =?utf-8?q?ILwFYcCQHN8ANVsN?= Content-ID: <2123A7F6B03186418FD015980F83E1BB@INDP287.PROD.OUTLOOK.COM> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-7719-20-msonline-outlook-24072.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MA0P287MB0217.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: e6f9b903-385e-47ad-4357-08dcb7a2c617 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Aug 2024 12:08:11.5643 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN0P287MB1715 From: Kerem Karabay The Touch Bars found on x86 Macs support two USB configurations: one where the device presents itself as a HID keyboard and can display predefined sets of keys, and one where the operating system has full control over what is displayed. This commit adds a driver for the display functionality of the first configuration. Note that currently only T2 Macs are supported. This driver is based on previous work done by Ronald Tschalär . Signed-off-by: Kerem Karabay Co-developed-by: Aditya Garg Signed-off-by: Aditya Garg --- .../ABI/testing/sysfs-driver-hid-appletb-kbd | 13 + drivers/hid/Kconfig | 11 + drivers/hid/Makefile | 1 + drivers/hid/hid-appletb-kbd.c | 303 ++++++++++++++++++ drivers/hid/hid-quirks.c | 4 +- 5 files changed, 331 insertions(+), 1 deletion(-) create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd create mode 100644 drivers/hid/hid-appletb-kbd.c diff --git a/Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd b/Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd new file mode 100644 index 000000000..2a19584d0 --- /dev/null +++ b/Documentation/ABI/testing/sysfs-driver-hid-appletb-kbd @@ -0,0 +1,13 @@ +What: /sys/bus/hid/drivers/hid-appletb-kbd//mode +Date: September, 2023 +KernelVersion: 6.5 +Contact: linux-input@vger.kernel.org +Description: + The set of keys displayed on the Touch Bar. + Valid values are: + == ================= + 0 Escape key only + 1 Function keys + 2 Media/brightness keys + 3 None + == ================= diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 4988c1fb2..72b665eda 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -158,6 +158,17 @@ config HID_APPLETB_BL To compile this driver as a module, choose M here: the module will be called hid-appletb-bl. +config HID_APPLETB_KBD + tristate "Apple Touch Bar Keyboard Mode" + depends on USB_HID + help + Say Y here if you want support for the keyboard mode (escape, + function, media and brightness keys) of Touch Bars on x86 MacBook + Pros. + + To compile this driver as a module, choose M here: the + module will be called hid-appletb-kbd. + config HID_ASUS tristate "Asus" depends on USB_HID diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 1d825a474..d903c9a26 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_HID_ACRUX) += hid-axff.o obj-$(CONFIG_HID_APPLE) += hid-apple.o obj-$(CONFIG_HID_APPLEIR) += hid-appleir.o obj-$(CONFIG_HID_APPLETB_BL) += hid-appletb-bl.o +obj-$(CONFIG_HID_APPLETB_KBD) += hid-appletb-kbd.o obj-$(CONFIG_HID_CREATIVE_SB0540) += hid-creative-sb0540.o obj-$(CONFIG_HID_ASUS) += hid-asus.o obj-$(CONFIG_HID_AUREAL) += hid-aureal.o diff --git a/drivers/hid/hid-appletb-kbd.c b/drivers/hid/hid-appletb-kbd.c new file mode 100644 index 000000000..0b6ac8c59 --- /dev/null +++ b/drivers/hid/hid-appletb-kbd.c @@ -0,0 +1,303 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Apple Touch Bar Keyboard Mode Driver + * + * Copyright (c) 2017-2018 Ronald Tschalär + * Copyright (c) 2022-2023 Kerem Karabay + * Copyright (c) 2024 Aditya Garg + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "hid-ids.h" + +#define APPLETB_KBD_MODE_ESC 0 +#define APPLETB_KBD_MODE_FN 1 +#define APPLETB_KBD_MODE_SPCL 2 +#define APPLETB_KBD_MODE_OFF 3 +#define APPLETB_KBD_MODE_MAX APPLETB_KBD_MODE_OFF + +#define HID_USAGE_MODE 0x00ff0004 + +static int appletb_tb_def_mode = APPLETB_KBD_MODE_FN; +module_param_named(mode, appletb_tb_def_mode, int, 0444); +MODULE_PARM_DESC(mode, "Default touchbar mode:\n" + " 0 - escape key only\n" + " [1] - function-keys only\n" + " 2 - special keys only"); + +struct appletb_kbd { + struct hid_field *mode_field; + + u8 saved_mode; + u8 current_mode; +}; + +static const struct key_entry appletb_kbd_keymap_spcl[] = { + { KE_KEY, KEY_ESC, { KEY_ESC } }, + { KE_KEY, KEY_F1, { KEY_BRIGHTNESSDOWN } }, + { KE_KEY, KEY_F2, { KEY_BRIGHTNESSUP } }, + { KE_KEY, KEY_F3, { KEY_RESERVED } }, + { KE_KEY, KEY_F4, { KEY_RESERVED } }, + { KE_KEY, KEY_F5, { KEY_KBDILLUMDOWN } }, + { KE_KEY, KEY_F6, { KEY_KBDILLUMUP } }, + { KE_KEY, KEY_F7, { KEY_PREVIOUSSONG } }, + { KE_KEY, KEY_F8, { KEY_PLAYPAUSE } }, + { KE_KEY, KEY_F9, { KEY_NEXTSONG } }, + { KE_KEY, KEY_F10, { KEY_MUTE } }, + { KE_KEY, KEY_F11, { KEY_VOLUMEDOWN } }, + { KE_KEY, KEY_F12, { KEY_VOLUMEUP } }, + { KE_END, 0 } +}; + +static int appletb_kbd_set_mode(struct appletb_kbd *kbd, u8 mode) +{ + struct hid_report *report = kbd->mode_field->report; + struct hid_device *hdev = report->device; + int ret; + + ret = hid_hw_power(hdev, PM_HINT_FULLON); + if (ret) { + hid_err(hdev, "Device didn't resume (%pe)\n", ERR_PTR(ret)); + return ret; + } + + ret = hid_set_field(kbd->mode_field, 0, mode); + if (ret) { + hid_err(hdev, "Failed to set mode field to %u (%pe)\n", mode, ERR_PTR(ret)); + goto power_normal; + } + + hid_hw_request(hdev, report, HID_REQ_SET_REPORT); + + kbd->current_mode = mode; + +power_normal: + hid_hw_power(hdev, PM_HINT_NORMAL); + + return ret; +} + +static ssize_t mode_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct appletb_kbd *kbd = dev_get_drvdata(dev); + + return sysfs_emit(buf, "%d\n", kbd->current_mode); +} + +static ssize_t mode_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t size) +{ + struct appletb_kbd *kbd = dev_get_drvdata(dev); + u8 mode; + int ret; + + ret = kstrtou8(buf, 0, &mode); + if (ret) + return ret; + + if (mode > APPLETB_KBD_MODE_MAX) + return -EINVAL; + + ret = appletb_kbd_set_mode(kbd, mode); + + return ret < 0 ? ret : size; +} +static DEVICE_ATTR_RW(mode); + +struct attribute *appletb_kbd_attrs[] = { + &dev_attr_mode.attr, + NULL +}; +ATTRIBUTE_GROUPS(appletb_kbd); + +static int appletb_tb_key_to_slot(unsigned int code) +{ + switch (code) { + case KEY_ESC: + return 0; + case KEY_F1 ... KEY_F10: + return code - KEY_F1 + 1; + case KEY_F11 ... KEY_F12: + return code - KEY_F11 + 11; + + default: + return -EINVAL; + } +} + +static int appletb_kbd_hid_event(struct hid_device *hdev, struct hid_field *field, + struct hid_usage *usage, __s32 value) +{ + struct appletb_kbd *kbd = hid_get_drvdata(hdev); + struct key_entry *translation; + struct input_dev *input; + int slot; + + if ((usage->hid & HID_USAGE_PAGE) != HID_UP_KEYBOARD || usage->type != EV_KEY) + return 0; + + input = field->hidinput->input; + + /* + * Skip non-touch-bar keys. + * + * Either the touch bar itself or usbhid generate a slew of key-down + * events for all the meta keys. None of which we're at all interested + * in. + */ + slot = appletb_tb_key_to_slot(usage->code); + if (slot < 0) + return 0; + + translation = sparse_keymap_entry_from_scancode(input, usage->code); + + if (translation && kbd->current_mode == APPLETB_KBD_MODE_SPCL) { + input_event(input, usage->type, translation->keycode, value); + + return 1; + } + + return kbd->current_mode == APPLETB_KBD_MODE_OFF; +} + +static int appletb_kbd_input_configured(struct hid_device *hdev, struct hid_input *hidinput) +{ + struct input_dev *input = hidinput->input; + + /* + * Clear various input capabilities that are blindly set by the hid + * driver (usbkbd.c) + */ + memset(input->evbit, 0, sizeof(input->evbit)); + memset(input->keybit, 0, sizeof(input->keybit)); + memset(input->ledbit, 0, sizeof(input->ledbit)); + + __set_bit(EV_REP, input->evbit); + + sparse_keymap_setup(input, appletb_kbd_keymap_spcl, NULL); + + for (int i = KEY_F1; i <= KEY_F12; i++) { + input_set_capability(input, EV_KEY, i); + } + + return 0; +} + +static int appletb_kbd_probe(struct hid_device *hdev, const struct hid_device_id *id) +{ + struct appletb_kbd *kbd; + struct device *dev = &hdev->dev; + struct hid_field *mode_field; + int ret; + + ret = hid_parse(hdev); + if (ret) + return dev_err_probe(dev, ret, "HID parse failed\n"); + + mode_field = hid_find_field(hdev, HID_OUTPUT_REPORT, + HID_GD_KEYBOARD, HID_USAGE_MODE); + if (!mode_field) + return -ENODEV; + + kbd = devm_kzalloc(dev, sizeof(*kbd), GFP_KERNEL); + if (!kbd) + return -ENOMEM; + + kbd->mode_field = mode_field; + + ret = hid_hw_start(hdev, HID_CONNECT_HIDINPUT); + if (ret) + return dev_err_probe(dev, ret, "HID hw start failed\n"); + + ret = hid_hw_open(hdev); + if (ret) { + dev_err_probe(dev, ret, "HID hw open failed\n"); + goto stop_hw; + } + + ret = appletb_kbd_set_mode(kbd, appletb_tb_def_mode); + if (ret) { + dev_err_probe(dev, ret, "Failed to set touchbar mode\n"); + goto close_hw; + } + + hid_set_drvdata(hdev, kbd); + + return 0; + +close_hw: + hid_hw_close(hdev); +stop_hw: + hid_hw_stop(hdev); + return ret; +} + +static void appletb_kbd_remove(struct hid_device *hdev) +{ + struct appletb_kbd *kbd = hid_get_drvdata(hdev); + + appletb_kbd_set_mode(kbd, APPLETB_KBD_MODE_OFF); + + hid_hw_close(hdev); + hid_hw_stop(hdev); +} + +#ifdef CONFIG_PM +static int appletb_kbd_suspend(struct hid_device *hdev, pm_message_t msg) +{ + struct appletb_kbd *kbd = hid_get_drvdata(hdev); + + kbd->saved_mode = kbd->current_mode; + appletb_kbd_set_mode(kbd, APPLETB_KBD_MODE_OFF); + + return 0; +} + +static int appletb_kbd_reset_resume(struct hid_device *hdev) +{ + struct appletb_kbd *kbd = hid_get_drvdata(hdev); + + appletb_kbd_set_mode(kbd, kbd->saved_mode); + + return 0; +} +#endif + +static const struct hid_device_id appletb_kbd_hid_ids[] = { + /* MacBook Pro's 2018, 2019, with T2 chip: iBridge Display */ + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY) }, + { } +}; +MODULE_DEVICE_TABLE(hid, appletb_kbd_hid_ids); + +static struct hid_driver appletb_kbd_hid_driver = { + .name = "hid-appletb-kbd", + .id_table = appletb_kbd_hid_ids, + .probe = appletb_kbd_probe, + .remove = appletb_kbd_remove, + .event = appletb_kbd_hid_event, + .input_configured = appletb_kbd_input_configured, +#ifdef CONFIG_PM + .suspend = appletb_kbd_suspend, + .reset_resume = appletb_kbd_reset_resume, +#endif + .driver.dev_groups = appletb_kbd_groups, +}; +module_hid_driver(appletb_kbd_hid_driver); + +MODULE_AUTHOR("Ronald Tschalär"); +MODULE_AUTHOR("Kerem Karabay "); +MODULE_DESCRIPTION("MacBookPro Touch Bar Keyboard Mode Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index 818d41a35..7c576d654 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -328,7 +328,6 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_2021) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_FINGERPRINT_2021) }, - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY) }, #endif #if IS_ENABLED(CONFIG_HID_APPLEIR) { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) }, @@ -340,6 +339,9 @@ static const struct hid_device_id hid_have_special_driver[] = { #if IS_ENABLED(CONFIG_HID_APPLETB_BL) { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, #endif +#if IS_ENABLED(CONFIG_HID_APPLETB_KBD) + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY) }, +#endif #if IS_ENABLED(CONFIG_HID_ASUS) { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_I2C_KEYBOARD) }, { HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD) },