* [PATCH 0/3] Touch Bar and Keyboard backlight driver for Intel Macs
@ 2023-02-10 3:41 Aditya Garg
2023-02-10 3:43 ` [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip Aditya Garg
2023-02-10 10:18 ` [PATCH 0/3] Touch Bar and Keyboard backlight driver for Intel Macs Andy Shevchenko
0 siblings, 2 replies; 32+ messages in thread
From: Aditya Garg @ 2023-02-10 3:41 UTC (permalink / raw)
To: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko,
andy.shevchenko
Cc: LKML, linux-input, ronald, kekrby, Orlando Chamberlain
Greetings from t2linux!
2 years ago an attempt was made to send the driver for the Touch Bar on
MacBook Pros by Ronald Tschalär [1].
Due to some issues pointed out by the maintainers upstream, unfortunately
it didn't make it upstream. Now we at t2linux [2] have addressed those
issues in this patchset and also improved the touchbar driver for the T2
Macs. We also have added a new driver for keyboard backlight support on
T2 MacBooks with Magic Keyboard.
The first 2 patches of this patchset are the ones sent by Ronald before,
with the issues addressed as pointed out in [1].
The third patch introduces a new driver, apple-magic-backlight, which adds
support for keyboard backlight on T2 MacBooks with the Magic Keyboard.
Note: Apart from these drivers, for the T2 Macs, an additional driver
shall be required to communicate with the T2 Security Chip, as the Touch
Bar, the internal keyboard, trackpad, camera, ambient light sensor,
headphone controls, and NCM Ethernet are accessed through a USB VHCI
created with DMA channels to the "T2 Bridge Controller" 106b:1801 PCI
device. A work in progress linux driver called apple-bce [3], or USB
device passthrough to a Linux VM guest on a Windows host with Apple
Bootcamp drivers can be used to get Linux these USB devices working and
test these patches.
[1] https://lore.kernel.org/lkml/20210228012643.69944-1-ronald@innovation.ch/
[2] https://t2linux.org/
[3] https://github.com/t2linux/apple-bce-drv
Orlando Chamberlain (1):
HID: apple-magic-backlight: Add driver for keyboard backlight on
internal Magic Keyboards
Ronald Tschalär (2):
HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip
HID: apple-touchbar: Add driver for the Touch Bar on MacBook Pros
MAINTAINERS | 6 +
drivers/hid/Kconfig | 39 +
drivers/hid/Makefile | 3 +
drivers/hid/apple-ibridge.c | 610 +++++++++++
drivers/hid/apple-ibridge.h | 15 +
drivers/hid/apple-magic-backlight.c | 143 +++
drivers/hid/apple-touchbar.c | 1500 +++++++++++++++++++++++++++
drivers/hid/hid-ids.h | 1 +
drivers/hid/hid-quirks.c | 5 +
9 files changed, 2322 insertions(+)
create mode 100644 drivers/hid/apple-ibridge.c
create mode 100644 drivers/hid/apple-ibridge.h
create mode 100644 drivers/hid/apple-magic-backlight.c
create mode 100644 drivers/hid/apple-touchbar.c
--
2.37.2
^ permalink raw reply [flat|nested] 32+ messages in thread* [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip. 2023-02-10 3:41 [PATCH 0/3] Touch Bar and Keyboard backlight driver for Intel Macs Aditya Garg @ 2023-02-10 3:43 ` Aditya Garg 2023-02-10 3:44 ` [PATCH 2/3] HID: apple-touchbar: Add driver for the Touch Bar on MacBook Pros Aditya Garg ` (2 more replies) 2023-02-10 10:18 ` [PATCH 0/3] Touch Bar and Keyboard backlight driver for Intel Macs Andy Shevchenko 1 sibling, 3 replies; 32+ messages in thread From: Aditya Garg @ 2023-02-10 3:43 UTC (permalink / raw) To: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko Cc: LKML, linux-input, ronald, kekrby, Orlando Chamberlain From: Ronald Tschalär <ronald@innovation.ch> The iBridge device provides access to several devices, including: - the Touch Bar - the iSight webcam - the light sensor - the fingerprint sensor This driver provides the core support for managing the iBridge device and the access to the underlying devices. In particular, the functionality for the touch bar and light sensor is exposed via USB HID interfaces, and on devices with the T1 chip one of the HID devices is used for both functions. So this driver creates virtual HID devices, one per top-level report collection on each HID device (for a total of 3 virtual HID devices). The sub-drivers then bind to these virtual HID devices. This way the Touch Bar and ALS drivers can be kept in their own modules, while at the same time making them look very much like as if they were connected to the real HID devices. And those drivers then work (mostly) without further changes on MacBooks with the T2 chip that don't need this driver. Signed-off-by: Ronald Tschalär <ronald@innovation.ch> [Kerem Karabay: convert to a platform driver] [Kerem Karabay: fix appleib_forward_int_op] [Kerem Karabay: rely on HID core's parsing in appleib_add_device] Signed-off-by: Kerem Karabay <kekrby@gmail.com> Signed-off-by: Aditya Garg <gargaditya08@live.com> --- drivers/hid/Kconfig | 15 + drivers/hid/Makefile | 1 + drivers/hid/apple-ibridge.c | 610 ++++++++++++++++++++++++++++++++++++ drivers/hid/apple-ibridge.h | 15 + drivers/hid/hid-ids.h | 1 + drivers/hid/hid-quirks.c | 3 + 6 files changed, 645 insertions(+) create mode 100644 drivers/hid/apple-ibridge.c create mode 100644 drivers/hid/apple-ibridge.h diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index e2a5d30c8..e69afa5f4 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -130,6 +130,21 @@ config HID_APPLE Say Y here if you want support for keyboards of Apple iBooks, PowerBooks, MacBooks, MacBook Pros and Apple Aluminum. +config HID_APPLE_IBRIDGE + tristate "Apple iBridge" + depends on USB_HID + depends on (X86 && ACPI) || COMPILE_TEST + imply HID_SENSOR_HUB + imply HID_SENSOR_ALS + help + This module provides the core support for the Apple T1 chip found + on 2016 and 2017 MacBookPro's, also known as the iBridge. The drivers + for the Touch Bar (apple-touchbar) and light sensor (hid-sensor-hub + and hid-sensor-als) need to be enabled separately. + + To compile this driver as a module, choose M here: the + module will be called apple-ibridge. + config HID_APPLEIR tristate "Apple infrared receiver" depends on (USB_HID) diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index e8014c1a2..b61373cd8 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -26,6 +26,7 @@ obj-$(CONFIG_HID_ACCUTOUCH) += hid-accutouch.o obj-$(CONFIG_HID_ALPS) += hid-alps.o obj-$(CONFIG_HID_ACRUX) += hid-axff.o obj-$(CONFIG_HID_APPLE) += hid-apple.o +obj-$(CONFIG_HID_APPLE_IBRIDGE) += apple-ibridge.o obj-$(CONFIG_HID_APPLEIR) += hid-appleir.o obj-$(CONFIG_HID_CREATIVE_SB0540) += hid-creative-sb0540.o obj-$(CONFIG_HID_ASUS) += hid-asus.o diff --git a/drivers/hid/apple-ibridge.c b/drivers/hid/apple-ibridge.c new file mode 100644 index 000000000..4d26f8d66 --- /dev/null +++ b/drivers/hid/apple-ibridge.c @@ -0,0 +1,610 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Apple iBridge Driver + * + * Copyright (c) 2018 Ronald Tschalär + */ + +/** + * DOC: Overview + * + * 2016 and 2017 MacBookPro models with a Touch Bar (MacBookPro13,[23] and + * MacBookPro14,[23]) have an Apple iBridge chip (also known as T1 chip) which + * exposes the touch bar, built-in webcam (iSight), ambient light sensor, and + * Secure Enclave Processor (SEP) for TouchID. It shows up in the system as a + * USB device with 3 configurations: 'Default iBridge Interfaces', 'Default + * iBridge Interfaces(OS X)', and 'Default iBridge Interfaces(Recovery)'. + * + * In the first (default after boot) configuration, 4 usb interfaces are + * exposed: 2 related to the webcam, and 2 USB HID interfaces representing + * the touch bar and the ambient light sensor. The webcam interfaces are + * already handled by the uvcvideo driver. However, there is a problem with + * the other two interfaces: one of them contains functionality (HID reports) + * used by both the touch bar and the ALS, which is an issue because the kernel + * allows only one driver to be attached to a given device. This driver exists + * to solve this issue. + * + * This driver is implemented as a HID driver that attaches to both HID + * interfaces and in turn creates several virtual child HID devices, one for + * each top-level collection found in each interfaces report descriptor. The + * touch bar and ALS drivers then attach to these virtual HID devices, and this + * driver forwards the operations between the real and virtual devices. + * + * One important aspect of this approach is that resulting (virtual) HID + * devices look much like the HID devices found on the later MacBookPro models + * which have a T2 chip, where there are separate USB interfaces for the touch + * bar and ALS functionality, which means that the touch bar and ALS drivers + * work (mostly) the same on both types of models. + * + * Lastly, this driver also takes care of the power-management for the + * iBridge when suspending and resuming. + */ + +#include <linux/platform_device.h> +#include <linux/acpi.h> +#include <linux/device.h> +#include <linux/hid.h> +#include <linux/list.h> +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/usb.h> + +#include "hid-ids.h" +#include "../hid/usbhid/usbhid.h" +#include "apple-ibridge.h" + +#define APPLEIB_BASIC_CONFIG 1 + +static struct hid_device_id appleib_sub_hid_ids[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_LINUX_FOUNDATION, + USB_DEVICE_ID_IBRIDGE_TB) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LINUX_FOUNDATION, + USB_DEVICE_ID_IBRIDGE_ALS) }, +}; + +static struct { + unsigned int usage; + struct hid_device_id *dev_id; +} appleib_usage_map[] = { + /* Default iBridge configuration, key inputs and mode settings */ + { 0x00010006, &appleib_sub_hid_ids[0] }, + /* OS X iBridge configuration, digitizer inputs */ + { 0x000D0005, &appleib_sub_hid_ids[0] }, + /* All iBridge configurations, display/DFR settings */ + { 0xFF120001, &appleib_sub_hid_ids[0] }, + /* All iBridge configurations, ALS */ + { 0x00200041, &appleib_sub_hid_ids[1] }, +}; + +struct appleib_device { + acpi_handle asoc_socw; +}; + +struct appleib_hid_dev_info { + struct hid_device *hdev; + struct hid_device *sub_hdevs[ARRAY_SIZE(appleib_sub_hid_ids)]; + bool sub_open[ARRAY_SIZE(appleib_sub_hid_ids)]; +}; + +static int appleib_hid_raw_event(struct hid_device *hdev, + struct hid_report *report, u8 *data, int size) +{ + struct appleib_hid_dev_info *hdev_info = hid_get_drvdata(hdev); + int i; + + for (i = 0; i < ARRAY_SIZE(hdev_info->sub_hdevs); i++) { + if (READ_ONCE(hdev_info->sub_open[i])) + hid_input_report(hdev_info->sub_hdevs[i], report->type, + data, size, 0); + } + + return 0; +} + +static __u8 *appleib_report_fixup(struct hid_device *hdev, __u8 *rdesc, + unsigned int *rsize) +{ + /* Some fields have a size of 64 bits, which according to HID 1.11 + * Section 8.4 is not valid ("An item field cannot span more than 4 + * bytes in a report"). Furthermore, hid_field_extract() complains + * when encountering such a field. So turn them into two 32-bit fields + * instead. + */ + + if (*rsize == 634 && + /* Usage Page 0xff12 (vendor defined) */ + rdesc[212] == 0x06 && rdesc[213] == 0x12 && rdesc[214] == 0xff && + /* Usage 0x51 */ + rdesc[416] == 0x09 && rdesc[417] == 0x51 && + /* report size 64 */ + rdesc[432] == 0x75 && rdesc[433] == 64 && + /* report count 1 */ + rdesc[434] == 0x95 && rdesc[435] == 1) { + rdesc[433] = 32; + rdesc[435] = 2; + hid_dbg(hdev, "Fixed up first 64-bit field\n"); + } + + if (*rsize == 634 && + /* Usage Page 0xff12 (vendor defined) */ + rdesc[212] == 0x06 && rdesc[213] == 0x12 && rdesc[214] == 0xff && + /* Usage 0x51 */ + rdesc[611] == 0x09 && rdesc[612] == 0x51 && + /* report size 64 */ + rdesc[627] == 0x75 && rdesc[628] == 64 && + /* report count 1 */ + rdesc[629] == 0x95 && rdesc[630] == 1) { + rdesc[628] = 32; + rdesc[630] = 2; + hid_dbg(hdev, "Fixed up second 64-bit field\n"); + } + + return rdesc; +} + +#ifdef CONFIG_PM +/** + * appleib_forward_int_op() - Forward a hid-driver callback to all drivers on + * all virtual HID devices attached to the given real HID device. + * @hdev the real hid-device + * @forward a function that calls the callback on the given driver + * @args arguments for the forward function + * + * This is for callbacks that return a status as an int. + * + * Returns: 0 on success, or the first error returned by the @forward function. + */ +static int appleib_forward_int_op(struct hid_device *hdev, + int (*forward)(struct hid_driver *, + struct hid_device *, void *), + void *args) +{ + struct appleib_hid_dev_info *hdev_info = hid_get_drvdata(hdev); + struct hid_device *sub_hdev; + int rc; + int i; + + for (i = 0; i < ARRAY_SIZE(hdev_info->sub_hdevs); i++) { + sub_hdev = hdev_info->sub_hdevs[i]; + if (sub_hdev->driver) { + rc = forward(sub_hdev->driver, sub_hdev, args); + if (rc) + return rc; + } + } + + return 0; +} + +static int appleib_hid_suspend_fwd(struct hid_driver *drv, + struct hid_device *hdev, void *args) +{ + int rc = 0; + + if (drv->suspend) + rc = drv->suspend(hdev, *(pm_message_t *)args); + + return rc; +} + +static int appleib_hid_suspend(struct hid_device *hdev, pm_message_t message) +{ + return appleib_forward_int_op(hdev, appleib_hid_suspend_fwd, &message); +} + +static int appleib_hid_resume_fwd(struct hid_driver *drv, + struct hid_device *hdev, void *args) +{ + int rc = 0; + + if (drv->resume) + rc = drv->resume(hdev); + + return rc; +} + +static int appleib_hid_resume(struct hid_device *hdev) +{ + return appleib_forward_int_op(hdev, appleib_hid_resume_fwd, NULL); +} + +static int appleib_hid_reset_resume_fwd(struct hid_driver *drv, + struct hid_device *hdev, void *args) +{ + int rc = 0; + + if (drv->reset_resume) + rc = drv->reset_resume(hdev); + + return rc; +} + +static int appleib_hid_reset_resume(struct hid_device *hdev) +{ + return appleib_forward_int_op(hdev, appleib_hid_reset_resume_fwd, NULL); +} +#endif /* CONFIG_PM */ + +static int appleib_ll_start(struct hid_device *hdev) +{ + return 0; +} + +static void appleib_ll_stop(struct hid_device *hdev) +{ +} + +static int appleib_set_open(struct hid_device *hdev, bool open) +{ + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; + int i; + + for (i = 0; i < ARRAY_SIZE(hdev_info->sub_hdevs); i++) { + /* + * hid_hw_open(), and hence appleib_ll_open(), is called + * from the driver's probe function, which in turn is called + * while adding the sub-hdev; but at this point we haven't yet + * added the sub-hdev to our list. So if we don't find the + * sub-hdev in our list assume it's in the process of being + * added and set the flag on the first unset sub-hdev. + */ + if (hdev_info->sub_hdevs[i] == hdev || + !hdev_info->sub_hdevs[i]) { + WRITE_ONCE(hdev_info->sub_open[i], open); + return 0; + } + } + + return -ENODEV; +} + +static int appleib_ll_open(struct hid_device *hdev) +{ + return appleib_set_open(hdev, true); +} + +static void appleib_ll_close(struct hid_device *hdev) +{ + appleib_set_open(hdev, false); +} + +static int appleib_ll_power(struct hid_device *hdev, int level) +{ + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; + + return hid_hw_power(hdev_info->hdev, level); +} + +static int appleib_ll_parse(struct hid_device *hdev) +{ + /* we've already called hid_parse_report() */ + return 0; +} + +static void appleib_ll_request(struct hid_device *hdev, + struct hid_report *report, int reqtype) +{ + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; + + hid_hw_request(hdev_info->hdev, report, reqtype); +} + +static int appleib_ll_wait(struct hid_device *hdev) +{ + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; + + hid_hw_wait(hdev_info->hdev); + return 0; +} + +static int appleib_ll_raw_request(struct hid_device *hdev, + unsigned char reportnum, __u8 *buf, + size_t len, unsigned char rtype, int reqtype) +{ + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; + + return hid_hw_raw_request(hdev_info->hdev, reportnum, buf, len, rtype, + reqtype); +} + +static int appleib_ll_output_report(struct hid_device *hdev, __u8 *buf, + size_t len) +{ + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; + + return hid_hw_output_report(hdev_info->hdev, buf, len); +} + +static struct hid_ll_driver appleib_ll_driver = { + .start = appleib_ll_start, + .stop = appleib_ll_stop, + .open = appleib_ll_open, + .close = appleib_ll_close, + .power = appleib_ll_power, + .parse = appleib_ll_parse, + .request = appleib_ll_request, + .wait = appleib_ll_wait, + .raw_request = appleib_ll_raw_request, + .output_report = appleib_ll_output_report, +}; + +static struct hid_device_id *appleib_find_dev_id_for_usage(unsigned int usage) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(appleib_usage_map); i++) { + if (appleib_usage_map[i].usage == usage) + return appleib_usage_map[i].dev_id; + } + + return NULL; +} + +static struct hid_device * +appleib_add_sub_dev(struct appleib_hid_dev_info *hdev_info, + struct hid_device_id *dev_id) +{ + struct hid_device *sub_hdev; + int rc; + + sub_hdev = hid_allocate_device(); + if (IS_ERR(sub_hdev)) + return sub_hdev; + + sub_hdev->dev.parent = &hdev_info->hdev->dev; + + sub_hdev->bus = dev_id->bus; + sub_hdev->group = dev_id->group; + sub_hdev->vendor = dev_id->vendor; + sub_hdev->product = dev_id->product; + + sub_hdev->ll_driver = &appleib_ll_driver; + + snprintf(sub_hdev->name, sizeof(sub_hdev->name), + "iBridge Virtual HID %s/%04x:%04x", + dev_name(sub_hdev->dev.parent), sub_hdev->vendor, + sub_hdev->product); + + sub_hdev->driver_data = hdev_info; + + rc = hid_add_device(sub_hdev); + if (rc) { + hid_destroy_device(sub_hdev); + return ERR_PTR(rc); + } + + return sub_hdev; +} + +static struct appleib_hid_dev_info *appleib_add_device(struct hid_device *hdev) +{ + struct appleib_hid_dev_info *hdev_info; + struct hid_device_id *dev_id; + unsigned int usage; + int i; + + hdev_info = devm_kzalloc(&hdev->dev, sizeof(*hdev_info), GFP_KERNEL); + if (!hdev_info) + return ERR_PTR(-ENOMEM); + + hdev_info->hdev = hdev; + + for (i = 0; i < hdev->maxcollection; i++) { + usage = hdev->collection[i].usage; + dev_id = appleib_find_dev_id_for_usage(usage); + + if (!dev_id) { + hid_warn(hdev, "Unknown collection encountered with usage %x\n", + usage); + } else { + hdev_info->sub_hdevs[i] = appleib_add_sub_dev(hdev_info, dev_id); + + if (IS_ERR(hdev_info->sub_hdevs[i])) { + while (i-- > 0) + hid_destroy_device(hdev_info->sub_hdevs[i]); + return (void *)hdev_info->sub_hdevs[i]; + } + } + } + + return hdev_info; +} + +static void appleib_remove_device(struct hid_device *hdev) +{ + struct appleib_hid_dev_info *hdev_info = hid_get_drvdata(hdev); + int i; + + for (i = 0; i < ARRAY_SIZE(hdev_info->sub_hdevs); i++) { + if (hdev_info->sub_hdevs[i]) + hid_destroy_device(hdev_info->sub_hdevs[i]); + } + + hid_set_drvdata(hdev, NULL); +} + +static int appleib_hid_probe(struct hid_device *hdev, + const struct hid_device_id *id) +{ + struct appleib_hid_dev_info *hdev_info; + struct usb_device *udev; + int rc; + + /* check and set usb config first */ + udev = hid_to_usb_dev(hdev); + + if (udev->actconfig->desc.bConfigurationValue != APPLEIB_BASIC_CONFIG) { + rc = usb_driver_set_configuration(udev, APPLEIB_BASIC_CONFIG); + return rc ? rc : -ENODEV; + } + + rc = hid_parse(hdev); + if (rc) { + hid_err(hdev, "ib: hid parse failed (%d)\n", rc); + goto error; + } + + rc = hid_hw_start(hdev, HID_CONNECT_DRIVER); + if (rc) { + hid_err(hdev, "ib: hw start failed (%d)\n", rc); + goto error; + } + + hdev_info = appleib_add_device(hdev); + if (IS_ERR(hdev_info)) { + rc = PTR_ERR(hdev_info); + goto stop_hw; + } + + hid_set_drvdata(hdev, hdev_info); + + rc = hid_hw_open(hdev); + if (rc) { + hid_err(hdev, "ib: failed to open hid: %d\n", rc); + goto remove_dev; + } + + return 0; + +remove_dev: + appleib_remove_device(hdev); +stop_hw: + hid_hw_stop(hdev); +error: + return rc; +} + +static void appleib_hid_remove(struct hid_device *hdev) +{ + hid_hw_close(hdev); + appleib_remove_device(hdev); + hid_hw_stop(hdev); +} + +static const struct hid_device_id appleib_hid_ids[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IBRIDGE) }, + { }, +}; + +static struct hid_driver appleib_hid_driver = { + .name = "apple-ibridge-hid", + .id_table = appleib_hid_ids, + .probe = appleib_hid_probe, + .remove = appleib_hid_remove, + .raw_event = appleib_hid_raw_event, + .report_fixup = appleib_report_fixup, +#ifdef CONFIG_PM + .suspend = appleib_hid_suspend, + .resume = appleib_hid_resume, + .reset_resume = appleib_hid_reset_resume, +#endif +}; + +static struct appleib_device *appleib_alloc_device(struct platform_device *pdev) +{ + struct appleib_device *ib_dev; + acpi_status sts; + + ib_dev = devm_kzalloc(&pdev->dev, sizeof(*ib_dev), GFP_KERNEL); + if (!ib_dev) + return ERR_PTR(-ENOMEM); + + /* get iBridge acpi power control method for suspend/resume */ + sts = acpi_get_handle(ACPI_HANDLE(&pdev->dev), "SOCW", &ib_dev->asoc_socw); + if (ACPI_FAILURE(sts)) { + dev_err(&pdev->dev, + "Error getting handle for ASOC.SOCW method: %s\n", + acpi_format_exception(sts)); + return ERR_PTR(-ENXIO); + } + + /* ensure iBridge is powered on */ + sts = acpi_execute_simple_method(ib_dev->asoc_socw, NULL, 1); + if (ACPI_FAILURE(sts)) + dev_warn(&pdev->dev, "SOCW(1) failed: %s\n", + acpi_format_exception(sts)); + + return ib_dev; +} + +static int appleib_probe(struct platform_device *pdev) +{ + struct appleib_device *ib_dev; + int ret; + + ib_dev = appleib_alloc_device(pdev); + if (IS_ERR(ib_dev)) + return PTR_ERR(ib_dev); + + ret = hid_register_driver(&appleib_hid_driver); + if (ret) { + dev_err(&pdev->dev, "Error registering hid driver: %d\n", + ret); + return ret; + } + + platform_set_drvdata(pdev, ib_dev); + + return 0; +} + +static int appleib_remove(struct platform_device *pdev) +{ + hid_unregister_driver(&appleib_hid_driver); + + return 0; +} + +static int appleib_suspend(struct platform_device *pdev, pm_message_t message) +{ + struct appleib_device *ib_dev; + int rc; + + ib_dev = platform_get_drvdata(pdev); + + rc = acpi_execute_simple_method(ib_dev->asoc_socw, NULL, 0); + if (ACPI_FAILURE(rc)) + dev_warn(&pdev->dev, "SOCW(0) failed: %s\n", + acpi_format_exception(rc)); + + return 0; +} + +static int appleib_resume(struct platform_device *pdev) +{ + struct appleib_device *ib_dev; + int rc; + + ib_dev = platform_get_drvdata(pdev); + + rc = acpi_execute_simple_method(ib_dev->asoc_socw, NULL, 1); + if (ACPI_FAILURE(rc)) + dev_warn(&pdev->dev, "SOCW(1) failed: %s\n", + acpi_format_exception(rc)); + + return 0; +} + +static const struct acpi_device_id appleib_acpi_match[] = { + { "APP7777", 0 }, + { }, +}; + +MODULE_DEVICE_TABLE(acpi, appleib_acpi_match); + +static struct platform_driver appleib_driver = { + .probe = appleib_probe, + .remove = appleib_remove, + .suspend = appleib_suspend, + .resume = appleib_resume, + .driver = { + .name = "apple-ibridge", + .acpi_match_table = appleib_acpi_match, + }, +}; + +module_platform_driver(appleib_driver); + +MODULE_AUTHOR("Ronald Tschalär"); +MODULE_DESCRIPTION("Apple iBridge driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/hid/apple-ibridge.h b/drivers/hid/apple-ibridge.h new file mode 100644 index 000000000..8aefcf615 --- /dev/null +++ b/drivers/hid/apple-ibridge.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Apple iBridge Driver + * + * Copyright (c) 2018 Ronald Tschalär + */ + +#ifndef __LINUX_APPLE_IBRDIGE_H +#define __LINUX_APPLE_IBRDIGE_H + +#define USB_VENDOR_ID_LINUX_FOUNDATION 0x1d6b +#define USB_DEVICE_ID_IBRIDGE_TB 0x0301 +#define USB_DEVICE_ID_IBRIDGE_ALS 0x0302 + +#endif diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 0f8c11842..0c62e6280 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -187,6 +187,7 @@ #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021 0x029f #define USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT 0x8102 #define USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY 0x8302 +#define USB_DEVICE_ID_APPLE_IBRIDGE 0x8600 #define USB_VENDOR_ID_ASUS 0x0486 #define USB_DEVICE_ID_ASUS_T91MT 0x0185 diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index be3ad0257..c03535c4b 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -319,6 +319,9 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY) }, #endif +#if IS_ENABLED(CONFIG_HID_APPLE_IBRIDGE) + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IBRIDGE) }, +#endif #if IS_ENABLED(CONFIG_HID_APPLEIR) { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL2) }, -- 2.37.2 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 2/3] HID: apple-touchbar: Add driver for the Touch Bar on MacBook Pros 2023-02-10 3:43 ` [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip Aditya Garg @ 2023-02-10 3:44 ` Aditya Garg 2023-02-10 3:45 ` [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards Aditya Garg ` (2 more replies) 2023-02-10 4:56 ` [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip Thomas Weißschuh 2023-02-12 11:35 ` Andy Shevchenko 2 siblings, 3 replies; 32+ messages in thread From: Aditya Garg @ 2023-02-10 3:44 UTC (permalink / raw) To: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko Cc: LKML, linux-input, ronald, kekrby, Orlando Chamberlain From: Ronald Tschalär <ronald@innovation.ch> This driver enables basic touch bar functionality: enabling it, switching between modes on FN key press, and dimming and turning the display off/on when idle/active. Signed-off-by: Ronald Tschalär <ronald@innovation.ch> [Kerem Karabay: use USB product IDs from hid-ids.h] [Kerem Karabay: use hid_hw_raw_request except when setting the touchbar mode on T1 Macs] [Kerem Karabay: update Kconfig description] Signed-off-by: Kerem Karabay <kekrby@gmail.com> [Orlando Chamberlain: add usage check to not bind to keyboard backlight interface] Signed-off-by: Orlando Chamberlain <orlandoch.dev@gmail.com> [Aditya Garg: check if apple-touchbar is enabled in the special driver list] [Aditya Garg: fix suspend on T2 Macs] Signed-off-by: Aditya Garg <gargaditya08@live.com> --- drivers/hid/Kconfig | 11 + drivers/hid/Makefile | 1 + drivers/hid/apple-touchbar.c | 1500 ++++++++++++++++++++++++++++++++++ drivers/hid/hid-quirks.c | 6 +- 4 files changed, 1516 insertions(+), 2 deletions(-) create mode 100644 drivers/hid/apple-touchbar.c diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index e69afa5f4..4ec669267 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -134,6 +134,7 @@ config HID_APPLE_IBRIDGE tristate "Apple iBridge" depends on USB_HID depends on (X86 && ACPI) || COMPILE_TEST + imply HID_APPLE_TOUCHBAR imply HID_SENSOR_HUB imply HID_SENSOR_ALS help @@ -145,6 +146,16 @@ config HID_APPLE_IBRIDGE To compile this driver as a module, choose M here: the module will be called apple-ibridge. +config HID_APPLE_TOUCHBAR + tristate "Apple Touch Bar" + depends on USB_HID + help + Say Y here if you want support for the Touch Bar on x86 + MacBook Pros. + + To compile this driver as a module, choose M here: the + module will be called apple-touchbar. + config HID_APPLEIR tristate "Apple infrared receiver" depends on (USB_HID) diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index b61373cd8..c792e42fe 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -27,6 +27,7 @@ obj-$(CONFIG_HID_ALPS) += hid-alps.o obj-$(CONFIG_HID_ACRUX) += hid-axff.o obj-$(CONFIG_HID_APPLE) += hid-apple.o obj-$(CONFIG_HID_APPLE_IBRIDGE) += apple-ibridge.o +obj-$(CONFIG_HID_APPLE_TOUCHBAR) += apple-touchbar.o obj-$(CONFIG_HID_APPLEIR) += hid-appleir.o obj-$(CONFIG_HID_CREATIVE_SB0540) += hid-creative-sb0540.o obj-$(CONFIG_HID_ASUS) += hid-asus.o diff --git a/drivers/hid/apple-touchbar.c b/drivers/hid/apple-touchbar.c new file mode 100644 index 000000000..ff6a8493b --- /dev/null +++ b/drivers/hid/apple-touchbar.c @@ -0,0 +1,1500 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Apple Touch Bar Driver + * + * Copyright (c) 2017-2018 Ronald Tschalär + */ + +/* + * Recent MacBookPro models (MacBookPro 13,[23] and later) have a touch bar, + * which is exposed via several USB interfaces. MacOS supports a fancy mode + * where arbitrary buttons can be defined; this driver currently only + * supports the simple mode that consists of 3 predefined layouts + * (escape-only, esc + special keys, and esc + function keys). + * + * The first USB HID interface supports two reports, an input report that + * is used to report the key presses, and an output report which can be + * used to set the touch bar "mode": touch bar off (in which case no touches + * are reported at all), escape key only, escape + 12 function keys, and + * escape + several special keys (including brightness, audio volume, + * etc). The second interface supports several, complex reports, most of + * which are unknown at this time, but one of which has been determined to + * allow for controlling of the touch bar's brightness: off (though touches + * are still reported), dimmed, and full brightness. This driver makes + * use of these two reports. + */ + +#define dev_fmt(fmt) "tb: " fmt + +#include <linux/device.h> +#include <linux/hid.h> +#include <linux/input.h> +#include <linux/jiffies.h> +#include <linux/ktime.h> +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/spinlock.h> +#include <linux/string.h> +#include <linux/sysfs.h> +#include <linux/usb/ch9.h> +#include <linux/usb.h> +#include <linux/workqueue.h> + +#include "hid-ids.h" +#include "apple-ibridge.h" + +#define HID_UP_APPLE 0xff120000 +#define HID_USAGE_MODE (HID_UP_CUSTOM | 0x0004) +#define HID_USAGE_APPLE_APP (HID_UP_APPLE | 0x0001) +#define HID_USAGE_DISP (HID_UP_APPLE | 0x0021) +#define HID_USAGE_DISP_AUX1 (HID_UP_APPLE | 0x0020) + +#define APPLETB_MAX_TB_KEYS 13 /* ESC, F1-F12 */ + +#define APPLETB_CMD_MODE_ESC 0 +#define APPLETB_CMD_MODE_FN 1 +#define APPLETB_CMD_MODE_SPCL 2 +#define APPLETB_CMD_MODE_OFF 3 +#define APPLETB_CMD_MODE_UPD 254 +#define APPLETB_CMD_MODE_NONE 255 + +#define APPLETB_CMD_DISP_ON 1 +#define APPLETB_CMD_DISP_DIM 2 +#define APPLETB_CMD_DISP_OFF 4 +#define APPLETB_CMD_DISP_UPD 254 +#define APPLETB_CMD_DISP_NONE 255 + +#define APPLETB_FN_MODE_FKEYS 0 +#define APPLETB_FN_MODE_NORM 1 +#define APPLETB_FN_MODE_INV 2 +#define APPLETB_FN_MODE_SPCL 3 +#define APPLETB_FN_MODE_ESC 4 +#define APPLETB_FN_MODE_MAX APPLETB_FN_MODE_ESC + +#define APPLETB_DEVID_KEYBOARD 1 +#define APPLETB_DEVID_TOUCHPAD 2 + +#define APPLETB_MAX_DIM_TIME 30 + +#define APPLETB_FEATURE_IS_T1 BIT(0) + +static int appletb_tb_def_idle_timeout = 5 * 60; +module_param_named(idle_timeout, appletb_tb_def_idle_timeout, int, 0444); +MODULE_PARM_DESC(idle_timeout, "Default touch bar idle timeout:\n" + " [>0] - turn touch bar display off after no keyboard, trackpad, or touch bar input has been received for this many seconds;\n" + " the display will be turned back on as soon as new input is received\n" + " 0 - turn touch bar display off (input does not turn it on again)\n" + " -1 - turn touch bar display on (does not turn off automatically)\n" + " -2 - disable touch bar completely"); + +static int appletb_tb_def_dim_timeout = -2; +module_param_named(dim_timeout, appletb_tb_def_dim_timeout, int, 0444); +MODULE_PARM_DESC(dim_timeout, "Default touch bar dim timeout:\n" + " >0 - dim touch bar display after no keyboard, trackpad, or touch bar input has been received for this many seconds\n" + " the display will be returned to full brightness as soon as new input is received\n" + " 0 - dim touch bar display (input does not return it to full brightness)\n" + " -1 - disable timeout (touch bar never dimmed)\n" + " [-2] - calculate timeout based on idle-timeout"); + +static int appletb_tb_def_fn_mode = APPLETB_FN_MODE_NORM; +module_param_named(fnmode, appletb_tb_def_fn_mode, int, 0444); +MODULE_PARM_DESC(fnmode, "Default Fn key mode:\n" + " 0 - function-keys only\n" + " [1] - fn key switches from special to function-keys\n" + " 2 - inverse of 1\n" + " 3 - special keys only\n" + " 4 - escape key only"); + +static ssize_t idle_timeout_show(struct device *dev, + struct device_attribute *attr, char *buf); +static ssize_t idle_timeout_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t size); +static DEVICE_ATTR_RW(idle_timeout); + +static ssize_t dim_timeout_show(struct device *dev, + struct device_attribute *attr, char *buf); +static ssize_t dim_timeout_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t size); +static DEVICE_ATTR_RW(dim_timeout); + +static ssize_t fnmode_show(struct device *dev, struct device_attribute *attr, + char *buf); +static ssize_t fnmode_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t size); +static DEVICE_ATTR_RW(fnmode); + +static struct attribute *appletb_attrs[] = { + &dev_attr_idle_timeout.attr, + &dev_attr_dim_timeout.attr, + &dev_attr_fnmode.attr, + NULL, +}; + +static const struct attribute_group appletb_attr_group = { + .attrs = appletb_attrs, +}; + +struct appletb_device { + bool active; + struct device *log_dev; + + struct hid_field *mode_field; + struct hid_field *disp_field; + struct hid_field *disp_field_aux1; + struct appletb_iface_info { + struct hid_device *hdev; + struct usb_interface *usb_iface; + bool suspended; + } mode_iface, disp_iface; + + struct input_handler inp_handler; + struct input_handle kbd_handle; + struct input_handle tpd_handle; + + bool last_tb_keys_pressed[APPLETB_MAX_TB_KEYS]; + bool last_tb_keys_translated[APPLETB_MAX_TB_KEYS]; + bool last_fn_pressed; + + ktime_t last_event_time; + + unsigned char cur_tb_mode; + unsigned char pnd_tb_mode; + unsigned char cur_tb_disp; + unsigned char pnd_tb_disp; + bool tb_autopm_off; + bool restore_autopm; + struct delayed_work tb_work; + /* protects most of the above */ + spinlock_t tb_lock; + + int dim_timeout; + int idle_timeout; + bool dim_to_is_calc; + int fn_mode; + + bool is_t1; +}; + +struct appletb_key_translation { + u16 from; + u16 to; +}; + +static const struct appletb_key_translation appletb_fn_codes[] = { + { KEY_F1, KEY_BRIGHTNESSDOWN }, + { KEY_F2, KEY_BRIGHTNESSUP }, + { KEY_F3, KEY_SCALE }, /* not used */ + { KEY_F4, KEY_DASHBOARD }, /* not used */ + { KEY_F5, KEY_KBDILLUMDOWN }, + { KEY_F6, KEY_KBDILLUMUP }, + { KEY_F7, KEY_PREVIOUSSONG }, + { KEY_F8, KEY_PLAYPAUSE }, + { KEY_F9, KEY_NEXTSONG }, + { KEY_F10, KEY_MUTE }, + { KEY_F11, KEY_VOLUMEDOWN }, + { KEY_F12, KEY_VOLUMEUP }, +}; + +static struct appletb_device *appletb_dev; + +static bool appletb_disable_autopm(struct hid_device *hdev) +{ + int rc; + + rc = hid_hw_power(hdev, PM_HINT_FULLON); + + if (rc == 0) + return true; + + hid_err(hdev, + "Failed to disable auto-pm on touch bar device (%d)\n", rc); + return false; +} + +/* + * While the mode functionality is listed as a valid hid report in the usb + * interface descriptor, on a T1 it's not sent that way. Instead it's sent with + * different request-type and without a leading report-id in the data. Hence + * we need to send it as a custom usb control message rather via any of the + * standard hid_hw_*request() functions. The device might return EPIPE for a + * while after setting the display mode on T1 models, so retrying should be + * done on those models. + */ +static int appletb_set_tb_mode(struct appletb_device *tb_dev, + unsigned char mode) +{ + struct hid_report *report; + void *buf; + bool autopm_off = false; + int rc; + + if (!tb_dev->mode_iface.hdev) + return -ENOTCONN; + + report = tb_dev->mode_field->report; + + if (tb_dev->is_t1) { + buf = kmemdup(&mode, 1, GFP_KERNEL); + } else { + char data[] = { report->id, mode }; + + buf = kmemdup(data, sizeof(data), GFP_KERNEL); + } + if (!buf) + return -ENOMEM; + + autopm_off = appletb_disable_autopm(tb_dev->mode_iface.hdev); + + if (tb_dev->is_t1) { + int tries = 0; + struct usb_device *dev = interface_to_usbdev(tb_dev->mode_iface.usb_iface); + __u8 ifnum = tb_dev->mode_iface.usb_iface->cur_altsetting->desc.bInterfaceNumber; + + do { + rc = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), HID_REQ_SET_REPORT, + USB_DIR_OUT | USB_RECIP_INTERFACE | USB_TYPE_VENDOR, + (report->type + 1) << 8 | report->id, + ifnum, buf, 1, 2000); + + if (rc != -EPIPE) + break; + + usleep_range(1000 << tries, 3000 << tries); + } while (++tries < 5); + } else { + rc = hid_hw_raw_request(tb_dev->mode_iface.hdev, report->id, + (__u8 *) buf, 2, report->type, + HID_REQ_SET_REPORT); + } + + if (rc < 0) + dev_err(tb_dev->log_dev, + "Failed to set touch bar mode to %u (%d)\n", mode, rc); + + if (autopm_off) + hid_hw_power(tb_dev->mode_iface.hdev, PM_HINT_NORMAL); + + kfree(buf); + + return rc; +} + +static int appletb_set_tb_disp(struct appletb_device *tb_dev, + unsigned char disp) +{ + struct hid_report *report; + int rc; + + if (!tb_dev->disp_iface.hdev) + return -ENOTCONN; + + report = tb_dev->disp_field->report; + + rc = hid_set_field(tb_dev->disp_field_aux1, 0, 1); + if (rc) { + dev_err(tb_dev->log_dev, + "Failed to set display report field (%d)\n", rc); + return rc; + } + + rc = hid_set_field(tb_dev->disp_field, 0, disp); + if (rc) { + dev_err(tb_dev->log_dev, + "Failed to set display report field (%d)\n", rc); + return rc; + } + + /* + * Keep the USB interface powered on while the touch bar display is on + * for better responsiveness. + */ + if (disp != APPLETB_CMD_DISP_OFF && !tb_dev->tb_autopm_off) + tb_dev->tb_autopm_off = + appletb_disable_autopm(report->device); + + hid_hw_request(tb_dev->disp_iface.hdev, report, HID_REQ_SET_REPORT); + + if (disp == APPLETB_CMD_DISP_OFF && tb_dev->tb_autopm_off) { + hid_hw_power(tb_dev->disp_iface.hdev, PM_HINT_NORMAL); + tb_dev->tb_autopm_off = false; + } + + return rc; +} + +static bool appletb_any_tb_key_pressed(struct appletb_device *tb_dev) +{ + return !!memchr_inv(tb_dev->last_tb_keys_pressed, 0, + sizeof(tb_dev->last_tb_keys_pressed)); +} + +static void appletb_schedule_tb_update(struct appletb_device *tb_dev, s64 secs) +{ + schedule_delayed_work(&tb_dev->tb_work, msecs_to_jiffies(secs * 1000)); +} + +static void appletb_set_tb_worker(struct work_struct *work) +{ + struct appletb_device *tb_dev = + container_of(work, struct appletb_device, tb_work.work); + s64 time_left = 0, min_timeout, time_to_off; + unsigned char pending_mode; + unsigned char pending_disp; + unsigned char current_disp; + bool restore_autopm; + bool any_tb_key_pressed, need_reschedule; + int rc1 = 1, rc2 = 1; + unsigned long flags; + + spin_lock_irqsave(&tb_dev->tb_lock, flags); + + /* handle explicit mode-change request */ + pending_mode = tb_dev->pnd_tb_mode; + pending_disp = tb_dev->pnd_tb_disp; + restore_autopm = tb_dev->restore_autopm; + + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); + + if (pending_mode != APPLETB_CMD_MODE_NONE) + rc1 = appletb_set_tb_mode(tb_dev, pending_mode); + if (pending_mode != APPLETB_CMD_MODE_NONE && + pending_disp != APPLETB_CMD_DISP_NONE) + msleep(25); + if (pending_disp != APPLETB_CMD_DISP_NONE) + rc2 = appletb_set_tb_disp(tb_dev, pending_disp); + + if (restore_autopm && tb_dev->tb_autopm_off) + appletb_disable_autopm(tb_dev->disp_field->report->device); + + spin_lock_irqsave(&tb_dev->tb_lock, flags); + + need_reschedule = false; + + if (rc1 == 0) { + tb_dev->cur_tb_mode = pending_mode; + + if (tb_dev->pnd_tb_mode == pending_mode) + tb_dev->pnd_tb_mode = APPLETB_CMD_MODE_NONE; + else + need_reschedule = true; + } + + if (rc2 == 0) { + tb_dev->cur_tb_disp = pending_disp; + + if (tb_dev->pnd_tb_disp == pending_disp) + tb_dev->pnd_tb_disp = APPLETB_CMD_DISP_NONE; + else + need_reschedule = true; + } + current_disp = tb_dev->cur_tb_disp; + + tb_dev->restore_autopm = false; + + /* calculate time left to next timeout */ + if (tb_dev->idle_timeout == -2 || tb_dev->idle_timeout == 0) + min_timeout = -1; + else if (tb_dev->idle_timeout == -1) + min_timeout = tb_dev->dim_timeout; + else if (tb_dev->dim_timeout <= 0) + min_timeout = tb_dev->idle_timeout; + else + min_timeout = min(tb_dev->dim_timeout, tb_dev->idle_timeout); + + if (min_timeout > 0) { + s64 idle_time = + (ktime_ms_delta(ktime_get(), tb_dev->last_event_time) + + 500) / 1000; + + time_left = max(min_timeout - idle_time, 0LL); + if (tb_dev->idle_timeout <= 0) + time_to_off = -1; + else if (idle_time >= tb_dev->idle_timeout) + time_to_off = 0; + else + time_to_off = tb_dev->idle_timeout - idle_time; + } else { + /* not used - just to appease the compiler */ + time_to_off = 0; + } + + any_tb_key_pressed = appletb_any_tb_key_pressed(tb_dev); + + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); + + dev_dbg(tb_dev->log_dev, "timeout calc: idle_timeout=%d dim_timeout=%d min_timeout=%lld time_left=%lld need_reschedule=%d any_tb_key_pressed=%d\n", + tb_dev->idle_timeout, tb_dev->dim_timeout, min_timeout, + time_left, need_reschedule, any_tb_key_pressed); + + /* a new command arrived while we were busy - handle it */ + if (need_reschedule) { + appletb_schedule_tb_update(tb_dev, 0); + return; + } + + /* if no idle/dim timeout, we're done */ + if (min_timeout <= 0) + return; + + /* manage idle/dim timeout */ + if (time_left > 0) { + /* we fired too soon or had a mode-change - re-schedule */ + appletb_schedule_tb_update(tb_dev, time_left); + } else if (any_tb_key_pressed) { + /* keys are still pressed - re-schedule */ + appletb_schedule_tb_update(tb_dev, min_timeout); + } else { + /* dim or idle timeout reached */ + int next_disp = (time_to_off == 0) ? APPLETB_CMD_DISP_OFF : + APPLETB_CMD_DISP_DIM; + if (next_disp != current_disp && + appletb_set_tb_disp(tb_dev, next_disp) == 0) { + spin_lock_irqsave(&tb_dev->tb_lock, flags); + tb_dev->cur_tb_disp = next_disp; + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); + } + + if (time_to_off > 0) + appletb_schedule_tb_update(tb_dev, time_to_off); + } +} + +static u16 appletb_fn_to_special(u16 code) +{ + int idx; + + for (idx = 0; idx < ARRAY_SIZE(appletb_fn_codes); idx++) { + if (appletb_fn_codes[idx].from == code) + return appletb_fn_codes[idx].to; + } + + return 0; +} + +static unsigned char appletb_get_cur_tb_mode(struct appletb_device *tb_dev) +{ + return tb_dev->pnd_tb_mode != APPLETB_CMD_MODE_NONE ? + tb_dev->pnd_tb_mode : tb_dev->cur_tb_mode; +} + +static unsigned char appletb_get_cur_tb_disp(struct appletb_device *tb_dev) +{ + return tb_dev->pnd_tb_disp != APPLETB_CMD_DISP_NONE ? + tb_dev->pnd_tb_disp : tb_dev->cur_tb_disp; +} + +static unsigned char appletb_get_fn_tb_mode(struct appletb_device *tb_dev) +{ + switch (tb_dev->fn_mode) { + case APPLETB_FN_MODE_ESC: + return APPLETB_CMD_MODE_ESC; + + case APPLETB_FN_MODE_FKEYS: + return APPLETB_CMD_MODE_FN; + + case APPLETB_FN_MODE_SPCL: + return APPLETB_CMD_MODE_SPCL; + + case APPLETB_FN_MODE_INV: + return (tb_dev->last_fn_pressed) ? APPLETB_CMD_MODE_SPCL : + APPLETB_CMD_MODE_FN; + + case APPLETB_FN_MODE_NORM: + default: + return (tb_dev->last_fn_pressed) ? APPLETB_CMD_MODE_FN : + APPLETB_CMD_MODE_SPCL; + } +} + +/* + * Switch touch bar mode and display when mode or display not the desired ones. + */ +static void appletb_update_touchbar_no_lock(struct appletb_device *tb_dev, + bool force) +{ + unsigned char want_mode; + unsigned char want_disp; + bool need_update = false; + + /* + * Calculate the new modes: + * idle_timeout: + * -2 mode/disp off + * -1 mode on, disp on/dim + * 0 mode on, disp off + * >0 mode on, disp off after idle_timeout seconds + * dim_timeout (only valid if idle_timeout > 0 || idle_timeout == -1): + * -1 disp never dimmed + * 0 disp always dimmed + * >0 disp dim after dim_timeout seconds + */ + if (tb_dev->idle_timeout == -2) { + want_mode = APPLETB_CMD_MODE_OFF; + want_disp = APPLETB_CMD_DISP_OFF; + } else { + want_mode = appletb_get_fn_tb_mode(tb_dev); + want_disp = tb_dev->idle_timeout == 0 ? APPLETB_CMD_DISP_OFF : + tb_dev->dim_timeout == 0 ? APPLETB_CMD_DISP_DIM : + APPLETB_CMD_DISP_ON; + } + + /* + * See if we need to update the touch bar, taking into account that we + * generally don't want to switch modes while a touch bar key is + * pressed. + */ + if (appletb_get_cur_tb_mode(tb_dev) != want_mode && + !appletb_any_tb_key_pressed(tb_dev)) { + tb_dev->pnd_tb_mode = want_mode; + need_update = true; + } + + if (appletb_get_cur_tb_disp(tb_dev) != want_disp && + (!appletb_any_tb_key_pressed(tb_dev) || + want_disp != APPLETB_CMD_DISP_OFF)) { + tb_dev->pnd_tb_disp = want_disp; + need_update = true; + } + + if (force) + need_update = true; + + /* schedule the update if desired */ + dev_dbg_ratelimited(tb_dev->log_dev, + "update: need_update=%d, want_mode=%d, cur-mode=%d, want_disp=%d, cur-disp=%d\n", + need_update, want_mode, tb_dev->cur_tb_mode, + want_disp, tb_dev->cur_tb_disp); + + if (need_update) { + cancel_delayed_work(&tb_dev->tb_work); + appletb_schedule_tb_update(tb_dev, 0); + } +} + +static void appletb_update_touchbar(struct appletb_device *tb_dev, bool force) +{ + unsigned long flags; + + spin_lock_irqsave(&tb_dev->tb_lock, flags); + + if (tb_dev->active) + appletb_update_touchbar_no_lock(tb_dev, force); + + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); +} + +static void appletb_set_idle_timeout(struct appletb_device *tb_dev, int new) +{ + tb_dev->idle_timeout = new; + + if (tb_dev->dim_to_is_calc && tb_dev->idle_timeout > 0) + tb_dev->dim_timeout = new - min(APPLETB_MAX_DIM_TIME, new / 3); + else if (tb_dev->dim_to_is_calc) + tb_dev->dim_timeout = -1; +} + +static ssize_t idle_timeout_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct appletb_device *tb_dev = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE, "%d\n", tb_dev->idle_timeout); +} + +static ssize_t idle_timeout_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t size) +{ + struct appletb_device *tb_dev = dev_get_drvdata(dev); + long new; + int rc; + + rc = kstrtol(buf, 0, &new); + if (rc || new > INT_MAX || new < -2) + return -EINVAL; + + appletb_set_idle_timeout(tb_dev, new); + appletb_update_touchbar(tb_dev, true); + + return size; +} + +static void appletb_set_dim_timeout(struct appletb_device *tb_dev, int new) +{ + if (new == -2) { + tb_dev->dim_to_is_calc = true; + appletb_set_idle_timeout(tb_dev, tb_dev->idle_timeout); + } else { + tb_dev->dim_to_is_calc = false; + tb_dev->dim_timeout = new; + } +} + +static ssize_t dim_timeout_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct appletb_device *tb_dev = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE, "%d\n", + tb_dev->dim_to_is_calc ? -2 : tb_dev->dim_timeout); +} + +static ssize_t dim_timeout_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t size) +{ + struct appletb_device *tb_dev = dev_get_drvdata(dev); + long new; + int rc; + + rc = kstrtol(buf, 0, &new); + if (rc || new > INT_MAX || new < -2) + return -EINVAL; + + appletb_set_dim_timeout(tb_dev, new); + appletb_update_touchbar(tb_dev, true); + + return size; +} + +static ssize_t fnmode_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct appletb_device *tb_dev = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE, "%d\n", tb_dev->fn_mode); +} + +static ssize_t fnmode_store(struct device *dev, struct device_attribute *attr, + const char *buf, size_t size) +{ + struct appletb_device *tb_dev = dev_get_drvdata(dev); + long new; + int rc; + + rc = kstrtol(buf, 0, &new); + if (rc || new > APPLETB_FN_MODE_MAX || new < 0) + return -EINVAL; + + tb_dev->fn_mode = new; + appletb_update_touchbar(tb_dev, false); + + return size; +} + +static int appletb_tb_key_to_slot(unsigned int code) +{ + switch (code) { + case KEY_ESC: + return 0; + case KEY_F1: + case KEY_F2: + case KEY_F3: + case KEY_F4: + case KEY_F5: + case KEY_F6: + case KEY_F7: + case KEY_F8: + case KEY_F9: + case KEY_F10: + return code - KEY_F1 + 1; + case KEY_F11: + case KEY_F12: + return code - KEY_F11 + 11; + default: + return -1; + } +} + +static int appletb_hid_event(struct hid_device *hdev, struct hid_field *field, + struct hid_usage *usage, __s32 value) +{ + struct appletb_device *tb_dev = hid_get_drvdata(hdev); + unsigned int new_code = 0; + unsigned long flags; + bool send_dummy = false; + bool send_trnsl = false; + int slot; + int rc = 0; + + if ((usage->hid & HID_USAGE_PAGE) != HID_UP_KEYBOARD || + usage->type != EV_KEY) + return 0; + + /* + * 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; + + spin_lock_irqsave(&tb_dev->tb_lock, flags); + + if (!tb_dev->active) { + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); + return 0; + } + + new_code = appletb_fn_to_special(usage->code); + + if (value != 2) + tb_dev->last_tb_keys_pressed[slot] = value; + + tb_dev->last_event_time = ktime_get(); + + appletb_update_touchbar_no_lock(tb_dev, false); + + /* + * We want to suppress touch bar keys while the touch bar is off, but + * we do want to wake up the screen if it's asleep, so generate a dummy + * event in that case. + */ + if (tb_dev->cur_tb_mode == APPLETB_CMD_MODE_OFF || + tb_dev->cur_tb_disp == APPLETB_CMD_DISP_OFF) { + send_dummy = true; + rc = 1; + /* translate special keys */ + } else if (new_code && + ((value > 0 && + appletb_get_cur_tb_mode(tb_dev) == APPLETB_CMD_MODE_SPCL) + || + (value == 0 && tb_dev->last_tb_keys_translated[slot]))) { + tb_dev->last_tb_keys_translated[slot] = true; + send_trnsl = true; + rc = 1; + /* everything else handled normally */ + } else { + tb_dev->last_tb_keys_translated[slot] = false; + } + + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); + + /* + * Need to send these input events outside of the lock, as otherwise + * we can run into the following deadlock: + * Task 1 Task 2 + * appletb_hid_event() input_event() + * acquire tb_lock acquire dev->event_lock + * input_event() appletb_inp_event() + * acquire dev->event_lock acquire tb_lock + */ + if (send_dummy) { + input_event(field->hidinput->input, EV_KEY, KEY_UNKNOWN, 1); + input_event(field->hidinput->input, EV_KEY, KEY_UNKNOWN, 0); + } else if (send_trnsl) { + input_event(field->hidinput->input, usage->type, new_code, + value); + } + + return rc; +} + +static void appletb_inp_event(struct input_handle *handle, unsigned int type, + unsigned int code, int value) +{ + struct appletb_device *tb_dev = handle->private; + unsigned long flags; + + spin_lock_irqsave(&tb_dev->tb_lock, flags); + + if (!tb_dev->active) { + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); + return; + } + + if (type == EV_KEY && code == KEY_FN && value != 2) + tb_dev->last_fn_pressed = value; + + tb_dev->last_event_time = ktime_get(); + + appletb_update_touchbar_no_lock(tb_dev, false); + + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); +} + +/* Find and save the usb-device associated with the touch bar input device */ +static struct usb_interface *appletb_get_usb_iface(struct hid_device *hdev) +{ + struct device *dev = &hdev->dev; + + while (dev && !(dev->type && dev->type->name && + !strcmp(dev->type->name, "usb_interface"))) + dev = dev->parent; + + return dev ? to_usb_interface(dev) : NULL; +} + +static int appletb_inp_connect(struct input_handler *handler, + struct input_dev *dev, + const struct input_device_id *id) +{ + struct appletb_device *tb_dev = handler->private; + struct input_handle *handle; + int rc; + + if (id->driver_info == APPLETB_DEVID_KEYBOARD) { + handle = &tb_dev->kbd_handle; + handle->name = "tbkbd"; + } else if (id->driver_info == APPLETB_DEVID_TOUCHPAD) { + handle = &tb_dev->tpd_handle; + handle->name = "tbtpad"; + } else { + dev_err(tb_dev->log_dev, "Unknown device id (%lu)\n", + id->driver_info); + return -ENOENT; + } + + if (handle->dev) { + dev_err(tb_dev->log_dev, + "Duplicate connect to %s input device\n", handle->name); + return -EEXIST; + } + + handle->open = 0; + handle->dev = input_get_device(dev); + handle->handler = handler; + handle->private = tb_dev; + + rc = input_register_handle(handle); + if (rc) + goto err_free_dev; + + rc = input_open_device(handle); + if (rc) + goto err_unregister_handle; + + dev_dbg(tb_dev->log_dev, "Connected to %s input device\n", + handle == &tb_dev->kbd_handle ? "keyboard" : "touchpad"); + + return 0; + + err_unregister_handle: + input_unregister_handle(handle); + err_free_dev: + input_put_device(handle->dev); + handle->dev = NULL; + return rc; +} + +static void appletb_inp_disconnect(struct input_handle *handle) +{ + struct appletb_device *tb_dev = handle->private; + + input_close_device(handle); + input_unregister_handle(handle); + + dev_dbg(tb_dev->log_dev, "Disconnected from %s input device\n", + handle == &tb_dev->kbd_handle ? "keyboard" : "touchpad"); + + input_put_device(handle->dev); + handle->dev = NULL; +} + +static int appletb_input_configured(struct hid_device *hdev, + struct hid_input *hidinput) +{ + int idx; + 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 our actual capabilities */ + __set_bit(EV_KEY, input->evbit); + __set_bit(EV_REP, input->evbit); + __set_bit(EV_MSC, input->evbit); /* hid-input generates MSC_SCAN */ + + for (idx = 0; idx < ARRAY_SIZE(appletb_fn_codes); idx++) { + input_set_capability(input, EV_KEY, appletb_fn_codes[idx].from); + input_set_capability(input, EV_KEY, appletb_fn_codes[idx].to); + } + + input_set_capability(input, EV_KEY, KEY_ESC); + input_set_capability(input, EV_KEY, KEY_UNKNOWN); + + return 0; +} + +static struct appletb_iface_info * +appletb_get_iface_info(struct appletb_device *tb_dev, struct hid_device *hdev) +{ + if (hdev == tb_dev->mode_iface.hdev) + return &tb_dev->mode_iface; + if (hdev == tb_dev->disp_iface.hdev) + return &tb_dev->disp_iface; + return NULL; +} + +/** + * appletb_find_report_field() - Find the field in the report with the given + * usage. + * @report: the report to search + * @field_usage: the usage of the field to search for + * + * Returns: the hid field if found, or NULL if none found. + */ +static struct hid_field *appletb_find_report_field(struct hid_report *report, + unsigned int field_usage) +{ + int f, u; + + for (f = 0; f < report->maxfield; f++) { + struct hid_field *field = report->field[f]; + + if (field->logical == field_usage) + return field; + + for (u = 0; u < field->maxusage; u++) { + if (field->usage[u].hid == field_usage) + return field; + } + } + + return NULL; +} + +/** + * appletb_find_hid_field() - Search all the reports of the device for the + * field with the given usage. + * @hdev: the device whose reports to search + * @application: the usage of application collection that the field must + * belong to + * @field_usage: the usage of the field to search for + * + * Returns: the hid field if found, or NULL if none found. + */ +static struct hid_field *appletb_find_hid_field(struct hid_device *hdev, + unsigned int application, + unsigned int field_usage) +{ + static const int report_types[] = { HID_INPUT_REPORT, HID_OUTPUT_REPORT, + HID_FEATURE_REPORT }; + struct hid_report *report; + struct hid_field *field; + int t; + + for (t = 0; t < ARRAY_SIZE(report_types); t++) { + struct list_head *report_list = + &hdev->report_enum[report_types[t]].report_list; + list_for_each_entry(report, report_list, list) { + if (report->application != application) + continue; + + field = appletb_find_report_field(report, field_usage); + if (field) + return field; + } + } + + return NULL; +} + +static int appletb_extract_report_and_iface_info(struct appletb_device *tb_dev, + struct hid_device *hdev, + const struct hid_device_id *id) +{ + struct appletb_iface_info *iface_info; + struct usb_interface *usb_iface; + struct hid_field *field; + + field = appletb_find_hid_field(hdev, HID_GD_KEYBOARD, HID_USAGE_MODE); + if (field) { + iface_info = &tb_dev->mode_iface; + tb_dev->mode_field = field; + tb_dev->is_t1 = !!(id->driver_data & APPLETB_FEATURE_IS_T1); + } else { + field = appletb_find_hid_field(hdev, HID_USAGE_APPLE_APP, + HID_USAGE_DISP); + if (!field) + return 0; + + iface_info = &tb_dev->disp_iface; + tb_dev->disp_field = field; + tb_dev->disp_field_aux1 = + appletb_find_hid_field(hdev, HID_USAGE_APPLE_APP, + HID_USAGE_DISP_AUX1); + + if (!tb_dev->disp_field_aux1 || + tb_dev->disp_field_aux1->report != + tb_dev->disp_field->report) { + dev_err(tb_dev->log_dev, + "Unexpected report structure for report %u in device %s\n", + tb_dev->disp_field->report->id, + dev_name(&hdev->dev)); + return -ENODEV; + } + } + + usb_iface = appletb_get_usb_iface(hdev); + if (!usb_iface) { + dev_err(tb_dev->log_dev, + "Failed to find usb interface for hid device %s\n", + dev_name(&hdev->dev)); + return -ENODEV; + } + + iface_info->hdev = hdev; + iface_info->usb_iface = usb_get_intf(usb_iface); + iface_info->suspended = false; + + return 1; +} + +static void appletb_clear_iface_info(struct appletb_device *tb_dev, + struct hid_device *hdev) +{ + struct appletb_iface_info *iface_info; + + iface_info = appletb_get_iface_info(tb_dev, hdev); + if (iface_info) { + usb_put_intf(iface_info->usb_iface); + iface_info->usb_iface = NULL; + iface_info->hdev = NULL; + } +} + +static bool appletb_test_and_mark_active(struct appletb_device *tb_dev) +{ + unsigned long flags; + bool activated = false; + + spin_lock_irqsave(&tb_dev->tb_lock, flags); + + if (tb_dev->mode_iface.hdev && tb_dev->disp_iface.hdev && + !tb_dev->active) { + tb_dev->active = true; + activated = true; + } + + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); + + return activated; +} + +static bool appletb_test_and_mark_inactive(struct appletb_device *tb_dev, + struct hid_device *hdev) +{ + unsigned long flags; + bool deactivated = false; + + spin_lock_irqsave(&tb_dev->tb_lock, flags); + + if (tb_dev->mode_iface.hdev && tb_dev->disp_iface.hdev && + tb_dev->active && + (hdev == tb_dev->mode_iface.hdev || + hdev == tb_dev->disp_iface.hdev)) { + tb_dev->active = false; + deactivated = true; + } + + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); + + return deactivated; +} + +static const struct input_device_id appletb_input_devices[] = { + { + .flags = INPUT_DEVICE_ID_MATCH_BUS | + INPUT_DEVICE_ID_MATCH_KEYBIT, + .bustype = BUS_SPI, + .keybit = { [BIT_WORD(KEY_FN)] = BIT_MASK(KEY_FN) }, + .driver_info = APPLETB_DEVID_KEYBOARD, + }, /* Builtin SPI keyboard device */ + { + .flags = INPUT_DEVICE_ID_MATCH_BUS | + INPUT_DEVICE_ID_MATCH_KEYBIT, + .bustype = BUS_SPI, + .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) }, + .driver_info = APPLETB_DEVID_TOUCHPAD, + }, /* Builtin SPI touchpad device */ + { + .flags = INPUT_DEVICE_ID_MATCH_BUS | + INPUT_DEVICE_ID_MATCH_VENDOR | + INPUT_DEVICE_ID_MATCH_KEYBIT, + .bustype = BUS_USB, + .vendor = 0x05ac /* USB_VENDOR_ID_APPLE */, + .keybit = { [BIT_WORD(KEY_FN)] = BIT_MASK(KEY_FN) }, + .driver_info = APPLETB_DEVID_KEYBOARD, + }, /* Builtin USB keyboard device */ + { + .flags = INPUT_DEVICE_ID_MATCH_BUS | + INPUT_DEVICE_ID_MATCH_VENDOR | + INPUT_DEVICE_ID_MATCH_KEYBIT, + .bustype = BUS_USB, + .vendor = 0x05ac /* USB_VENDOR_ID_APPLE */, + .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) }, + .driver_info = APPLETB_DEVID_TOUCHPAD, + }, /* Builtin USB touchpad device */ + { }, /* Terminating zero entry */ +}; + +static bool appletb_match_internal_device(struct input_handler *handler, + struct input_dev *inp_dev) +{ + struct device *dev = &inp_dev->dev; + + if (inp_dev->id.bustype == BUS_SPI) + return true; + + /* in kernel: dev && !is_usb_device(dev) */ + while (dev && !(dev->type && dev->type->name && + !strcmp(dev->type->name, "usb_device"))) + dev = dev->parent; + + /* + * Apple labels all their internal keyboards and trackpads as such, + * instead of maintaining an ever expanding list of product-id's we + * just look at the device's product name. + */ + if (dev) + return !!strstr(to_usb_device(dev)->product, "Internal Keyboard"); + + return false; +} + +static int appletb_probe(struct hid_device *hdev, + const struct hid_device_id *id) +{ + struct appletb_device *tb_dev = appletb_dev; + unsigned long flags; + int rc; + + /* initialize the report info */ + rc = hid_parse(hdev); + if (rc) { + dev_err(tb_dev->log_dev, "hid parse failed (%d)\n", rc); + goto error; + } + + /* Ensure this usb endpoint is for the touchbar backlight, not keyboard + * backlight. + */ + if ((hdev->product == USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) && + !(hdev->collection && hdev->collection[0].usage == + HID_USAGE_APPLE_APP)) { + return -ENODEV; + } + + spin_lock_irqsave(&tb_dev->tb_lock, flags); + + if (!tb_dev->log_dev) + tb_dev->log_dev = &hdev->dev; + + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); + + hid_set_drvdata(hdev, tb_dev); + + rc = appletb_extract_report_and_iface_info(tb_dev, hdev, id); + if (rc < 0) + goto error; + + rc = hid_hw_start(hdev, HID_CONNECT_DRIVER | HID_CONNECT_HIDINPUT); + if (rc) { + dev_err(tb_dev->log_dev, "hw start failed (%d)\n", rc); + goto clear_iface_info; + } + + rc = hid_hw_open(hdev); + if (rc) { + dev_err(tb_dev->log_dev, "hw open failed (%d)\n", rc); + goto stop_hid; + } + + /* do setup if we have both interfaces */ + if (appletb_test_and_mark_active(tb_dev)) { + /* initialize the touch bar */ + if (appletb_tb_def_fn_mode >= 0 && + appletb_tb_def_fn_mode <= APPLETB_FN_MODE_MAX) + tb_dev->fn_mode = appletb_tb_def_fn_mode; + else + tb_dev->fn_mode = APPLETB_FN_MODE_NORM; + appletb_set_idle_timeout(tb_dev, appletb_tb_def_idle_timeout); + appletb_set_dim_timeout(tb_dev, appletb_tb_def_dim_timeout); + tb_dev->last_event_time = ktime_get(); + + tb_dev->pnd_tb_mode = APPLETB_CMD_MODE_UPD; + tb_dev->pnd_tb_disp = APPLETB_CMD_DISP_UPD; + + appletb_update_touchbar(tb_dev, false); + + /* set up the input handler */ + tb_dev->inp_handler.event = appletb_inp_event; + tb_dev->inp_handler.connect = appletb_inp_connect; + tb_dev->inp_handler.disconnect = appletb_inp_disconnect; + tb_dev->inp_handler.name = "appletb"; + tb_dev->inp_handler.id_table = appletb_input_devices; + tb_dev->inp_handler.match = appletb_match_internal_device; + tb_dev->inp_handler.private = tb_dev; + + rc = input_register_handler(&tb_dev->inp_handler); + if (rc) { + dev_err(tb_dev->log_dev, + "Unable to register keyboard handler (%d)\n", + rc); + goto mark_inactive; + } + + /* initialize sysfs attributes */ + rc = sysfs_create_group(&tb_dev->mode_iface.hdev->dev.kobj, + &appletb_attr_group); + if (rc) { + dev_err(tb_dev->log_dev, + "Failed to create sysfs attributes (%d)\n", rc); + goto unreg_handler; + } + + dev_dbg(tb_dev->log_dev, "Touchbar activated\n"); + } + + return 0; + +unreg_handler: + input_unregister_handler(&tb_dev->inp_handler); +mark_inactive: + appletb_test_and_mark_inactive(tb_dev, hdev); + cancel_delayed_work_sync(&tb_dev->tb_work); + hid_hw_close(hdev); +stop_hid: + hid_hw_stop(hdev); +clear_iface_info: + appletb_clear_iface_info(tb_dev, hdev); +error: + return rc; +} + +static void appletb_remove(struct hid_device *hdev) +{ + struct appletb_device *tb_dev = hid_get_drvdata(hdev); + unsigned long flags; + + if (appletb_test_and_mark_inactive(tb_dev, hdev)) { + sysfs_remove_group(&tb_dev->mode_iface.hdev->dev.kobj, + &appletb_attr_group); + + input_unregister_handler(&tb_dev->inp_handler); + + cancel_delayed_work_sync(&tb_dev->tb_work); + appletb_set_tb_mode(tb_dev, APPLETB_CMD_MODE_OFF); + appletb_set_tb_disp(tb_dev, APPLETB_CMD_DISP_ON); + + if (tb_dev->tb_autopm_off) + hid_hw_power(tb_dev->disp_iface.hdev, PM_HINT_NORMAL); + + dev_info(tb_dev->log_dev, "Touchbar deactivated\n"); + } + + hid_hw_close(hdev); + hid_hw_stop(hdev); + appletb_clear_iface_info(tb_dev, hdev); + + spin_lock_irqsave(&tb_dev->tb_lock, flags); + + if (tb_dev->log_dev == &hdev->dev) { + if (tb_dev->mode_iface.hdev) + tb_dev->log_dev = &tb_dev->mode_iface.hdev->dev; + else if (tb_dev->disp_iface.hdev) + tb_dev->log_dev = &tb_dev->disp_iface.hdev->dev; + else + tb_dev->log_dev = NULL; + } + + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); +} + +#ifdef CONFIG_PM +static int appletb_suspend(struct hid_device *hdev, pm_message_t message) +{ + struct appletb_device *tb_dev = hid_get_drvdata(hdev); + struct appletb_iface_info *iface_info; + unsigned long flags; + bool all_suspended = false; + + if (message.event != PM_EVENT_SUSPEND && + message.event != PM_EVENT_FREEZE) + return 0; + + if (tb_dev->is_t1) { + + /* + * Wait for both interfaces to be suspended and no more async work + * in progress. + */ + + spin_lock_irqsave(&tb_dev->tb_lock, flags); + + if (!tb_dev->mode_iface.suspended && !tb_dev->disp_iface.suspended) { + tb_dev->active = false; + cancel_delayed_work(&tb_dev->tb_work); + } + + iface_info = appletb_get_iface_info(tb_dev, hdev); + if (iface_info) + iface_info->suspended = true; + + if ((!tb_dev->mode_iface.hdev || tb_dev->mode_iface.suspended) && + (!tb_dev->disp_iface.hdev || tb_dev->disp_iface.suspended)) + all_suspended = true; + + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); + + flush_delayed_work(&tb_dev->tb_work); + + if (!all_suspended) + return 0; + + /* + * The touch bar device itself remembers the last state when suspended + * in some cases, but in others (e.g. when mode != off and disp == off) + * it resumes with a different state; furthermore it may be only + * partially responsive in that state. By turning both mode and disp + * off we ensure it is in a good state when resuming (and this happens + * to be the same state after booting/resuming-from-hibernate, so less + * special casing between the two). + */ + if (message.event == PM_EVENT_SUSPEND) { + appletb_set_tb_mode(tb_dev, APPLETB_CMD_MODE_OFF); + appletb_set_tb_disp(tb_dev, APPLETB_CMD_DISP_OFF); + } + + spin_lock_irqsave(&tb_dev->tb_lock, flags); + + tb_dev->cur_tb_mode = APPLETB_CMD_MODE_OFF; + tb_dev->cur_tb_disp = APPLETB_CMD_DISP_OFF; + + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); + + dev_info(tb_dev->log_dev, "Touchbar suspended.\n"); + } else { + dev_info(tb_dev->log_dev, "T2 Mac detected, not handling suspend.\n"); + } + + return 0; +} + +static int appletb_reset_resume(struct hid_device *hdev) +{ + struct appletb_device *tb_dev = hid_get_drvdata(hdev); + struct appletb_iface_info *iface_info; + unsigned long flags; + + spin_lock_irqsave(&tb_dev->tb_lock, flags); + + iface_info = appletb_get_iface_info(tb_dev, hdev); + if (iface_info) + iface_info->suspended = false; + + if ((tb_dev->mode_iface.hdev && !tb_dev->mode_iface.suspended) && + (tb_dev->disp_iface.hdev && !tb_dev->disp_iface.suspended)) { + /* + * Restore touch bar state. Note that autopm state is not + * preserved, so need explicitly restore that here. + */ + tb_dev->active = true; + tb_dev->restore_autopm = true; + tb_dev->last_event_time = ktime_get(); + + appletb_update_touchbar_no_lock(tb_dev, true); + + dev_info(tb_dev->log_dev, "Touchbar resumed.\n"); + } + + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); + + return 0; +} +#endif + +static struct appletb_device *appletb_alloc_device(void) +{ + struct appletb_device *tb_dev; + + tb_dev = kzalloc(sizeof(*tb_dev), GFP_KERNEL); + if (!tb_dev) + return NULL; + + spin_lock_init(&tb_dev->tb_lock); + INIT_DELAYED_WORK(&tb_dev->tb_work, appletb_set_tb_worker); + + return tb_dev; +} + +static void appletb_free_device(struct appletb_device *tb_dev) +{ + cancel_delayed_work_sync(&tb_dev->tb_work); + kfree(tb_dev); +} + +static const struct hid_device_id appletb_hid_ids[] = { + /* MacBook Pro's 2016, 2017, with T1 chip */ + { HID_USB_DEVICE(USB_VENDOR_ID_LINUX_FOUNDATION, + USB_DEVICE_ID_IBRIDGE_TB), + .driver_data = APPLETB_FEATURE_IS_T1 }, + /* MacBook Pro's 2018, 2019, with T2 chip: iBridge DFR brightness */ + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, + USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, + /* 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_hid_ids); + +static struct hid_driver appletb_hid_driver = { + .name = "apple-touchbar", + .id_table = appletb_hid_ids, + .probe = appletb_probe, + .remove = appletb_remove, + .event = appletb_hid_event, + .input_configured = appletb_input_configured, +#ifdef CONFIG_PM + .suspend = appletb_suspend, + .reset_resume = appletb_reset_resume, +#endif +}; + +static int __init appletb_init(void) +{ + struct appletb_device *tb_dev; + int rc; + + tb_dev = appletb_alloc_device(); + if (!tb_dev) + return -ENOMEM; + + appletb_dev = tb_dev; + + rc = hid_register_driver(&appletb_hid_driver); + if (rc) + goto error; + + return 0; + +error: + appletb_free_device(tb_dev); + return rc; +} + +static void __exit appletb_exit(void) +{ + hid_unregister_driver(&appletb_hid_driver); + appletb_free_device(appletb_dev); +} + +module_init(appletb_init); +module_exit(appletb_exit); + +MODULE_AUTHOR("Ronald Tschalär"); +MODULE_DESCRIPTION("MacBookPro Touch Bar driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index c03535c4b..e620190b5 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -316,12 +316,14 @@ 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_BACKLIGHT) }, - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY) }, #endif #if IS_ENABLED(CONFIG_HID_APPLE_IBRIDGE) { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IBRIDGE) }, #endif +#if IS_ENABLED(CONFIG_HID_APPLE_TOUCHBAR) + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, + { 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) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL2) }, -- 2.37.2 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards 2023-02-10 3:44 ` [PATCH 2/3] HID: apple-touchbar: Add driver for the Touch Bar on MacBook Pros Aditya Garg @ 2023-02-10 3:45 ` Aditya Garg 2023-02-10 16:25 ` Thomas Weißschuh ` (2 more replies) 2023-02-10 16:13 ` [PATCH 2/3] HID: apple-touchbar: Add driver for the Touch Bar on MacBook Pros Thomas Weißschuh 2023-02-12 11:56 ` Andy Shevchenko 2 siblings, 3 replies; 32+ messages in thread From: Aditya Garg @ 2023-02-10 3:45 UTC (permalink / raw) To: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko Cc: LKML, linux-input, ronald, kekrby, Orlando Chamberlain From: Orlando Chamberlain <orlandoch.dev@gmail.com> This driver adds support for the keyboard backlight on Intel T2 Macs with internal Magic Keyboards (MacBookPro16,x and MacBookAir9,1) Signed-off-by: Orlando Chamberlain <orlandoch.dev@gmail.com> Co-developed-by: Kerem Karabay <kekrby@gmail.com> Signed-off-by: Kerem Karabay <kekrby@gmail.com> Signed-off-by: Aditya Garg <gargaditya08@live.com> --- MAINTAINERS | 6 ++ drivers/hid/Kconfig | 13 +++ drivers/hid/Makefile | 1 + drivers/hid/apple-magic-backlight.c | 143 ++++++++++++++++++++++++++++ 4 files changed, 163 insertions(+) create mode 100644 drivers/hid/apple-magic-backlight.c diff --git a/MAINTAINERS b/MAINTAINERS index fb1471cb5..3319f0c3e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9201,6 +9201,12 @@ F: include/linux/pm.h F: include/linux/suspend.h F: kernel/power/ +HID APPLE MAGIC BACKLIGHT DRIVER +M: Orlando Chamberlain <orlandoch.dev@gmail.com> +L: linux-input@vger.kernel.org +S: Maintained +F: drivers/hid/apple-magic-backlight.c + HID CORE LAYER M: Jiri Kosina <jikos@kernel.org> M: Benjamin Tissoires <benjamin.tissoires@redhat.com> diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 4ec669267..ad4612ec5 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -156,6 +156,19 @@ config HID_APPLE_TOUCHBAR To compile this driver as a module, choose M here: the module will be called apple-touchbar. +config HID_APPLE_MAGIC_BACKLIGHT + tristate "Apple Magic Keyboard Backlight" + depends on USB_HID + depends on LEDS_CLASS + depends on NEW_LEDS + help + Say Y here if you want support for the keyboard backlight on Macs with + the magic keyboard (MacBookPro16,x and MacBookAir9,1). Note that this + driver is not for external magic keyboards. + + To compile this driver as a module, choose M here: the + module will be called apple-magic-backlight. + config HID_APPLEIR tristate "Apple infrared receiver" depends on (USB_HID) diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index c792e42fe..a961914ec 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_HID_ACRUX) += hid-axff.o obj-$(CONFIG_HID_APPLE) += hid-apple.o obj-$(CONFIG_HID_APPLE_IBRIDGE) += apple-ibridge.o obj-$(CONFIG_HID_APPLE_TOUCHBAR) += apple-touchbar.o +obj-$(CONFIG_HID_APPLE_MAGIC_BACKLIGHT) += apple-magic-backlight.o obj-$(CONFIG_HID_APPLEIR) += hid-appleir.o obj-$(CONFIG_HID_CREATIVE_SB0540) += hid-creative-sb0540.o obj-$(CONFIG_HID_ASUS) += hid-asus.o diff --git a/drivers/hid/apple-magic-backlight.c b/drivers/hid/apple-magic-backlight.c new file mode 100644 index 000000000..9b128f6df --- /dev/null +++ b/drivers/hid/apple-magic-backlight.c @@ -0,0 +1,143 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Apple Magic Keyboard Backlight Driver + * + * For Intel Macs with internal Magic Keyboard (MacBookPro16,1-4 and MacBookAir9,1) + * + * Copyright (c) 2022 Kerem Karabay <kekrby@gmail.com> + * Copyright (c) 2023 Orlando Chamberlain <orlandoch.dev@gmail.com> + */ + +#include <linux/hid.h> +#include <linux/usb.h> + +#include "hid-ids.h" + +#define USAGE_MAGIC_BL 0xff00000f + +#define APPLE_MAGIC_REPORT_ID_POWER 3 +#define APPLE_MAGIC_REPORT_ID_BRIGHTNESS 1 + +struct apple_magic_backlight { + struct led_classdev cdev; + struct hid_device *hdev; + struct hid_report *brightness; + struct hid_report *power; +}; + +static void apple_magic_backlight_power_set(struct apple_magic_backlight *backlight, + char power, char rate) +{ + struct hid_report *rep = backlight->power; + + rep->field[0]->value[0] = power ? 1 : 0; + rep->field[1]->value[0] = 0x5e; /* Mimic Windows */ + rep->field[1]->value[0] |= rate << 8; + + hid_hw_request(backlight->hdev, backlight->power, HID_REQ_SET_REPORT); +} + +static void apple_magic_backlight_brightness_set(struct apple_magic_backlight *backlight, + int brightness, char rate) +{ + struct hid_report *rep = backlight->brightness; + + rep->field[0]->value[0] = brightness; + rep->field[1]->value[0] = 0x5e; /* Mimic Windows */ + rep->field[1]->value[0] |= rate << 8; + + hid_hw_request(backlight->hdev, backlight->brightness, HID_REQ_SET_REPORT); +} + +static void apple_magic_backlight_set(struct apple_magic_backlight *backlight, + int brightness, char rate) +{ + apple_magic_backlight_power_set(backlight, brightness, rate); + if (brightness) + apple_magic_backlight_brightness_set(backlight, brightness, rate); +} + +static int apple_magic_backlight_led_set(struct led_classdev *led_cdev, + enum led_brightness brightness) +{ + struct apple_magic_backlight *backlight = container_of(led_cdev, + struct apple_magic_backlight, cdev); + + apple_magic_backlight_set(backlight, brightness, 1); + return 0; +} + +static int apple_magic_backlight_probe(struct hid_device *hdev, + const struct hid_device_id *id) +{ + struct apple_magic_backlight *backlight; + int rc; + + rc = hid_parse(hdev); + if (rc) + return rc; + + /* Ensure this usb endpoint is for the keyboard backlight, not touchbar + * backlight. + */ + if (!(hdev->collection && hdev->collection[0].usage == USAGE_MAGIC_BL)) + return -ENODEV; + + backlight = devm_kzalloc(&hdev->dev, sizeof(*backlight), GFP_KERNEL); + + if (!backlight) + return -ENOMEM; + + hid_set_drvdata(hdev, backlight); + + rc = hid_hw_start(hdev, HID_CONNECT_DEFAULT); + if (rc) + return rc; + + backlight->brightness = hid_register_report(hdev, HID_FEATURE_REPORT, + APPLE_MAGIC_REPORT_ID_BRIGHTNESS, 0); + backlight->power = hid_register_report(hdev, HID_FEATURE_REPORT, + APPLE_MAGIC_REPORT_ID_POWER, 0); + + if (!backlight->brightness || !backlight->power) { + rc = -ENODEV; + goto hw_stop; + } + + backlight->hdev = hdev; + backlight->cdev.name = "apple::kbd_backlight"; + backlight->cdev.max_brightness = backlight->brightness->field[0]->logical_maximum; + backlight->cdev.brightness_set_blocking = apple_magic_backlight_led_set; + + apple_magic_backlight_set(backlight, 0, 0); + + return devm_led_classdev_register(&hdev->dev, &backlight->cdev); + +hw_stop: + hid_hw_stop(hdev); + return rc; +} + +static void apple_magic_backlight_remove(struct hid_device *hdev) +{ + hid_hw_stop(hdev); +} + +static const struct hid_device_id apple_magic_backlight_hid_ids[] = { + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, + { } +}; +MODULE_DEVICE_TABLE(hid, apple_magic_backlight_hid_ids); + +static struct hid_driver apple_magic_backlight_hid_driver = { + .name = "apple-magic-backlight", + .id_table = apple_magic_backlight_hid_ids, + .probe = apple_magic_backlight_probe, + .remove = apple_magic_backlight_remove, +}; + +module_hid_driver(apple_magic_backlight_hid_driver); + +MODULE_DESCRIPTION("MacBook Magic Keyboard Backlight"); +MODULE_AUTHOR("Orlando Chamberlain <orlandoch.dev@gmail.com>"); +MODULE_LICENSE("GPL"); -- 2.37.2 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards 2023-02-10 3:45 ` [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards Aditya Garg @ 2023-02-10 16:25 ` Thomas Weißschuh 2023-02-10 23:24 ` Orlando Chamberlain 2023-02-11 16:56 ` Pavel Machek 2023-02-12 11:18 ` Andy Shevchenko 2 siblings, 1 reply; 32+ messages in thread From: Thomas Weißschuh @ 2023-02-10 16:25 UTC (permalink / raw) To: Aditya Garg Cc: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain On Fri, Feb 10, 2023 at 03:45:15AM +0000, Aditya Garg wrote: > From: Orlando Chamberlain <orlandoch.dev@gmail.com> > > This driver adds support for the keyboard backlight on Intel T2 Macs > with internal Magic Keyboards (MacBookPro16,x and MacBookAir9,1) > > Signed-off-by: Orlando Chamberlain <orlandoch.dev@gmail.com> > Co-developed-by: Kerem Karabay <kekrby@gmail.com> > Signed-off-by: Kerem Karabay <kekrby@gmail.com> > Signed-off-by: Aditya Garg <gargaditya08@live.com> > --- > MAINTAINERS | 6 ++ > drivers/hid/Kconfig | 13 +++ > drivers/hid/Makefile | 1 + > drivers/hid/apple-magic-backlight.c | 143 ++++++++++++++++++++++++++++ > 4 files changed, 163 insertions(+) > create mode 100644 drivers/hid/apple-magic-backlight.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index fb1471cb5..3319f0c3e 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -9201,6 +9201,12 @@ F: include/linux/pm.h > F: include/linux/suspend.h > F: kernel/power/ > > +HID APPLE MAGIC BACKLIGHT DRIVER > +M: Orlando Chamberlain <orlandoch.dev@gmail.com> > +L: linux-input@vger.kernel.org > +S: Maintained > +F: drivers/hid/apple-magic-backlight.c > + > HID CORE LAYER > M: Jiri Kosina <jikos@kernel.org> > M: Benjamin Tissoires <benjamin.tissoires@redhat.com> > diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig > index 4ec669267..ad4612ec5 100644 > --- a/drivers/hid/Kconfig > +++ b/drivers/hid/Kconfig > @@ -156,6 +156,19 @@ config HID_APPLE_TOUCHBAR > To compile this driver as a module, choose M here: the > module will be called apple-touchbar. > > +config HID_APPLE_MAGIC_BACKLIGHT > + tristate "Apple Magic Keyboard Backlight" > + depends on USB_HID > + depends on LEDS_CLASS > + depends on NEW_LEDS > + help > + Say Y here if you want support for the keyboard backlight on Macs with > + the magic keyboard (MacBookPro16,x and MacBookAir9,1). Note that this > + driver is not for external magic keyboards. > + > + To compile this driver as a module, choose M here: the > + module will be called apple-magic-backlight. > + > config HID_APPLEIR > tristate "Apple infrared receiver" > depends on (USB_HID) > diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile > index c792e42fe..a961914ec 100644 > --- a/drivers/hid/Makefile > +++ b/drivers/hid/Makefile > @@ -28,6 +28,7 @@ obj-$(CONFIG_HID_ACRUX) += hid-axff.o > obj-$(CONFIG_HID_APPLE) += hid-apple.o > obj-$(CONFIG_HID_APPLE_IBRIDGE) += apple-ibridge.o > obj-$(CONFIG_HID_APPLE_TOUCHBAR) += apple-touchbar.o > +obj-$(CONFIG_HID_APPLE_MAGIC_BACKLIGHT) += apple-magic-backlight.o > obj-$(CONFIG_HID_APPLEIR) += hid-appleir.o > obj-$(CONFIG_HID_CREATIVE_SB0540) += hid-creative-sb0540.o > obj-$(CONFIG_HID_ASUS) += hid-asus.o > diff --git a/drivers/hid/apple-magic-backlight.c b/drivers/hid/apple-magic-backlight.c > new file mode 100644 > index 000000000..9b128f6df > --- /dev/null > +++ b/drivers/hid/apple-magic-backlight.c > @@ -0,0 +1,143 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Apple Magic Keyboard Backlight Driver > + * > + * For Intel Macs with internal Magic Keyboard (MacBookPro16,1-4 and MacBookAir9,1) > + * > + * Copyright (c) 2022 Kerem Karabay <kekrby@gmail.com> > + * Copyright (c) 2023 Orlando Chamberlain <orlandoch.dev@gmail.com> > + */ This patch doesn't seem to depend on the others at all and is much simpler. Maybe split it out from the series so it can get merged on its own and you don't have to carry it around anymore. > + > +#include <linux/hid.h> > +#include <linux/usb.h> > + > +#include "hid-ids.h" > + > +#define USAGE_MAGIC_BL 0xff00000f > + > +#define APPLE_MAGIC_REPORT_ID_POWER 3 > +#define APPLE_MAGIC_REPORT_ID_BRIGHTNESS 1 > + > +struct apple_magic_backlight { > + struct led_classdev cdev; > + struct hid_device *hdev; > + struct hid_report *brightness; > + struct hid_report *power; > +}; > + > +static void apple_magic_backlight_power_set(struct apple_magic_backlight *backlight, > + char power, char rate) > +{ > + struct hid_report *rep = backlight->power; > + > + rep->field[0]->value[0] = power ? 1 : 0; > + rep->field[1]->value[0] = 0x5e; /* Mimic Windows */ > + rep->field[1]->value[0] |= rate << 8; > + > + hid_hw_request(backlight->hdev, backlight->power, HID_REQ_SET_REPORT); > +} > + > +static void apple_magic_backlight_brightness_set(struct apple_magic_backlight *backlight, > + int brightness, char rate) > +{ > + struct hid_report *rep = backlight->brightness; > + > + rep->field[0]->value[0] = brightness; > + rep->field[1]->value[0] = 0x5e; /* Mimic Windows */ > + rep->field[1]->value[0] |= rate << 8; > + > + hid_hw_request(backlight->hdev, backlight->brightness, HID_REQ_SET_REPORT); > + The two functions above are nearly identical. > + > +static void apple_magic_backlight_set(struct apple_magic_backlight *backlight, > + int brightness, char rate) > +{ > + apple_magic_backlight_power_set(backlight, brightness, rate); > + if (brightness) > + apple_magic_backlight_brightness_set(backlight, brightness, rate); > +} > + > +static int apple_magic_backlight_led_set(struct led_classdev *led_cdev, > + enum led_brightness brightness) > +{ > + struct apple_magic_backlight *backlight = container_of(led_cdev, > + struct apple_magic_backlight, cdev); > + > + apple_magic_backlight_set(backlight, brightness, 1); > + return 0; > +} > + > +static int apple_magic_backlight_probe(struct hid_device *hdev, > + const struct hid_device_id *id) > +{ > + struct apple_magic_backlight *backlight; > + int rc; > + > + rc = hid_parse(hdev); > + if (rc) > + return rc; > + > + /* Ensure this usb endpoint is for the keyboard backlight, not touchbar > + * backlight. > + */ > + if (!(hdev->collection && hdev->collection[0].usage == USAGE_MAGIC_BL)) > + return -ENODEV; > + > + backlight = devm_kzalloc(&hdev->dev, sizeof(*backlight), GFP_KERNEL); > + > + if (!backlight) > + return -ENOMEM; > + > + hid_set_drvdata(hdev, backlight); > + > + rc = hid_hw_start(hdev, HID_CONNECT_DEFAULT); > + if (rc) > + return rc; > + > + backlight->brightness = hid_register_report(hdev, HID_FEATURE_REPORT, > + APPLE_MAGIC_REPORT_ID_BRIGHTNESS, 0); > + backlight->power = hid_register_report(hdev, HID_FEATURE_REPORT, > + APPLE_MAGIC_REPORT_ID_POWER, 0); > + > + if (!backlight->brightness || !backlight->power) { > + rc = -ENODEV; > + goto hw_stop; > + } > + > + backlight->hdev = hdev; > + backlight->cdev.name = "apple::kbd_backlight"; > + backlight->cdev.max_brightness = backlight->brightness->field[0]->logical_maximum; > + backlight->cdev.brightness_set_blocking = apple_magic_backlight_led_set; > + > + apple_magic_backlight_set(backlight, 0, 0); > + > + return devm_led_classdev_register(&hdev->dev, &backlight->cdev); > + > +hw_stop: > + hid_hw_stop(hdev); > + return rc; > +} > + > +static void apple_magic_backlight_remove(struct hid_device *hdev) > +{ > + hid_hw_stop(hdev); > +} > + > +static const struct hid_device_id apple_magic_backlight_hid_ids[] = { > + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, > + { } > +}; > +MODULE_DEVICE_TABLE(hid, apple_magic_backlight_hid_ids); > + > +static struct hid_driver apple_magic_backlight_hid_driver = { > + .name = "apple-magic-backlight", > + .id_table = apple_magic_backlight_hid_ids, > + .probe = apple_magic_backlight_probe, > + .remove = apple_magic_backlight_remove, Drop the .remove, it does the same as the default. > +}; > + > +module_hid_driver(apple_magic_backlight_hid_driver); > + > +MODULE_DESCRIPTION("MacBook Magic Keyboard Backlight"); > +MODULE_AUTHOR("Orlando Chamberlain <orlandoch.dev@gmail.com>"); > +MODULE_LICENSE("GPL"); > -- > 2.37.2 > ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards 2023-02-10 16:25 ` Thomas Weißschuh @ 2023-02-10 23:24 ` Orlando Chamberlain 2023-02-11 2:23 ` Thomas Weißschuh 0 siblings, 1 reply; 32+ messages in thread From: Orlando Chamberlain @ 2023-02-10 23:24 UTC (permalink / raw) To: Thomas Weißschuh Cc: Aditya Garg, Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby On Fri, 10 Feb 2023 16:25:18 +0000 Thomas Weißschuh <thomas@t-8ch.de> wrote: > On Fri, Feb 10, 2023 at 03:45:15AM +0000, Aditya Garg wrote: > > From: Orlando Chamberlain <orlandoch.dev@gmail.com> > > > > This driver adds support for the keyboard backlight on Intel T2 Macs > > with internal Magic Keyboards (MacBookPro16,x and MacBookAir9,1) > > > > Signed-off-by: Orlando Chamberlain <orlandoch.dev@gmail.com> > > Co-developed-by: Kerem Karabay <kekrby@gmail.com> > > Signed-off-by: Kerem Karabay <kekrby@gmail.com> > > Signed-off-by: Aditya Garg <gargaditya08@live.com> > > --- > > MAINTAINERS | 6 ++ > > drivers/hid/Kconfig | 13 +++ > > drivers/hid/Makefile | 1 + > > drivers/hid/apple-magic-backlight.c | 143 > > ++++++++++++++++++++++++++++ 4 files changed, 163 insertions(+) > > create mode 100644 drivers/hid/apple-magic-backlight.c > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index fb1471cb5..3319f0c3e 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -9201,6 +9201,12 @@ F: include/linux/pm.h > > F: include/linux/suspend.h > > F: kernel/power/ > > > > +HID APPLE MAGIC BACKLIGHT DRIVER > > +M: Orlando Chamberlain <orlandoch.dev@gmail.com> > > +L: linux-input@vger.kernel.org > > +S: Maintained > > +F: drivers/hid/apple-magic-backlight.c > > + > > HID CORE LAYER > > M: Jiri Kosina <jikos@kernel.org> > > M: Benjamin Tissoires <benjamin.tissoires@redhat.com> > > diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig > > index 4ec669267..ad4612ec5 100644 > > --- a/drivers/hid/Kconfig > > +++ b/drivers/hid/Kconfig > > @@ -156,6 +156,19 @@ config HID_APPLE_TOUCHBAR > > To compile this driver as a module, choose M here: the > > module will be called apple-touchbar. > > > > +config HID_APPLE_MAGIC_BACKLIGHT > > + tristate "Apple Magic Keyboard Backlight" > > + depends on USB_HID > > + depends on LEDS_CLASS > > + depends on NEW_LEDS > > + help > > + Say Y here if you want support for the keyboard backlight > > on Macs with > > + the magic keyboard (MacBookPro16,x and MacBookAir9,1). > > Note that this > > + driver is not for external magic keyboards. > > + > > + To compile this driver as a module, choose M here: the > > + module will be called apple-magic-backlight. > > + > > config HID_APPLEIR > > tristate "Apple infrared receiver" > > depends on (USB_HID) > > diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile > > index c792e42fe..a961914ec 100644 > > --- a/drivers/hid/Makefile > > +++ b/drivers/hid/Makefile > > @@ -28,6 +28,7 @@ obj-$(CONFIG_HID_ACRUX) += > > hid-axff.o obj-$(CONFIG_HID_APPLE) += hid-apple.o > > obj-$(CONFIG_HID_APPLE_IBRIDGE) += apple-ibridge.o > > obj-$(CONFIG_HID_APPLE_TOUCHBAR) += apple-touchbar.o > > +obj-$(CONFIG_HID_APPLE_MAGIC_BACKLIGHT) += > > apple-magic-backlight.o obj-$(CONFIG_HID_APPLEIR) += > > hid-appleir.o obj-$(CONFIG_HID_CREATIVE_SB0540) += > > hid-creative-sb0540.o obj-$(CONFIG_HID_ASUS) += > > hid-asus.o diff --git a/drivers/hid/apple-magic-backlight.c > > b/drivers/hid/apple-magic-backlight.c new file mode 100644 > > index 000000000..9b128f6df > > --- /dev/null > > +++ b/drivers/hid/apple-magic-backlight.c > > @@ -0,0 +1,143 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Apple Magic Keyboard Backlight Driver > > + * > > + * For Intel Macs with internal Magic Keyboard (MacBookPro16,1-4 > > and MacBookAir9,1) > > + * > > + * Copyright (c) 2022 Kerem Karabay <kekrby@gmail.com> > > + * Copyright (c) 2023 Orlando Chamberlain <orlandoch.dev@gmail.com> > > + */ > > This patch doesn't seem to depend on the others at all and is much > simpler. > Maybe split it out from the series so it can get merged on its own and > you don't have to carry it around anymore. Good point, I might send v2 separately from the touchbar and ibridge patches. > > > + > > +#include <linux/hid.h> > > +#include <linux/usb.h> > > + > > +#include "hid-ids.h" > > + > > +#define USAGE_MAGIC_BL 0xff00000f > > + > > +#define APPLE_MAGIC_REPORT_ID_POWER 3 > > +#define APPLE_MAGIC_REPORT_ID_BRIGHTNESS 1 > > + > > +struct apple_magic_backlight { > > + struct led_classdev cdev; > > + struct hid_device *hdev; > > + struct hid_report *brightness; > > + struct hid_report *power; > > +}; > > + > > +static void apple_magic_backlight_power_set(struct > > apple_magic_backlight *backlight, > > + char power, char rate) > > +{ > > + struct hid_report *rep = backlight->power; > > + > > + rep->field[0]->value[0] = power ? 1 : 0; > > + rep->field[1]->value[0] = 0x5e; /* Mimic Windows */ > > + rep->field[1]->value[0] |= rate << 8; > > + > > + hid_hw_request(backlight->hdev, backlight->power, > > HID_REQ_SET_REPORT); +} > > + > > +static void apple_magic_backlight_brightness_set(struct > > apple_magic_backlight *backlight, > > + int brightness, > > char rate) +{ > > + struct hid_report *rep = backlight->brightness; > > + > > + rep->field[0]->value[0] = brightness; > > + rep->field[1]->value[0] = 0x5e; /* Mimic Windows */ > > + rep->field[1]->value[0] |= rate << 8; > > + > > + hid_hw_request(backlight->hdev, backlight->brightness, > > HID_REQ_SET_REPORT); > > + > > The two functions above are nearly identical. They are indeed quite similar, and I can turn the backlight off with the brightness one, but when I logged the usb packets Windows used, it used both so I've done the same in the Linux driver to (hopefully) ensure it works with any other models or firmware updates that the Windows driver works on. > > > + > > +static void apple_magic_backlight_set(struct apple_magic_backlight > > *backlight, > > + int brightness, char rate) > > +{ > > + apple_magic_backlight_power_set(backlight, brightness, > > rate); > > + if (brightness) > > + apple_magic_backlight_brightness_set(backlight, > > brightness, rate); +} > > + > > +static int apple_magic_backlight_led_set(struct led_classdev > > *led_cdev, > > + enum led_brightness > > brightness) +{ > > + struct apple_magic_backlight *backlight = > > container_of(led_cdev, > > + struct apple_magic_backlight, cdev); > > + > > + apple_magic_backlight_set(backlight, brightness, 1); > > + return 0; > > +} > > + > > +static int apple_magic_backlight_probe(struct hid_device *hdev, > > + const struct hid_device_id > > *id) +{ > > + struct apple_magic_backlight *backlight; > > + int rc; > > + > > + rc = hid_parse(hdev); > > + if (rc) > > + return rc; > > + > > + /* Ensure this usb endpoint is for the keyboard backlight, > > not touchbar > > + * backlight. > > + */ > > + if (!(hdev->collection && hdev->collection[0].usage == > > USAGE_MAGIC_BL)) > > + return -ENODEV; > > + > > + backlight = devm_kzalloc(&hdev->dev, sizeof(*backlight), > > GFP_KERNEL); + > > + if (!backlight) > > + return -ENOMEM; > > + > > + hid_set_drvdata(hdev, backlight); > > + > > + rc = hid_hw_start(hdev, HID_CONNECT_DEFAULT); > > + if (rc) > > + return rc; > > + > > + backlight->brightness = hid_register_report(hdev, > > HID_FEATURE_REPORT, > > + APPLE_MAGIC_REPORT_ID_BRIGHTNESS, 0); > > + backlight->power = hid_register_report(hdev, > > HID_FEATURE_REPORT, > > + APPLE_MAGIC_REPORT_ID_POWER, 0); > > + > > + if (!backlight->brightness || !backlight->power) { > > + rc = -ENODEV; > > + goto hw_stop; > > + } > > + > > + backlight->hdev = hdev; > > + backlight->cdev.name = "apple::kbd_backlight"; > > + backlight->cdev.max_brightness = > > backlight->brightness->field[0]->logical_maximum; > > + backlight->cdev.brightness_set_blocking = > > apple_magic_backlight_led_set; + > > + apple_magic_backlight_set(backlight, 0, 0); > > + > > + return devm_led_classdev_register(&hdev->dev, > > &backlight->cdev); + > > +hw_stop: > > + hid_hw_stop(hdev); > > + return rc; > > +} > > + > > +static void apple_magic_backlight_remove(struct hid_device *hdev) > > +{ > > + hid_hw_stop(hdev); > > +} > > + > > +static const struct hid_device_id apple_magic_backlight_hid_ids[] > > = { > > + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, > > USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, > > + { } > > +}; > > +MODULE_DEVICE_TABLE(hid, apple_magic_backlight_hid_ids); > > + > > +static struct hid_driver apple_magic_backlight_hid_driver = { > > + .name = "apple-magic-backlight", > > + .id_table = apple_magic_backlight_hid_ids, > > + .probe = apple_magic_backlight_probe, > > + .remove = apple_magic_backlight_remove, > > Drop the .remove, it does the same as the default. > I didn't realise that! I will make that change in a v2. > > +}; > > + > > +module_hid_driver(apple_magic_backlight_hid_driver); > > + > > +MODULE_DESCRIPTION("MacBook Magic Keyboard Backlight"); > > +MODULE_AUTHOR("Orlando Chamberlain <orlandoch.dev@gmail.com>"); > > +MODULE_LICENSE("GPL"); > > -- > > 2.37.2 > > ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards 2023-02-10 23:24 ` Orlando Chamberlain @ 2023-02-11 2:23 ` Thomas Weißschuh 2023-02-11 2:42 ` Thomas Weißschuh 0 siblings, 1 reply; 32+ messages in thread From: Thomas Weißschuh @ 2023-02-11 2:23 UTC (permalink / raw) To: Orlando Chamberlain Cc: Aditya Garg, Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby On Sat, Feb 11, 2023 at 10:24:25AM +1100, Orlando Chamberlain wrote: > On Fri, 10 Feb 2023 16:25:18 +0000 > Thomas Weißschuh <thomas@t-8ch.de> wrote: > > > On Fri, Feb 10, 2023 at 03:45:15AM +0000, Aditya Garg wrote: > > > From: Orlando Chamberlain <orlandoch.dev@gmail.com> > > > +static void apple_magic_backlight_power_set(struct > > > apple_magic_backlight *backlight, > > > + char power, char rate) > > > +{ > > > + struct hid_report *rep = backlight->power; > > > + > > > + rep->field[0]->value[0] = power ? 1 : 0; > > > + rep->field[1]->value[0] = 0x5e; /* Mimic Windows */ > > > + rep->field[1]->value[0] |= rate << 8; > > > + > > > + hid_hw_request(backlight->hdev, backlight->power, > > > HID_REQ_SET_REPORT); +} > > > + > > > +static void apple_magic_backlight_brightness_set(struct > > > apple_magic_backlight *backlight, > > > + int brightness, > > > char rate) +{ > > > + struct hid_report *rep = backlight->brightness; > > > + > > > + rep->field[0]->value[0] = brightness; > > > + rep->field[1]->value[0] = 0x5e; /* Mimic Windows */ > > > + rep->field[1]->value[0] |= rate << 8; > > > + > > > + hid_hw_request(backlight->hdev, backlight->brightness, > > > HID_REQ_SET_REPORT); > > > + > > > > The two functions above are nearly identical. > > They are indeed quite similar, and I can turn the backlight off with the > brightness one, but when I logged the usb packets Windows used, it used > both so I've done the same in the Linux driver to (hopefully) ensure it > works with any other models or firmware updates that the Windows driver > works on. I didn't mean to suggest changing the logic, just the way the code is organized: static void apple_magic_backlight_report_set(struct apple_magic_backlight *backlight, struct hid_report *rep, char value, char rate) { rep->field[0]->value[0] = value; rep->field[1]->value[0] = 0x5e; /* Mimic Windows */ rep->field[1]->value[0] |= rate << 8; hid_hw_request(backlight->hdev, rep, HID_REQ_SET_REPORT); } static void apple_magic_backlight_set(struct apple_magic_backlight *backlight, int brightness, char rate) { apple_magic_backlight_report_set(backlight, backlight->power, !!brightness, rate); if (brightness) apple_magic_backlight_report_set(backlight, backlight->brightness, brightness, rate); } This way you can get rid of the duplicated code. > > > > > + > > > +static void apple_magic_backlight_set(struct apple_magic_backlight > > > *backlight, > > > + int brightness, char rate) > > > +{ > > > + apple_magic_backlight_power_set(backlight, brightness, > > > rate); > > > + if (brightness) > > > + apple_magic_backlight_brightness_set(backlight, > > > brightness, rate); +} > > > + ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards 2023-02-11 2:23 ` Thomas Weißschuh @ 2023-02-11 2:42 ` Thomas Weißschuh 0 siblings, 0 replies; 32+ messages in thread From: Thomas Weißschuh @ 2023-02-11 2:42 UTC (permalink / raw) To: Orlando Chamberlain Cc: Aditya Garg, Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby On Sat, Feb 11, 2023 at 02:23:42AM +0000, Thomas Weißschuh wrote: > On Sat, Feb 11, 2023 at 10:24:25AM +1100, Orlando Chamberlain wrote: > > On Fri, 10 Feb 2023 16:25:18 +0000 > > Thomas Weißschuh <thomas@t-8ch.de> wrote: > > > > > On Fri, Feb 10, 2023 at 03:45:15AM +0000, Aditya Garg wrote: > > > > From: Orlando Chamberlain <orlandoch.dev@gmail.com> > > > > +static void apple_magic_backlight_power_set(struct > > > > apple_magic_backlight *backlight, > > > > + char power, char rate) > > > > +{ > > > > + struct hid_report *rep = backlight->power; > > > > + > > > > + rep->field[0]->value[0] = power ? 1 : 0; > > > > + rep->field[1]->value[0] = 0x5e; /* Mimic Windows */ > > > > + rep->field[1]->value[0] |= rate << 8; > > > > + > > > > + hid_hw_request(backlight->hdev, backlight->power, > > > > HID_REQ_SET_REPORT); +} > > > > + > > > > +static void apple_magic_backlight_brightness_set(struct > > > > apple_magic_backlight *backlight, > > > > + int brightness, > > > > char rate) +{ > > > > + struct hid_report *rep = backlight->brightness; > > > > + > > > > + rep->field[0]->value[0] = brightness; > > > > + rep->field[1]->value[0] = 0x5e; /* Mimic Windows */ > > > > + rep->field[1]->value[0] |= rate << 8; > > > > + > > > > + hid_hw_request(backlight->hdev, backlight->brightness, > > > > HID_REQ_SET_REPORT); > > > > + > > > > > > The two functions above are nearly identical. > > > > They are indeed quite similar, and I can turn the backlight off with the > > brightness one, but when I logged the usb packets Windows used, it used > > both so I've done the same in the Linux driver to (hopefully) ensure it > > works with any other models or firmware updates that the Windows driver > > works on. > > I didn't mean to suggest changing the logic, just the way the code is > organized: > > static void apple_magic_backlight_report_set(struct apple_magic_backlight *backlight, > struct hid_report *rep, char value, char rate) > { > rep->field[0]->value[0] = value; > rep->field[1]->value[0] = 0x5e; /* Mimic Windows */ > rep->field[1]->value[0] |= rate << 8; > > hid_hw_request(backlight->hdev, rep, HID_REQ_SET_REPORT); > } > > static void apple_magic_backlight_set(struct apple_magic_backlight *backlight, > int brightness, char rate) > { > apple_magic_backlight_report_set(backlight, backlight->power, !!brightness, rate); > if (brightness) > apple_magic_backlight_report_set(backlight, backlight->brightness, brightness, rate); > } > > This way you can get rid of the duplicated code. Or even better, get rid of the struct apple_magic_backlight parameter altogether: static void apple_magic_backlight_report_set(struct hid_report *rep, char value, char rate) { rep->field[0]->value[0] = value; rep->field[1]->value[0] = 0x5e; /* Mimic Windows */ rep->field[1]->value[0] |= rate << 8; hid_hw_request(rep->device, rep, HID_REQ_SET_REPORT); } > > > > > > > > + > > > > +static void apple_magic_backlight_set(struct apple_magic_backlight > > > > *backlight, > > > > + int brightness, char rate) > > > > +{ > > > > + apple_magic_backlight_power_set(backlight, brightness, > > > > rate); > > > > + if (brightness) > > > > + apple_magic_backlight_brightness_set(backlight, > > > > brightness, rate); +} > > > > + ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards 2023-02-10 3:45 ` [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards Aditya Garg 2023-02-10 16:25 ` Thomas Weißschuh @ 2023-02-11 16:56 ` Pavel Machek 2023-02-12 2:28 ` Orlando Chamberlain 2023-02-12 5:16 ` Aditya Garg 2023-02-12 11:18 ` Andy Shevchenko 2 siblings, 2 replies; 32+ messages in thread From: Pavel Machek @ 2023-02-11 16:56 UTC (permalink / raw) To: Aditya Garg Cc: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain [-- Attachment #1: Type: text/plain, Size: 527 bytes --] Hi! > From: Orlando Chamberlain <orlandoch.dev@gmail.com> > > This driver adds support for the keyboard backlight on Intel T2 Macs > with internal Magic Keyboards (MacBookPro16,x and MacBookAir9,1) > + backlight->hdev = hdev; > + backlight->cdev.name = "apple::kbd_backlight"; ":white:kbd_backlight", plus document this in Documentation/leds/well-known-leds.txt so that we keep it consistent accross machines? Thanks, Pavel -- People of Russia, stop Putin before his war on Ukraine escalates. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards 2023-02-11 16:56 ` Pavel Machek @ 2023-02-12 2:28 ` Orlando Chamberlain 2023-02-12 5:16 ` Aditya Garg 1 sibling, 0 replies; 32+ messages in thread From: Orlando Chamberlain @ 2023-02-12 2:28 UTC (permalink / raw) To: Pavel Machek Cc: Aditya Garg, Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby On Sat, 11 Feb 2023 17:56:15 +0100 Pavel Machek <pavel@ucw.cz> wrote: > Hi! > > > From: Orlando Chamberlain <orlandoch.dev@gmail.com> > > > > This driver adds support for the keyboard backlight on Intel T2 Macs > > with internal Magic Keyboards (MacBookPro16,x and MacBookAir9,1) > > > + backlight->hdev = hdev; > > + backlight->cdev.name = "apple::kbd_backlight"; > > ":white:kbd_backlight", plus document this in > Documentation/leds/well-known-leds.txt so that we keep it consistent > accross machines? As in "apple:white:kbd_backlight" or just ":white:kbd_backlight"? It seems like most examples I can see by grepping around use "apple::kbd_backlight", "asus::kbd_backlight" etc, without any colour information or anything between the two colons. Would we want to start having the led names in new drivers (including this one) as "$vendor:$colour:$location_or_description"? I do notice you've also suggested doing that here https://lore.kernel.org/all/Y+I7xNqkq%2FX6Lag+@duo.ucw.cz/, and that conversation suggests adding the colour won't stop userspace tools from finding the backlight, which is good. One alternative would be to have the colour of the led stored in a sysfs file in the led's sysfs folder, not sure if that'd be better (it does mean the names stay the same), but also I'm not sure what the empty space between the two colons in the current led names is there for, if not colour. > > Thanks, > Pavel ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards 2023-02-11 16:56 ` Pavel Machek 2023-02-12 2:28 ` Orlando Chamberlain @ 2023-02-12 5:16 ` Aditya Garg 1 sibling, 0 replies; 32+ messages in thread From: Aditya Garg @ 2023-02-12 5:16 UTC (permalink / raw) To: Pavel Machek Cc: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain > On 11-Feb-2023, at 10:26 PM, Pavel Machek <pavel@ucw.cz> wrote: > > Hi! > >> From: Orlando Chamberlain <orlandoch.dev@gmail.com> >> >> This driver adds support for the keyboard backlight on Intel T2 Macs >> with internal Magic Keyboards (MacBookPro16,x and MacBookAir9,1) > >> + backlight->hdev = hdev; >> + backlight->cdev.name = "apple::kbd_backlight"; > > ":white:kbd_backlight", plus document this in > Documentation/leds/well-known-leds.txt so that we keep it consistent > accross machines? We had used the same name for butterfly keyboards, the code being in hid-apple Will that also be needed to be changed? > > Thanks, > Pavel > -- > People of Russia, stop Putin before his war on Ukraine escalates. ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards 2023-02-10 3:45 ` [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards Aditya Garg 2023-02-10 16:25 ` Thomas Weißschuh 2023-02-11 16:56 ` Pavel Machek @ 2023-02-12 11:18 ` Andy Shevchenko 2023-02-16 1:17 ` Orlando Chamberlain 2 siblings, 1 reply; 32+ messages in thread From: Andy Shevchenko @ 2023-02-12 11:18 UTC (permalink / raw) To: Aditya Garg Cc: Jiri Kosina, jkosina, benjamin.tissoires, LKML, linux-input, ronald, kekrby, Orlando Chamberlain On Fri, Feb 10, 2023 at 03:45:15AM +0000, Aditya Garg wrote: > From: Orlando Chamberlain <orlandoch.dev@gmail.com> > > This driver adds support for the keyboard backlight on Intel T2 Macs > with internal Magic Keyboards (MacBookPro16,x and MacBookAir9,1) ... > +#include <linux/hid.h> > +#include <linux/usb.h> Seems lack of some header inclusions, e.g. where struct led_classdev is defined or -ERRNO codes. > +#include "hid-ids.h" ... > +static void apple_magic_backlight_power_set(struct apple_magic_backlight *backlight, > + char power, char rate) char is a beast, can we use u8 here and in similar cases? ... > + /* Ensure this usb endpoint is for the keyboard backlight, not touchbar > + * backlight. > + */ /* * Multi-line comment style * goes like this. */ ... > + backlight = devm_kzalloc(&hdev->dev, sizeof(*backlight), GFP_KERNEL); > + Redundant blank line. > + if (!backlight) > + return -ENOMEM; ... > +static struct hid_driver apple_magic_backlight_hid_driver = { > + .name = "apple-magic-backlight", > + .id_table = apple_magic_backlight_hid_ids, > + .probe = apple_magic_backlight_probe, > + .remove = apple_magic_backlight_remove, > +}; > + Redundant blank line. > +module_hid_driver(apple_magic_backlight_hid_driver); -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards 2023-02-12 11:18 ` Andy Shevchenko @ 2023-02-16 1:17 ` Orlando Chamberlain 0 siblings, 0 replies; 32+ messages in thread From: Orlando Chamberlain @ 2023-02-16 1:17 UTC (permalink / raw) To: Andy Shevchenko Cc: Aditya Garg, Jiri Kosina, jkosina, benjamin.tissoires, LKML, linux-input, ronald, kekrby On Sun, 12 Feb 2023 13:18:33 +0200 Andy Shevchenko <andy@infradead.org> wrote: > On Fri, Feb 10, 2023 at 03:45:15AM +0000, Aditya Garg wrote: > > From: Orlando Chamberlain <orlandoch.dev@gmail.com> > > > > This driver adds support for the keyboard backlight on Intel T2 Macs > > with internal Magic Keyboards (MacBookPro16,x and MacBookAir9,1) > > ... > > > +#include <linux/hid.h> > > +#include <linux/usb.h> > > Seems lack of some header inclusions, e.g. where struct led_classdev > is defined or -ERRNO codes. > > > +#include "hid-ids.h" > > ... > > > +static void apple_magic_backlight_power_set(struct > > apple_magic_backlight *backlight, > > + char power, char rate) > > char is a beast, can we use u8 here and in similar cases? > > ... > > > + /* Ensure this usb endpoint is for the keyboard backlight, > > not touchbar > > + * backlight. > > + */ > > /* > * Multi-line comment style > * goes like this. > */ > > ... > > > + backlight = devm_kzalloc(&hdev->dev, sizeof(*backlight), > > GFP_KERNEL); > > > + > > Redundant blank line. > > > + if (!backlight) > > + return -ENOMEM; > > ... > > > +static struct hid_driver apple_magic_backlight_hid_driver = { > > + .name = "apple-magic-backlight", > > + .id_table = apple_magic_backlight_hid_ids, > > + .probe = apple_magic_backlight_probe, > > + .remove = apple_magic_backlight_remove, > > +}; > > > + > > Redundant blank line. > > > +module_hid_driver(apple_magic_backlight_hid_driver); > Thanks for pointing out all these, I'll make those changes in v2. ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/3] HID: apple-touchbar: Add driver for the Touch Bar on MacBook Pros 2023-02-10 3:44 ` [PATCH 2/3] HID: apple-touchbar: Add driver for the Touch Bar on MacBook Pros Aditya Garg 2023-02-10 3:45 ` [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards Aditya Garg @ 2023-02-10 16:13 ` Thomas Weißschuh 2023-02-12 11:56 ` Andy Shevchenko 2 siblings, 0 replies; 32+ messages in thread From: Thomas Weißschuh @ 2023-02-10 16:13 UTC (permalink / raw) To: Aditya Garg Cc: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain On Fri, Feb 10, 2023 at 03:44:26AM +0000, Aditya Garg wrote: > From: Ronald Tschalär <ronald@innovation.ch> > > This driver enables basic touch bar functionality: enabling it, switching > between modes on FN key press, and dimming and turning the display > off/on when idle/active. > > Signed-off-by: Ronald Tschalär <ronald@innovation.ch> > [Kerem Karabay: use USB product IDs from hid-ids.h] > [Kerem Karabay: use hid_hw_raw_request except when setting the touchbar mode on T1 Macs] > [Kerem Karabay: update Kconfig description] > Signed-off-by: Kerem Karabay <kekrby@gmail.com> > [Orlando Chamberlain: add usage check to not bind to keyboard backlight interface] > Signed-off-by: Orlando Chamberlain <orlandoch.dev@gmail.com> > [Aditya Garg: check if apple-touchbar is enabled in the special driver list] > [Aditya Garg: fix suspend on T2 Macs] > Signed-off-by: Aditya Garg <gargaditya08@live.com> > --- > drivers/hid/Kconfig | 11 + > drivers/hid/Makefile | 1 + > drivers/hid/apple-touchbar.c | 1500 ++++++++++++++++++++++++++++++++++ > drivers/hid/hid-quirks.c | 6 +- > 4 files changed, 1516 insertions(+), 2 deletions(-) > create mode 100644 drivers/hid/apple-touchbar.c > > diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig > index e69afa5f4..4ec669267 100644 > --- a/drivers/hid/Kconfig > +++ b/drivers/hid/Kconfig > @@ -134,6 +134,7 @@ config HID_APPLE_IBRIDGE > tristate "Apple iBridge" > depends on USB_HID > depends on (X86 && ACPI) || COMPILE_TEST > + imply HID_APPLE_TOUCHBAR > imply HID_SENSOR_HUB > imply HID_SENSOR_ALS > help > @@ -145,6 +146,16 @@ config HID_APPLE_IBRIDGE > To compile this driver as a module, choose M here: the > module will be called apple-ibridge. > > +config HID_APPLE_TOUCHBAR > + tristate "Apple Touch Bar" > + depends on USB_HID > + help > + Say Y here if you want support for the Touch Bar on x86 > + MacBook Pros. > + > + To compile this driver as a module, choose M here: the > + module will be called apple-touchbar. > + > config HID_APPLEIR > tristate "Apple infrared receiver" > depends on (USB_HID) > diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile > index b61373cd8..c792e42fe 100644 > --- a/drivers/hid/Makefile > +++ b/drivers/hid/Makefile > @@ -27,6 +27,7 @@ obj-$(CONFIG_HID_ALPS) += hid-alps.o > obj-$(CONFIG_HID_ACRUX) += hid-axff.o > obj-$(CONFIG_HID_APPLE) += hid-apple.o > obj-$(CONFIG_HID_APPLE_IBRIDGE) += apple-ibridge.o > +obj-$(CONFIG_HID_APPLE_TOUCHBAR) += apple-touchbar.o > obj-$(CONFIG_HID_APPLEIR) += hid-appleir.o > obj-$(CONFIG_HID_CREATIVE_SB0540) += hid-creative-sb0540.o > obj-$(CONFIG_HID_ASUS) += hid-asus.o > diff --git a/drivers/hid/apple-touchbar.c b/drivers/hid/apple-touchbar.c > new file mode 100644 > index 000000000..ff6a8493b > --- /dev/null > +++ b/drivers/hid/apple-touchbar.c > @@ -0,0 +1,1500 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Apple Touch Bar Driver > + * > + * Copyright (c) 2017-2018 Ronald Tschalär > + */ > + > +/* > + * Recent MacBookPro models (MacBookPro 13,[23] and later) have a touch bar, > + * which is exposed via several USB interfaces. MacOS supports a fancy mode > + * where arbitrary buttons can be defined; this driver currently only > + * supports the simple mode that consists of 3 predefined layouts > + * (escape-only, esc + special keys, and esc + function keys). > + * > + * The first USB HID interface supports two reports, an input report that > + * is used to report the key presses, and an output report which can be > + * used to set the touch bar "mode": touch bar off (in which case no touches > + * are reported at all), escape key only, escape + 12 function keys, and > + * escape + several special keys (including brightness, audio volume, > + * etc). The second interface supports several, complex reports, most of > + * which are unknown at this time, but one of which has been determined to > + * allow for controlling of the touch bar's brightness: off (though touches > + * are still reported), dimmed, and full brightness. This driver makes > + * use of these two reports. > + */ > + > +#define dev_fmt(fmt) "tb: " fmt This is a bit nondescriptive name. Maybe use KBUILD_MODNAME or the name of the HID driver as prefix? > +#include <linux/device.h> > +#include <linux/hid.h> > +#include <linux/input.h> > +#include <linux/jiffies.h> > +#include <linux/ktime.h> > +#include <linux/module.h> > +#include <linux/slab.h> > +#include <linux/spinlock.h> > +#include <linux/string.h> > +#include <linux/sysfs.h> > +#include <linux/usb/ch9.h> > +#include <linux/usb.h> > +#include <linux/workqueue.h> > + > +#include "hid-ids.h" > +#include "apple-ibridge.h" > + > +#define HID_UP_APPLE 0xff120000 > +#define HID_USAGE_MODE (HID_UP_CUSTOM | 0x0004) > +#define HID_USAGE_APPLE_APP (HID_UP_APPLE | 0x0001) > +#define HID_USAGE_DISP (HID_UP_APPLE | 0x0021) > +#define HID_USAGE_DISP_AUX1 (HID_UP_APPLE | 0x0020) > + > +#define APPLETB_MAX_TB_KEYS 13 /* ESC, F1-F12 */ > + > +#define APPLETB_CMD_MODE_ESC 0 > +#define APPLETB_CMD_MODE_FN 1 > +#define APPLETB_CMD_MODE_SPCL 2 > +#define APPLETB_CMD_MODE_OFF 3 > +#define APPLETB_CMD_MODE_UPD 254 > +#define APPLETB_CMD_MODE_NONE 255 > + > +#define APPLETB_CMD_DISP_ON 1 > +#define APPLETB_CMD_DISP_DIM 2 > +#define APPLETB_CMD_DISP_OFF 4 > +#define APPLETB_CMD_DISP_UPD 254 > +#define APPLETB_CMD_DISP_NONE 255 > + > +#define APPLETB_FN_MODE_FKEYS 0 > +#define APPLETB_FN_MODE_NORM 1 > +#define APPLETB_FN_MODE_INV 2 > +#define APPLETB_FN_MODE_SPCL 3 > +#define APPLETB_FN_MODE_ESC 4 > +#define APPLETB_FN_MODE_MAX APPLETB_FN_MODE_ESC > + > +#define APPLETB_DEVID_KEYBOARD 1 > +#define APPLETB_DEVID_TOUCHPAD 2 > + > +#define APPLETB_MAX_DIM_TIME 30 > + > +#define APPLETB_FEATURE_IS_T1 BIT(0) > + > +static int appletb_tb_def_idle_timeout = 5 * 60; > +module_param_named(idle_timeout, appletb_tb_def_idle_timeout, int, 0444); > +MODULE_PARM_DESC(idle_timeout, "Default touch bar idle timeout:\n" > + " [>0] - turn touch bar display off after no keyboard, trackpad, or touch bar input has been received for this many seconds;\n" > + " the display will be turned back on as soon as new input is received\n" > + " 0 - turn touch bar display off (input does not turn it on again)\n" > + " -1 - turn touch bar display on (does not turn off automatically)\n" > + " -2 - disable touch bar completely"); > + > +static int appletb_tb_def_dim_timeout = -2; > +module_param_named(dim_timeout, appletb_tb_def_dim_timeout, int, 0444); > +MODULE_PARM_DESC(dim_timeout, "Default touch bar dim timeout:\n" > + " >0 - dim touch bar display after no keyboard, trackpad, or touch bar input has been received for this many seconds\n" > + " the display will be returned to full brightness as soon as new input is received\n" > + " 0 - dim touch bar display (input does not return it to full brightness)\n" > + " -1 - disable timeout (touch bar never dimmed)\n" > + " [-2] - calculate timeout based on idle-timeout"); > + > +static int appletb_tb_def_fn_mode = APPLETB_FN_MODE_NORM; > +module_param_named(fnmode, appletb_tb_def_fn_mode, int, 0444); > +MODULE_PARM_DESC(fnmode, "Default Fn key mode:\n" > + " 0 - function-keys only\n" > + " [1] - fn key switches from special to function-keys\n" > + " 2 - inverse of 1\n" > + " 3 - special keys only\n" > + " 4 - escape key only"); > + > +static ssize_t idle_timeout_show(struct device *dev, > + struct device_attribute *attr, char *buf); > +static ssize_t idle_timeout_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, size_t size); > +static DEVICE_ATTR_RW(idle_timeout); > + > +static ssize_t dim_timeout_show(struct device *dev, > + struct device_attribute *attr, char *buf); > +static ssize_t dim_timeout_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, size_t size); > +static DEVICE_ATTR_RW(dim_timeout); > + > +static ssize_t fnmode_show(struct device *dev, struct device_attribute *attr, > + char *buf); > +static ssize_t fnmode_store(struct device *dev, struct device_attribute *attr, > + const char *buf, size_t size); > +static DEVICE_ATTR_RW(fnmode); > + > +static struct attribute *appletb_attrs[] = { > + &dev_attr_idle_timeout.attr, > + &dev_attr_dim_timeout.attr, > + &dev_attr_fnmode.attr, > + NULL, No comma. > +}; > + > +static const struct attribute_group appletb_attr_group = { > + .attrs = appletb_attrs, > +}; > + > +struct appletb_device { > + bool active; > + struct device *log_dev; > + > + struct hid_field *mode_field; > + struct hid_field *disp_field; > + struct hid_field *disp_field_aux1; > + struct appletb_iface_info { > + struct hid_device *hdev; > + struct usb_interface *usb_iface; > + bool suspended; > + } mode_iface, disp_iface; > + > + struct input_handler inp_handler; > + struct input_handle kbd_handle; > + struct input_handle tpd_handle; > + > + bool last_tb_keys_pressed[APPLETB_MAX_TB_KEYS]; > + bool last_tb_keys_translated[APPLETB_MAX_TB_KEYS]; > + bool last_fn_pressed; > + > + ktime_t last_event_time; > + > + unsigned char cur_tb_mode; > + unsigned char pnd_tb_mode; > + unsigned char cur_tb_disp; > + unsigned char pnd_tb_disp; > + bool tb_autopm_off; > + bool restore_autopm; > + struct delayed_work tb_work; > + /* protects most of the above */ > + spinlock_t tb_lock; > + > + int dim_timeout; > + int idle_timeout; > + bool dim_to_is_calc; > + int fn_mode; > + > + bool is_t1; > +}; > + > +struct appletb_key_translation { > + u16 from; > + u16 to; > +}; > + > +static const struct appletb_key_translation appletb_fn_codes[] = { > + { KEY_F1, KEY_BRIGHTNESSDOWN }, > + { KEY_F2, KEY_BRIGHTNESSUP }, > + { KEY_F3, KEY_SCALE }, /* not used */ > + { KEY_F4, KEY_DASHBOARD }, /* not used */ > + { KEY_F5, KEY_KBDILLUMDOWN }, > + { KEY_F6, KEY_KBDILLUMUP }, > + { KEY_F7, KEY_PREVIOUSSONG }, > + { KEY_F8, KEY_PLAYPAUSE }, > + { KEY_F9, KEY_NEXTSONG }, > + { KEY_F10, KEY_MUTE }, > + { KEY_F11, KEY_VOLUMEDOWN }, > + { KEY_F12, KEY_VOLUMEUP }, > +}; This should be able to make use of sparse_keymap from sparse-keymap.h. It makes the code shorter and provides a bit more functionality. static const struct key_entry appletb_fn_keymap = { { KE_KEY, KEY_F1, KEY_BRIGHTNESSDOWN }, ... { KE_END, 0 } }; > +static struct appletb_device *appletb_dev; > + > +static bool appletb_disable_autopm(struct hid_device *hdev) > +{ > + int rc; > + > + rc = hid_hw_power(hdev, PM_HINT_FULLON); > + > + if (rc == 0) > + return true; > + > + hid_err(hdev, > + "Failed to disable auto-pm on touch bar device (%d)\n", rc); You can use "%pE" and ERR_PTR(rc) to produce nicer error strings. > + return false; > +} > + > +/* > + * While the mode functionality is listed as a valid hid report in the usb > + * interface descriptor, on a T1 it's not sent that way. Instead it's sent with > + * different request-type and without a leading report-id in the data. Hence > + * we need to send it as a custom usb control message rather via any of the > + * standard hid_hw_*request() functions. The device might return EPIPE for a > + * while after setting the display mode on T1 models, so retrying should be > + * done on those models. > + */ > +static int appletb_set_tb_mode(struct appletb_device *tb_dev, > + unsigned char mode) > +{ > + struct hid_report *report; > + void *buf; > + bool autopm_off = false; > + int rc; > + > + if (!tb_dev->mode_iface.hdev) > + return -ENOTCONN; > + > + report = tb_dev->mode_field->report; > + > + if (tb_dev->is_t1) { > + buf = kmemdup(&mode, 1, GFP_KERNEL); > + } else { > + char data[] = { report->id, mode }; > + > + buf = kmemdup(data, sizeof(data), GFP_KERNEL); These allocations don't seem to be necessary. They could just be local buffers. > + } > + if (!buf) > + return -ENOMEM; > + > + autopm_off = appletb_disable_autopm(tb_dev->mode_iface.hdev); > + > + if (tb_dev->is_t1) { > + int tries = 0; > + struct usb_device *dev = interface_to_usbdev(tb_dev->mode_iface.usb_iface); > + __u8 ifnum = tb_dev->mode_iface.usb_iface->cur_altsetting->desc.bInterfaceNumber; > + > + do { > + rc = usb_control_msg(dev, usb_sndctrlpipe(dev, 0), HID_REQ_SET_REPORT, > + USB_DIR_OUT | USB_RECIP_INTERFACE | USB_TYPE_VENDOR, > + (report->type + 1) << 8 | report->id, > + ifnum, buf, 1, 2000); > + > + if (rc != -EPIPE) > + break; > + > + usleep_range(1000 << tries, 3000 << tries); > + } while (++tries < 5); > + } else { > + rc = hid_hw_raw_request(tb_dev->mode_iface.hdev, report->id, > + (__u8 *) buf, 2, report->type, > + HID_REQ_SET_REPORT); > + } > + > + if (rc < 0) > + dev_err(tb_dev->log_dev, > + "Failed to set touch bar mode to %u (%d)\n", mode, rc); > + > + if (autopm_off) > + hid_hw_power(tb_dev->mode_iface.hdev, PM_HINT_NORMAL); > + > + kfree(buf); > + > + return rc; > +} > + > +static int appletb_set_tb_disp(struct appletb_device *tb_dev, > + unsigned char disp) > +{ > + struct hid_report *report; > + int rc; > + > + if (!tb_dev->disp_iface.hdev) > + return -ENOTCONN; > + > + report = tb_dev->disp_field->report; > + > + rc = hid_set_field(tb_dev->disp_field_aux1, 0, 1); > + if (rc) { > + dev_err(tb_dev->log_dev, > + "Failed to set display report field (%d)\n", rc); > + return rc; > + } > + > + rc = hid_set_field(tb_dev->disp_field, 0, disp); > + if (rc) { > + dev_err(tb_dev->log_dev, > + "Failed to set display report field (%d)\n", rc); > + return rc; > + } > + > + /* > + * Keep the USB interface powered on while the touch bar display is on > + * for better responsiveness. > + */ > + if (disp != APPLETB_CMD_DISP_OFF && !tb_dev->tb_autopm_off) > + tb_dev->tb_autopm_off = > + appletb_disable_autopm(report->device); > + > + hid_hw_request(tb_dev->disp_iface.hdev, report, HID_REQ_SET_REPORT); > + > + if (disp == APPLETB_CMD_DISP_OFF && tb_dev->tb_autopm_off) { > + hid_hw_power(tb_dev->disp_iface.hdev, PM_HINT_NORMAL); > + tb_dev->tb_autopm_off = false; > + } > + > + return rc; > +} > + > +static bool appletb_any_tb_key_pressed(struct appletb_device *tb_dev) > +{ > + return !!memchr_inv(tb_dev->last_tb_keys_pressed, 0, > + sizeof(tb_dev->last_tb_keys_pressed)); > +} > + > +static void appletb_schedule_tb_update(struct appletb_device *tb_dev, s64 secs) > +{ > + schedule_delayed_work(&tb_dev->tb_work, msecs_to_jiffies(secs * 1000)); > +} > + > +static void appletb_set_tb_worker(struct work_struct *work) > +{ > + struct appletb_device *tb_dev = > + container_of(work, struct appletb_device, tb_work.work); > + s64 time_left = 0, min_timeout, time_to_off; > + unsigned char pending_mode; > + unsigned char pending_disp; > + unsigned char current_disp; > + bool restore_autopm; > + bool any_tb_key_pressed, need_reschedule; > + int rc1 = 1, rc2 = 1; > + unsigned long flags; > + > + spin_lock_irqsave(&tb_dev->tb_lock, flags); > + > + /* handle explicit mode-change request */ > + pending_mode = tb_dev->pnd_tb_mode; > + pending_disp = tb_dev->pnd_tb_disp; > + restore_autopm = tb_dev->restore_autopm; > + > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > + > + if (pending_mode != APPLETB_CMD_MODE_NONE) > + rc1 = appletb_set_tb_mode(tb_dev, pending_mode); > + if (pending_mode != APPLETB_CMD_MODE_NONE && > + pending_disp != APPLETB_CMD_DISP_NONE) > + msleep(25); > + if (pending_disp != APPLETB_CMD_DISP_NONE) > + rc2 = appletb_set_tb_disp(tb_dev, pending_disp); > + > + if (restore_autopm && tb_dev->tb_autopm_off) > + appletb_disable_autopm(tb_dev->disp_field->report->device); > + > + spin_lock_irqsave(&tb_dev->tb_lock, flags); > + > + need_reschedule = false; > + > + if (rc1 == 0) { > + tb_dev->cur_tb_mode = pending_mode; > + > + if (tb_dev->pnd_tb_mode == pending_mode) > + tb_dev->pnd_tb_mode = APPLETB_CMD_MODE_NONE; > + else > + need_reschedule = true; > + } > + > + if (rc2 == 0) { > + tb_dev->cur_tb_disp = pending_disp; > + > + if (tb_dev->pnd_tb_disp == pending_disp) > + tb_dev->pnd_tb_disp = APPLETB_CMD_DISP_NONE; > + else > + need_reschedule = true; > + } > + current_disp = tb_dev->cur_tb_disp; > + > + tb_dev->restore_autopm = false; > + > + /* calculate time left to next timeout */ > + if (tb_dev->idle_timeout == -2 || tb_dev->idle_timeout == 0) > + min_timeout = -1; > + else if (tb_dev->idle_timeout == -1) > + min_timeout = tb_dev->dim_timeout; > + else if (tb_dev->dim_timeout <= 0) > + min_timeout = tb_dev->idle_timeout; > + else > + min_timeout = min(tb_dev->dim_timeout, tb_dev->idle_timeout); > + > + if (min_timeout > 0) { > + s64 idle_time = > + (ktime_ms_delta(ktime_get(), tb_dev->last_event_time) + > + 500) / 1000; > + > + time_left = max(min_timeout - idle_time, 0LL); > + if (tb_dev->idle_timeout <= 0) > + time_to_off = -1; > + else if (idle_time >= tb_dev->idle_timeout) > + time_to_off = 0; > + else > + time_to_off = tb_dev->idle_timeout - idle_time; > + } else { > + /* not used - just to appease the compiler */ > + time_to_off = 0; > + } > + > + any_tb_key_pressed = appletb_any_tb_key_pressed(tb_dev); > + > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > + > + dev_dbg(tb_dev->log_dev, "timeout calc: idle_timeout=%d dim_timeout=%d min_timeout=%lld time_left=%lld need_reschedule=%d any_tb_key_pressed=%d\n", > + tb_dev->idle_timeout, tb_dev->dim_timeout, min_timeout, > + time_left, need_reschedule, any_tb_key_pressed); > + > + /* a new command arrived while we were busy - handle it */ > + if (need_reschedule) { > + appletb_schedule_tb_update(tb_dev, 0); > + return; > + } > + > + /* if no idle/dim timeout, we're done */ > + if (min_timeout <= 0) > + return; > + > + /* manage idle/dim timeout */ > + if (time_left > 0) { > + /* we fired too soon or had a mode-change - re-schedule */ > + appletb_schedule_tb_update(tb_dev, time_left); > + } else if (any_tb_key_pressed) { > + /* keys are still pressed - re-schedule */ > + appletb_schedule_tb_update(tb_dev, min_timeout); > + } else { > + /* dim or idle timeout reached */ > + int next_disp = (time_to_off == 0) ? APPLETB_CMD_DISP_OFF : > + APPLETB_CMD_DISP_DIM; > + if (next_disp != current_disp && > + appletb_set_tb_disp(tb_dev, next_disp) == 0) { > + spin_lock_irqsave(&tb_dev->tb_lock, flags); > + tb_dev->cur_tb_disp = next_disp; > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > + } > + > + if (time_to_off > 0) > + appletb_schedule_tb_update(tb_dev, time_to_off); > + } > +} > + > +static u16 appletb_fn_to_special(u16 code) > +{ > + int idx; > + > + for (idx = 0; idx < ARRAY_SIZE(appletb_fn_codes); idx++) { > + if (appletb_fn_codes[idx].from == code) > + return appletb_fn_codes[idx].to; > + } > + > + return 0; > +} > + > +static unsigned char appletb_get_cur_tb_mode(struct appletb_device *tb_dev) > +{ > + return tb_dev->pnd_tb_mode != APPLETB_CMD_MODE_NONE ? > + tb_dev->pnd_tb_mode : tb_dev->cur_tb_mode; > +} > + > +static unsigned char appletb_get_cur_tb_disp(struct appletb_device *tb_dev) > +{ > + return tb_dev->pnd_tb_disp != APPLETB_CMD_DISP_NONE ? > + tb_dev->pnd_tb_disp : tb_dev->cur_tb_disp; > +} > + > +static unsigned char appletb_get_fn_tb_mode(struct appletb_device *tb_dev) > +{ > + switch (tb_dev->fn_mode) { > + case APPLETB_FN_MODE_ESC: > + return APPLETB_CMD_MODE_ESC; > + > + case APPLETB_FN_MODE_FKEYS: > + return APPLETB_CMD_MODE_FN; > + > + case APPLETB_FN_MODE_SPCL: > + return APPLETB_CMD_MODE_SPCL; > + > + case APPLETB_FN_MODE_INV: > + return (tb_dev->last_fn_pressed) ? APPLETB_CMD_MODE_SPCL : > + APPLETB_CMD_MODE_FN; > + > + case APPLETB_FN_MODE_NORM: > + default: > + return (tb_dev->last_fn_pressed) ? APPLETB_CMD_MODE_FN : > + APPLETB_CMD_MODE_SPCL; > + } > +} > + > +/* > + * Switch touch bar mode and display when mode or display not the desired ones. > + */ > +static void appletb_update_touchbar_no_lock(struct appletb_device *tb_dev, > + bool force) > +{ > + unsigned char want_mode; > + unsigned char want_disp; > + bool need_update = false; > + > + /* > + * Calculate the new modes: > + * idle_timeout: > + * -2 mode/disp off > + * -1 mode on, disp on/dim > + * 0 mode on, disp off > + * >0 mode on, disp off after idle_timeout seconds > + * dim_timeout (only valid if idle_timeout > 0 || idle_timeout == -1): > + * -1 disp never dimmed > + * 0 disp always dimmed > + * >0 disp dim after dim_timeout seconds > + */ > + if (tb_dev->idle_timeout == -2) { > + want_mode = APPLETB_CMD_MODE_OFF; > + want_disp = APPLETB_CMD_DISP_OFF; > + } else { > + want_mode = appletb_get_fn_tb_mode(tb_dev); > + want_disp = tb_dev->idle_timeout == 0 ? APPLETB_CMD_DISP_OFF : > + tb_dev->dim_timeout == 0 ? APPLETB_CMD_DISP_DIM : > + APPLETB_CMD_DISP_ON; > + } > + > + /* > + * See if we need to update the touch bar, taking into account that we > + * generally don't want to switch modes while a touch bar key is > + * pressed. > + */ > + if (appletb_get_cur_tb_mode(tb_dev) != want_mode && > + !appletb_any_tb_key_pressed(tb_dev)) { > + tb_dev->pnd_tb_mode = want_mode; > + need_update = true; > + } > + > + if (appletb_get_cur_tb_disp(tb_dev) != want_disp && > + (!appletb_any_tb_key_pressed(tb_dev) || > + want_disp != APPLETB_CMD_DISP_OFF)) { > + tb_dev->pnd_tb_disp = want_disp; > + need_update = true; > + } > + > + if (force) > + need_update = true; > + > + /* schedule the update if desired */ > + dev_dbg_ratelimited(tb_dev->log_dev, > + "update: need_update=%d, want_mode=%d, cur-mode=%d, want_disp=%d, cur-disp=%d\n", > + need_update, want_mode, tb_dev->cur_tb_mode, > + want_disp, tb_dev->cur_tb_disp); > + > + if (need_update) { > + cancel_delayed_work(&tb_dev->tb_work); > + appletb_schedule_tb_update(tb_dev, 0); > + } > +} > + > +static void appletb_update_touchbar(struct appletb_device *tb_dev, bool force) > +{ > + unsigned long flags; > + > + spin_lock_irqsave(&tb_dev->tb_lock, flags); > + > + if (tb_dev->active) > + appletb_update_touchbar_no_lock(tb_dev, force); > + > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > +} > + > +static void appletb_set_idle_timeout(struct appletb_device *tb_dev, int new) > +{ > + tb_dev->idle_timeout = new; > + > + if (tb_dev->dim_to_is_calc && tb_dev->idle_timeout > 0) > + tb_dev->dim_timeout = new - min(APPLETB_MAX_DIM_TIME, new / 3); > + else if (tb_dev->dim_to_is_calc) > + tb_dev->dim_timeout = -1; > +} > + > +static ssize_t idle_timeout_show(struct device *dev, > + struct device_attribute *attr, char *buf) > +{ > + struct appletb_device *tb_dev = dev_get_drvdata(dev); > + > + return snprintf(buf, PAGE_SIZE, "%d\n", tb_dev->idle_timeout); > +} > + > +static ssize_t idle_timeout_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, size_t size) > +{ > + struct appletb_device *tb_dev = dev_get_drvdata(dev); > + long new; > + int rc; > + > + rc = kstrtol(buf, 0, &new); > + if (rc || new > INT_MAX || new < -2) > + return -EINVAL; > + > + appletb_set_idle_timeout(tb_dev, new); > + appletb_update_touchbar(tb_dev, true); > + > + return size; > +} > + > +static void appletb_set_dim_timeout(struct appletb_device *tb_dev, int new) > +{ > + if (new == -2) { > + tb_dev->dim_to_is_calc = true; > + appletb_set_idle_timeout(tb_dev, tb_dev->idle_timeout); > + } else { > + tb_dev->dim_to_is_calc = false; > + tb_dev->dim_timeout = new; > + } > +} > + > +static ssize_t dim_timeout_show(struct device *dev, > + struct device_attribute *attr, char *buf) > +{ > + struct appletb_device *tb_dev = dev_get_drvdata(dev); > + > + return snprintf(buf, PAGE_SIZE, "%d\n", > + tb_dev->dim_to_is_calc ? -2 : tb_dev->dim_timeout); > +} > + > +static ssize_t dim_timeout_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, size_t size) > +{ > + struct appletb_device *tb_dev = dev_get_drvdata(dev); > + long new; > + int rc; > + > + rc = kstrtol(buf, 0, &new); > + if (rc || new > INT_MAX || new < -2) > + return -EINVAL; > + > + appletb_set_dim_timeout(tb_dev, new); > + appletb_update_touchbar(tb_dev, true); > + > + return size; > +} > + > +static ssize_t fnmode_show(struct device *dev, struct device_attribute *attr, > + char *buf) > +{ > + struct appletb_device *tb_dev = dev_get_drvdata(dev); > + > + return snprintf(buf, PAGE_SIZE, "%d\n", tb_dev->fn_mode); > +} > + > +static ssize_t fnmode_store(struct device *dev, struct device_attribute *attr, > + const char *buf, size_t size) > +{ > + struct appletb_device *tb_dev = dev_get_drvdata(dev); > + long new; > + int rc; > + > + rc = kstrtol(buf, 0, &new); > + if (rc || new > APPLETB_FN_MODE_MAX || new < 0) > + return -EINVAL; > + > + tb_dev->fn_mode = new; > + appletb_update_touchbar(tb_dev, false); > + > + return size; > +} > + > +static int appletb_tb_key_to_slot(unsigned int code) > +{ > + switch (code) { > + case KEY_ESC: > + return 0; > + case KEY_F1: > + case KEY_F2: > + case KEY_F3: > + case KEY_F4: > + case KEY_F5: > + case KEY_F6: > + case KEY_F7: > + case KEY_F8: > + case KEY_F9: > + case KEY_F10: > + return code - KEY_F1 + 1; > + case KEY_F11: > + case KEY_F12: > + return code - KEY_F11 + 11; > + default: > + return -1; > + } > +} > + > +static int appletb_hid_event(struct hid_device *hdev, struct hid_field *field, > + struct hid_usage *usage, __s32 value) > +{ > + struct appletb_device *tb_dev = hid_get_drvdata(hdev); > + unsigned int new_code = 0; > + unsigned long flags; > + bool send_dummy = false; > + bool send_trnsl = false; > + int slot; > + int rc = 0; > + > + if ((usage->hid & HID_USAGE_PAGE) != HID_UP_KEYBOARD || > + usage->type != EV_KEY) > + return 0; > + > + /* > + * 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; > + > + spin_lock_irqsave(&tb_dev->tb_lock, flags); > + > + if (!tb_dev->active) { > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > + return 0; > + } > + > + new_code = appletb_fn_to_special(usage->code); > + > + if (value != 2) > + tb_dev->last_tb_keys_pressed[slot] = value; > + > + tb_dev->last_event_time = ktime_get(); > + > + appletb_update_touchbar_no_lock(tb_dev, false); > + > + /* > + * We want to suppress touch bar keys while the touch bar is off, but > + * we do want to wake up the screen if it's asleep, so generate a dummy > + * event in that case. > + */ > + if (tb_dev->cur_tb_mode == APPLETB_CMD_MODE_OFF || > + tb_dev->cur_tb_disp == APPLETB_CMD_DISP_OFF) { > + send_dummy = true; > + rc = 1; > + /* translate special keys */ > + } else if (new_code && > + ((value > 0 && > + appletb_get_cur_tb_mode(tb_dev) == APPLETB_CMD_MODE_SPCL) > + || > + (value == 0 && tb_dev->last_tb_keys_translated[slot]))) { > + tb_dev->last_tb_keys_translated[slot] = true; > + send_trnsl = true; > + rc = 1; > + /* everything else handled normally */ > + } else { > + tb_dev->last_tb_keys_translated[slot] = false; > + } > + > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > + > + /* > + * Need to send these input events outside of the lock, as otherwise > + * we can run into the following deadlock: > + * Task 1 Task 2 > + * appletb_hid_event() input_event() > + * acquire tb_lock acquire dev->event_lock > + * input_event() appletb_inp_event() > + * acquire dev->event_lock acquire tb_lock > + */ > + if (send_dummy) { > + input_event(field->hidinput->input, EV_KEY, KEY_UNKNOWN, 1); > + input_event(field->hidinput->input, EV_KEY, KEY_UNKNOWN, 0); > + } else if (send_trnsl) { > + input_event(field->hidinput->input, usage->type, new_code, > + value); > + } > + > + return rc; > +} > + > +static void appletb_inp_event(struct input_handle *handle, unsigned int type, > + unsigned int code, int value) > +{ > + struct appletb_device *tb_dev = handle->private; > + unsigned long flags; > + > + spin_lock_irqsave(&tb_dev->tb_lock, flags); > + > + if (!tb_dev->active) { > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > + return; > + } > + > + if (type == EV_KEY && code == KEY_FN && value != 2) > + tb_dev->last_fn_pressed = value; > + > + tb_dev->last_event_time = ktime_get(); > + > + appletb_update_touchbar_no_lock(tb_dev, false); > + > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > +} > + > +/* Find and save the usb-device associated with the touch bar input device */ > +static struct usb_interface *appletb_get_usb_iface(struct hid_device *hdev) > +{ > + struct device *dev = &hdev->dev; > + > + while (dev && !(dev->type && dev->type->name && > + !strcmp(dev->type->name, "usb_interface"))) Check with is_usb_interface(dev) > + dev = dev->parent; > + > + return dev ? to_usb_interface(dev) : NULL; > +} > + > +static int appletb_inp_connect(struct input_handler *handler, > + struct input_dev *dev, > + const struct input_device_id *id) > +{ > + struct appletb_device *tb_dev = handler->private; > + struct input_handle *handle; > + int rc; > + > + if (id->driver_info == APPLETB_DEVID_KEYBOARD) { > + handle = &tb_dev->kbd_handle; > + handle->name = "tbkbd"; > + } else if (id->driver_info == APPLETB_DEVID_TOUCHPAD) { > + handle = &tb_dev->tpd_handle; > + handle->name = "tbtpad"; > + } else { > + dev_err(tb_dev->log_dev, "Unknown device id (%lu)\n", > + id->driver_info); > + return -ENOENT; > + } > + > + if (handle->dev) { > + dev_err(tb_dev->log_dev, > + "Duplicate connect to %s input device\n", handle->name); > + return -EEXIST; > + } > + > + handle->open = 0; > + handle->dev = input_get_device(dev); > + handle->handler = handler; > + handle->private = tb_dev; > + > + rc = input_register_handle(handle); > + if (rc) > + goto err_free_dev; > + > + rc = input_open_device(handle); > + if (rc) > + goto err_unregister_handle; > + > + dev_dbg(tb_dev->log_dev, "Connected to %s input device\n", > + handle == &tb_dev->kbd_handle ? "keyboard" : "touchpad"); > + > + return 0; > + > + err_unregister_handle: > + input_unregister_handle(handle); > + err_free_dev: > + input_put_device(handle->dev); > + handle->dev = NULL; > + return rc; > +} > + > +static void appletb_inp_disconnect(struct input_handle *handle) > +{ > + struct appletb_device *tb_dev = handle->private; > + > + input_close_device(handle); > + input_unregister_handle(handle); > + > + dev_dbg(tb_dev->log_dev, "Disconnected from %s input device\n", > + handle == &tb_dev->kbd_handle ? "keyboard" : "touchpad"); > + > + input_put_device(handle->dev); > + handle->dev = NULL; > +} > + > +static int appletb_input_configured(struct hid_device *hdev, > + struct hid_input *hidinput) > +{ > + int idx; > + 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 our actual capabilities */ > + __set_bit(EV_KEY, input->evbit); > + __set_bit(EV_REP, input->evbit); > + __set_bit(EV_MSC, input->evbit); /* hid-input generates MSC_SCAN */ > + > + for (idx = 0; idx < ARRAY_SIZE(appletb_fn_codes); idx++) { > + input_set_capability(input, EV_KEY, appletb_fn_codes[idx].from); > + input_set_capability(input, EV_KEY, appletb_fn_codes[idx].to); > + } > + > + input_set_capability(input, EV_KEY, KEY_ESC); > + input_set_capability(input, EV_KEY, KEY_UNKNOWN); > + > + return 0; > +} > + > +static struct appletb_iface_info * > +appletb_get_iface_info(struct appletb_device *tb_dev, struct hid_device *hdev) > +{ > + if (hdev == tb_dev->mode_iface.hdev) > + return &tb_dev->mode_iface; > + if (hdev == tb_dev->disp_iface.hdev) > + return &tb_dev->disp_iface; > + return NULL; > +} > + > +/** > + * appletb_find_report_field() - Find the field in the report with the given > + * usage. > + * @report: the report to search > + * @field_usage: the usage of the field to search for > + * > + * Returns: the hid field if found, or NULL if none found. > + */ > +static struct hid_field *appletb_find_report_field(struct hid_report *report, > + unsigned int field_usage) > +{ > + int f, u; > + > + for (f = 0; f < report->maxfield; f++) { > + struct hid_field *field = report->field[f]; > + > + if (field->logical == field_usage) > + return field; > + > + for (u = 0; u < field->maxusage; u++) { > + if (field->usage[u].hid == field_usage) > + return field; > + } > + } > + > + return NULL; > +} > + > +/** > + * appletb_find_hid_field() - Search all the reports of the device for the > + * field with the given usage. > + * @hdev: the device whose reports to search > + * @application: the usage of application collection that the field must > + * belong to > + * @field_usage: the usage of the field to search for > + * > + * Returns: the hid field if found, or NULL if none found. > + */ > +static struct hid_field *appletb_find_hid_field(struct hid_device *hdev, > + unsigned int application, > + unsigned int field_usage) > +{ > + static const int report_types[] = { HID_INPUT_REPORT, HID_OUTPUT_REPORT, > + HID_FEATURE_REPORT }; > + struct hid_report *report; > + struct hid_field *field; > + int t; > + > + for (t = 0; t < ARRAY_SIZE(report_types); t++) { > + struct list_head *report_list = > + &hdev->report_enum[report_types[t]].report_list; > + list_for_each_entry(report, report_list, list) { > + if (report->application != application) > + continue; > + > + field = appletb_find_report_field(report, field_usage); > + if (field) > + return field; > + } > + } > + > + return NULL; > +} > + > +static int appletb_extract_report_and_iface_info(struct appletb_device *tb_dev, > + struct hid_device *hdev, > + const struct hid_device_id *id) > +{ > + struct appletb_iface_info *iface_info; > + struct usb_interface *usb_iface; > + struct hid_field *field; > + > + field = appletb_find_hid_field(hdev, HID_GD_KEYBOARD, HID_USAGE_MODE); > + if (field) { > + iface_info = &tb_dev->mode_iface; > + tb_dev->mode_field = field; > + tb_dev->is_t1 = !!(id->driver_data & APPLETB_FEATURE_IS_T1); > + } else { > + field = appletb_find_hid_field(hdev, HID_USAGE_APPLE_APP, > + HID_USAGE_DISP); > + if (!field) > + return 0; > + > + iface_info = &tb_dev->disp_iface; > + tb_dev->disp_field = field; > + tb_dev->disp_field_aux1 = > + appletb_find_hid_field(hdev, HID_USAGE_APPLE_APP, > + HID_USAGE_DISP_AUX1); > + > + if (!tb_dev->disp_field_aux1 || > + tb_dev->disp_field_aux1->report != > + tb_dev->disp_field->report) { > + dev_err(tb_dev->log_dev, > + "Unexpected report structure for report %u in device %s\n", > + tb_dev->disp_field->report->id, > + dev_name(&hdev->dev)); > + return -ENODEV; > + } > + } > + > + usb_iface = appletb_get_usb_iface(hdev); > + if (!usb_iface) { > + dev_err(tb_dev->log_dev, > + "Failed to find usb interface for hid device %s\n", > + dev_name(&hdev->dev)); > + return -ENODEV; > + } > + > + iface_info->hdev = hdev; > + iface_info->usb_iface = usb_get_intf(usb_iface); > + iface_info->suspended = false; > + > + return 1; > +} > + > +static void appletb_clear_iface_info(struct appletb_device *tb_dev, > + struct hid_device *hdev) > +{ > + struct appletb_iface_info *iface_info; > + > + iface_info = appletb_get_iface_info(tb_dev, hdev); > + if (iface_info) { > + usb_put_intf(iface_info->usb_iface); > + iface_info->usb_iface = NULL; > + iface_info->hdev = NULL; > + } > +} > + > +static bool appletb_test_and_mark_active(struct appletb_device *tb_dev) > +{ > + unsigned long flags; > + bool activated = false; > + > + spin_lock_irqsave(&tb_dev->tb_lock, flags); > + > + if (tb_dev->mode_iface.hdev && tb_dev->disp_iface.hdev && > + !tb_dev->active) { > + tb_dev->active = true; > + activated = true; > + } > + > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > + > + return activated; > +} > + > +static bool appletb_test_and_mark_inactive(struct appletb_device *tb_dev, > + struct hid_device *hdev) > +{ > + unsigned long flags; > + bool deactivated = false; > + > + spin_lock_irqsave(&tb_dev->tb_lock, flags); > + > + if (tb_dev->mode_iface.hdev && tb_dev->disp_iface.hdev && > + tb_dev->active && > + (hdev == tb_dev->mode_iface.hdev || > + hdev == tb_dev->disp_iface.hdev)) { > + tb_dev->active = false; > + deactivated = true; > + } > + > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > + > + return deactivated; > +} > + > +static const struct input_device_id appletb_input_devices[] = { > + { > + .flags = INPUT_DEVICE_ID_MATCH_BUS | > + INPUT_DEVICE_ID_MATCH_KEYBIT, > + .bustype = BUS_SPI, > + .keybit = { [BIT_WORD(KEY_FN)] = BIT_MASK(KEY_FN) }, > + .driver_info = APPLETB_DEVID_KEYBOARD, > + }, /* Builtin SPI keyboard device */ > + { > + .flags = INPUT_DEVICE_ID_MATCH_BUS | > + INPUT_DEVICE_ID_MATCH_KEYBIT, > + .bustype = BUS_SPI, > + .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) }, > + .driver_info = APPLETB_DEVID_TOUCHPAD, > + }, /* Builtin SPI touchpad device */ > + { > + .flags = INPUT_DEVICE_ID_MATCH_BUS | > + INPUT_DEVICE_ID_MATCH_VENDOR | > + INPUT_DEVICE_ID_MATCH_KEYBIT, > + .bustype = BUS_USB, > + .vendor = 0x05ac /* USB_VENDOR_ID_APPLE */, > + .keybit = { [BIT_WORD(KEY_FN)] = BIT_MASK(KEY_FN) }, > + .driver_info = APPLETB_DEVID_KEYBOARD, > + }, /* Builtin USB keyboard device */ > + { > + .flags = INPUT_DEVICE_ID_MATCH_BUS | > + INPUT_DEVICE_ID_MATCH_VENDOR | > + INPUT_DEVICE_ID_MATCH_KEYBIT, > + .bustype = BUS_USB, > + .vendor = 0x05ac /* USB_VENDOR_ID_APPLE */, > + .keybit = { [BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH) }, > + .driver_info = APPLETB_DEVID_TOUCHPAD, > + }, /* Builtin USB touchpad device */ > + { }, /* Terminating zero entry */ > +}; > + > +static bool appletb_match_internal_device(struct input_handler *handler, > + struct input_dev *inp_dev) > +{ > + struct device *dev = &inp_dev->dev; > + > + if (inp_dev->id.bustype == BUS_SPI) > + return true; > + > + /* in kernel: dev && !is_usb_device(dev) */ > + while (dev && !(dev->type && dev->type->name && > + !strcmp(dev->type->name, "usb_device"))) > + dev = dev->parent; > + > + /* > + * Apple labels all their internal keyboards and trackpads as such, > + * instead of maintaining an ever expanding list of product-id's we > + * just look at the device's product name. > + */ > + if (dev) > + return !!strstr(to_usb_device(dev)->product, "Internal Keyboard"); > + > + return false; > +} > + > +static int appletb_probe(struct hid_device *hdev, > + const struct hid_device_id *id) > +{ > + struct appletb_device *tb_dev = appletb_dev; > + unsigned long flags; > + int rc; > + > + /* initialize the report info */ > + rc = hid_parse(hdev); > + if (rc) { > + dev_err(tb_dev->log_dev, "hid parse failed (%d)\n", rc); > + goto error; > + } > + > + /* Ensure this usb endpoint is for the touchbar backlight, not keyboard > + * backlight. > + */ > + if ((hdev->product == USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) && > + !(hdev->collection && hdev->collection[0].usage == > + HID_USAGE_APPLE_APP)) { > + return -ENODEV; > + } > + > + spin_lock_irqsave(&tb_dev->tb_lock, flags); > + > + if (!tb_dev->log_dev) > + tb_dev->log_dev = &hdev->dev; > + > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > + > + hid_set_drvdata(hdev, tb_dev); > + > + rc = appletb_extract_report_and_iface_info(tb_dev, hdev, id); > + if (rc < 0) > + goto error; > + > + rc = hid_hw_start(hdev, HID_CONNECT_DRIVER | HID_CONNECT_HIDINPUT); > + if (rc) { > + dev_err(tb_dev->log_dev, "hw start failed (%d)\n", rc); > + goto clear_iface_info; > + } > + > + rc = hid_hw_open(hdev); > + if (rc) { > + dev_err(tb_dev->log_dev, "hw open failed (%d)\n", rc); > + goto stop_hid; > + } > + > + /* do setup if we have both interfaces */ > + if (appletb_test_and_mark_active(tb_dev)) { > + /* initialize the touch bar */ > + if (appletb_tb_def_fn_mode >= 0 && > + appletb_tb_def_fn_mode <= APPLETB_FN_MODE_MAX) > + tb_dev->fn_mode = appletb_tb_def_fn_mode; > + else > + tb_dev->fn_mode = APPLETB_FN_MODE_NORM; > + appletb_set_idle_timeout(tb_dev, appletb_tb_def_idle_timeout); > + appletb_set_dim_timeout(tb_dev, appletb_tb_def_dim_timeout); > + tb_dev->last_event_time = ktime_get(); > + > + tb_dev->pnd_tb_mode = APPLETB_CMD_MODE_UPD; > + tb_dev->pnd_tb_disp = APPLETB_CMD_DISP_UPD; > + > + appletb_update_touchbar(tb_dev, false); > + > + /* set up the input handler */ > + tb_dev->inp_handler.event = appletb_inp_event; > + tb_dev->inp_handler.connect = appletb_inp_connect; > + tb_dev->inp_handler.disconnect = appletb_inp_disconnect; > + tb_dev->inp_handler.name = "appletb"; > + tb_dev->inp_handler.id_table = appletb_input_devices; > + tb_dev->inp_handler.match = appletb_match_internal_device; > + tb_dev->inp_handler.private = tb_dev; > + > + rc = input_register_handler(&tb_dev->inp_handler); > + if (rc) { > + dev_err(tb_dev->log_dev, > + "Unable to register keyboard handler (%d)\n", > + rc); > + goto mark_inactive; > + } > + > + /* initialize sysfs attributes */ > + rc = sysfs_create_group(&tb_dev->mode_iface.hdev->dev.kobj, > + &appletb_attr_group); > + if (rc) { > + dev_err(tb_dev->log_dev, > + "Failed to create sysfs attributes (%d)\n", rc); > + goto unreg_handler; > + } > + > + dev_dbg(tb_dev->log_dev, "Touchbar activated\n"); > + } > + > + return 0; > + > +unreg_handler: > + input_unregister_handler(&tb_dev->inp_handler); > +mark_inactive: > + appletb_test_and_mark_inactive(tb_dev, hdev); > + cancel_delayed_work_sync(&tb_dev->tb_work); > + hid_hw_close(hdev); > +stop_hid: > + hid_hw_stop(hdev); > +clear_iface_info: > + appletb_clear_iface_info(tb_dev, hdev); > +error: > + return rc; > +} > + > +static void appletb_remove(struct hid_device *hdev) > +{ > + struct appletb_device *tb_dev = hid_get_drvdata(hdev); > + unsigned long flags; > + > + if (appletb_test_and_mark_inactive(tb_dev, hdev)) { > + sysfs_remove_group(&tb_dev->mode_iface.hdev->dev.kobj, > + &appletb_attr_group); > + > + input_unregister_handler(&tb_dev->inp_handler); > + > + cancel_delayed_work_sync(&tb_dev->tb_work); > + appletb_set_tb_mode(tb_dev, APPLETB_CMD_MODE_OFF); > + appletb_set_tb_disp(tb_dev, APPLETB_CMD_DISP_ON); > + > + if (tb_dev->tb_autopm_off) > + hid_hw_power(tb_dev->disp_iface.hdev, PM_HINT_NORMAL); > + > + dev_info(tb_dev->log_dev, "Touchbar deactivated\n"); > + } > + > + hid_hw_close(hdev); > + hid_hw_stop(hdev); > + appletb_clear_iface_info(tb_dev, hdev); > + > + spin_lock_irqsave(&tb_dev->tb_lock, flags); > + > + if (tb_dev->log_dev == &hdev->dev) { > + if (tb_dev->mode_iface.hdev) > + tb_dev->log_dev = &tb_dev->mode_iface.hdev->dev; > + else if (tb_dev->disp_iface.hdev) > + tb_dev->log_dev = &tb_dev->disp_iface.hdev->dev; > + else > + tb_dev->log_dev = NULL; > + } > + > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > +} > + > +#ifdef CONFIG_PM > +static int appletb_suspend(struct hid_device *hdev, pm_message_t message) > +{ > + struct appletb_device *tb_dev = hid_get_drvdata(hdev); > + struct appletb_iface_info *iface_info; > + unsigned long flags; > + bool all_suspended = false; > + > + if (message.event != PM_EVENT_SUSPEND && > + message.event != PM_EVENT_FREEZE) > + return 0; > + > + if (tb_dev->is_t1) { > + > + /* > + * Wait for both interfaces to be suspended and no more async work > + * in progress. > + */ > + > + spin_lock_irqsave(&tb_dev->tb_lock, flags); > + > + if (!tb_dev->mode_iface.suspended && !tb_dev->disp_iface.suspended) { > + tb_dev->active = false; > + cancel_delayed_work(&tb_dev->tb_work); > + } > + > + iface_info = appletb_get_iface_info(tb_dev, hdev); > + if (iface_info) > + iface_info->suspended = true; > + > + if ((!tb_dev->mode_iface.hdev || tb_dev->mode_iface.suspended) && > + (!tb_dev->disp_iface.hdev || tb_dev->disp_iface.suspended)) > + all_suspended = true; > + > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > + > + flush_delayed_work(&tb_dev->tb_work); > + > + if (!all_suspended) > + return 0; > + > + /* > + * The touch bar device itself remembers the last state when suspended > + * in some cases, but in others (e.g. when mode != off and disp == off) > + * it resumes with a different state; furthermore it may be only > + * partially responsive in that state. By turning both mode and disp > + * off we ensure it is in a good state when resuming (and this happens > + * to be the same state after booting/resuming-from-hibernate, so less > + * special casing between the two). > + */ > + if (message.event == PM_EVENT_SUSPEND) { > + appletb_set_tb_mode(tb_dev, APPLETB_CMD_MODE_OFF); > + appletb_set_tb_disp(tb_dev, APPLETB_CMD_DISP_OFF); > + } > + > + spin_lock_irqsave(&tb_dev->tb_lock, flags); > + > + tb_dev->cur_tb_mode = APPLETB_CMD_MODE_OFF; > + tb_dev->cur_tb_disp = APPLETB_CMD_DISP_OFF; > + > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > + > + dev_info(tb_dev->log_dev, "Touchbar suspended.\n"); > + } else { > + dev_info(tb_dev->log_dev, "T2 Mac detected, not handling suspend.\n"); > + } > + > + return 0; > +} > + > +static int appletb_reset_resume(struct hid_device *hdev) > +{ > + struct appletb_device *tb_dev = hid_get_drvdata(hdev); > + struct appletb_iface_info *iface_info; > + unsigned long flags; > + > + spin_lock_irqsave(&tb_dev->tb_lock, flags); > + > + iface_info = appletb_get_iface_info(tb_dev, hdev); > + if (iface_info) > + iface_info->suspended = false; > + > + if ((tb_dev->mode_iface.hdev && !tb_dev->mode_iface.suspended) && > + (tb_dev->disp_iface.hdev && !tb_dev->disp_iface.suspended)) { > + /* > + * Restore touch bar state. Note that autopm state is not > + * preserved, so need explicitly restore that here. > + */ > + tb_dev->active = true; > + tb_dev->restore_autopm = true; > + tb_dev->last_event_time = ktime_get(); > + > + appletb_update_touchbar_no_lock(tb_dev, true); > + > + dev_info(tb_dev->log_dev, "Touchbar resumed.\n"); > + } > + > + spin_unlock_irqrestore(&tb_dev->tb_lock, flags); > + > + return 0; > +} > +#endif > + > +static struct appletb_device *appletb_alloc_device(void) > +{ > + struct appletb_device *tb_dev; > + > + tb_dev = kzalloc(sizeof(*tb_dev), GFP_KERNEL); > + if (!tb_dev) > + return NULL; > + > + spin_lock_init(&tb_dev->tb_lock); > + INIT_DELAYED_WORK(&tb_dev->tb_work, appletb_set_tb_worker); > + > + return tb_dev; > +} > + > +static void appletb_free_device(struct appletb_device *tb_dev) > +{ > + cancel_delayed_work_sync(&tb_dev->tb_work); > + kfree(tb_dev); > +} > + > +static const struct hid_device_id appletb_hid_ids[] = { > + /* MacBook Pro's 2016, 2017, with T1 chip */ > + { HID_USB_DEVICE(USB_VENDOR_ID_LINUX_FOUNDATION, > + USB_DEVICE_ID_IBRIDGE_TB), > + .driver_data = APPLETB_FEATURE_IS_T1 }, > + /* MacBook Pro's 2018, 2019, with T2 chip: iBridge DFR brightness */ > + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, > + USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, > + /* MacBook Pro's 2018, 2019, with T2 chip: iBridge Display */ > + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, > + USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY) }, > + { }, Also no comma here > +}; > + > +MODULE_DEVICE_TABLE(hid, appletb_hid_ids); > + > +static struct hid_driver appletb_hid_driver = { > + .name = "apple-touchbar", > + .id_table = appletb_hid_ids, > + .probe = appletb_probe, > + .remove = appletb_remove, > + .event = appletb_hid_event, > + .input_configured = appletb_input_configured, > +#ifdef CONFIG_PM > + .suspend = appletb_suspend, > + .reset_resume = appletb_reset_resume, > +#endif > +}; > + > +static int __init appletb_init(void) > +{ > + struct appletb_device *tb_dev; > + int rc; > + > + tb_dev = appletb_alloc_device(); > + if (!tb_dev) > + return -ENOMEM; > + > + appletb_dev = tb_dev; > + > + rc = hid_register_driver(&appletb_hid_driver); > + if (rc) > + goto error; > + > + return 0; > + > +error: > + appletb_free_device(tb_dev); > + return rc; > +} > + > +static void __exit appletb_exit(void) > +{ > + hid_unregister_driver(&appletb_hid_driver); > + appletb_free_device(appletb_dev); > +} You can remove the need for the "static struct appletb_device *appletb_dev" by allocating it from the HID drivers probe function and freeing it from the remove function. Then the whole setup can be removed and replaced by hid_module_driver(&appletb_hid_driver) > +module_init(appletb_init); > +module_exit(appletb_exit); > + > +MODULE_AUTHOR("Ronald Tschalär"); > +MODULE_DESCRIPTION("MacBookPro Touch Bar driver"); > +MODULE_LICENSE("GPL"); > diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c > index c03535c4b..e620190b5 100644 > --- a/drivers/hid/hid-quirks.c > +++ b/drivers/hid/hid-quirks.c > @@ -316,12 +316,14 @@ 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_BACKLIGHT) }, > - { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY) }, > #endif > #if IS_ENABLED(CONFIG_HID_APPLE_IBRIDGE) > { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IBRIDGE) }, > #endif > +#if IS_ENABLED(CONFIG_HID_APPLE_TOUCHBAR) > + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, > + { 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) }, > { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL2) }, > -- > 2.37.2 > ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 2/3] HID: apple-touchbar: Add driver for the Touch Bar on MacBook Pros 2023-02-10 3:44 ` [PATCH 2/3] HID: apple-touchbar: Add driver for the Touch Bar on MacBook Pros Aditya Garg 2023-02-10 3:45 ` [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards Aditya Garg 2023-02-10 16:13 ` [PATCH 2/3] HID: apple-touchbar: Add driver for the Touch Bar on MacBook Pros Thomas Weißschuh @ 2023-02-12 11:56 ` Andy Shevchenko 2 siblings, 0 replies; 32+ messages in thread From: Andy Shevchenko @ 2023-02-12 11:56 UTC (permalink / raw) To: Aditya Garg Cc: Jiri Kosina, jkosina, benjamin.tissoires, LKML, linux-input, ronald, kekrby, Orlando Chamberlain On Fri, Feb 10, 2023 at 03:44:26AM +0000, Aditya Garg wrote: > From: Ronald Tschalär <ronald@innovation.ch> > > This driver enables basic touch bar functionality: enabling it, switching > between modes on FN key press, and dimming and turning the display > off/on when idle/active. ... > Signed-off-by: Ronald Tschalär <ronald@innovation.ch> > [Kerem Karabay: use USB product IDs from hid-ids.h] > [Kerem Karabay: use hid_hw_raw_request except when setting the touchbar mode on T1 Macs] > [Kerem Karabay: update Kconfig description] > Signed-off-by: Kerem Karabay <kekrby@gmail.com> > [Orlando Chamberlain: add usage check to not bind to keyboard backlight interface] > Signed-off-by: Orlando Chamberlain <orlandoch.dev@gmail.com> > [Aditya Garg: check if apple-touchbar is enabled in the special driver list] > [Aditya Garg: fix suspend on T2 Macs] Are you going to use this as a changelog? Not okay for a list of changes. Consider Co-developed-by and proper Changelog in the cover letter. > Signed-off-by: Aditya Garg <gargaditya08@live.com> ... > +config HID_APPLE_TOUCHBAR > + tristate "Apple Touch Bar" > + depends on USB_HID > + help > + Say Y here if you want support for the Touch Bar on x86 > + MacBook Pros. > + > + To compile this driver as a module, choose M here: the > + module will be called apple-touchbar. Wrong indentation for the help description. Missing two spaces. ... > +#define dev_fmt(fmt) "tb: " fmt Do we really need this? ... > +static ssize_t idle_timeout_show(struct device *dev, > + struct device_attribute *attr, char *buf); > +static ssize_t idle_timeout_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, size_t size); > +static ssize_t dim_timeout_show(struct device *dev, > + struct device_attribute *attr, char *buf); > +static ssize_t dim_timeout_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, size_t size); > +static ssize_t fnmode_show(struct device *dev, struct device_attribute *attr, > + char *buf); > +static ssize_t fnmode_store(struct device *dev, struct device_attribute *attr, > + const char *buf, size_t size); Make sure you will have no unnecessary forward declarations. ... > +static struct attribute *appletb_attrs[] = { > + &dev_attr_idle_timeout.attr, > + &dev_attr_dim_timeout.attr, > + &dev_attr_fnmode.attr, > + NULL, No comma for terminator entry. > +}; ... > +static struct appletb_device *appletb_dev; Why is it global? ... > +static bool appletb_disable_autopm(struct hid_device *hdev) > +{ > + int rc; > + > + rc = hid_hw_power(hdev, PM_HINT_FULLON); > + Redundant blank line and see below. > + if (rc == 0) > + return true; > + > + hid_err(hdev, > + "Failed to disable auto-pm on touch bar device (%d)\n", rc); > + return false; if (rc) hid_err(...); return rc == 0; > +} ... > +static bool appletb_any_tb_key_pressed(struct appletb_device *tb_dev) > +{ > + return !!memchr_inv(tb_dev->last_tb_keys_pressed, 0, > + sizeof(tb_dev->last_tb_keys_pressed)); Sounds like last_tb_keys_pressed should be declared as a bitmap and hence return !bitmap_empty(...); > +} ... > +static ssize_t idle_timeout_show(struct device *dev, > + struct device_attribute *attr, char *buf) > +{ > + struct appletb_device *tb_dev = dev_get_drvdata(dev); > + > + return snprintf(buf, PAGE_SIZE, "%d\n", tb_dev->idle_timeout); sysfs_emit(). > +} ... > +static ssize_t idle_timeout_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, size_t size) > +{ > + struct appletb_device *tb_dev = dev_get_drvdata(dev); > + long new; > + int rc; > + > + rc = kstrtol(buf, 0, &new); > + if (rc || new > INT_MAX || new < -2) > + return -EINVAL; Do not shadow the error code. if (rc) return rc; Why do you use INT_MAX check with to-long conversion instead of simply calling kstrtoint()? > + appletb_set_idle_timeout(tb_dev, new); > + appletb_update_touchbar(tb_dev, true); > + > + return size; > +} ... > +static ssize_t dim_timeout_show(struct device *dev, > + struct device_attribute *attr, char *buf) > +{ > + struct appletb_device *tb_dev = dev_get_drvdata(dev); > + > + return snprintf(buf, PAGE_SIZE, "%d\n", > + tb_dev->dim_to_is_calc ? -2 : tb_dev->dim_timeout); sysfs_emit() > +} > + > +static ssize_t dim_timeout_store(struct device *dev, > + struct device_attribute *attr, > + const char *buf, size_t size) > +{ As per above. > +} > + > +static ssize_t fnmode_show(struct device *dev, struct device_attribute *attr, > + char *buf) > +{ As per above. > +} > + > +static ssize_t fnmode_store(struct device *dev, struct device_attribute *attr, > + const char *buf, size_t size) > +{ As per above. > +} ... > +static int appletb_tb_key_to_slot(unsigned int code) > +{ > + switch (code) { > + case KEY_ESC: > + return 0; > + case KEY_F1: > + case KEY_F2: > + case KEY_F3: > + case KEY_F4: > + case KEY_F5: > + case KEY_F6: > + case KEY_F7: > + case KEY_F8: > + case KEY_F9: > + case KEY_F10: > + return code - KEY_F1 + 1; > + case KEY_F11: > + case KEY_F12: > + return code - KEY_F11 + 11; > + default: > + return -1; Use appropriate error code from errno.h. > + } > +} ... > + { }, /* Terminating zero entry */ No comma. ... > +static bool appletb_match_internal_device(struct input_handler *handler, > + struct input_dev *inp_dev) > +{ > + struct device *dev = &inp_dev->dev; > + > + if (inp_dev->id.bustype == BUS_SPI) > + return true; > + > + /* in kernel: dev && !is_usb_device(dev) */ > + while (dev && !(dev->type && dev->type->name && > + !strcmp(dev->type->name, "usb_device"))) > + dev = dev->parent; I believe we have some helpers to mach like this. > + /* > + * Apple labels all their internal keyboards and trackpads as such, > + * instead of maintaining an ever expanding list of product-id's we > + * just look at the device's product name. > + */ > + if (dev) > + return !!strstr(to_usb_device(dev)->product, "Internal Keyboard"); > + > + return false; > +} ... > +static int appletb_probe(struct hid_device *hdev, > + const struct hid_device_id *id) Can be a single line. ... > + rc = hid_parse(hdev); > + if (rc) { > + dev_err(tb_dev->log_dev, "hid parse failed (%d)\n", rc); > + goto error; return dev_err_probe(...); (error label seems useless) > + } ... > + if ((hdev->product == USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) && > + !(hdev->collection && hdev->collection[0].usage == > + HID_USAGE_APPLE_APP)) { Broken indentation. > + return -ENODEV; > + } ... > + if (rc) { > + dev_err(tb_dev->log_dev, "hw start failed (%d)\n", rc); dev_err_probe() It will unite the style of error messaging. > + goto clear_iface_info; > + } > + rc = hid_hw_open(hdev); > + if (rc) { > + dev_err(tb_dev->log_dev, "hw open failed (%d)\n", rc); Ditto. And so on. > + goto stop_hid; > + } ... > + /* initialize sysfs attributes */ > + rc = sysfs_create_group(&tb_dev->mode_iface.hdev->dev.kobj, > + &appletb_attr_group); > + if (rc) { > + dev_err(tb_dev->log_dev, > + "Failed to create sysfs attributes (%d)\n", rc); > + goto unreg_handler; > + } Can't you use .dev_groups? > + } ... > + /* MacBook Pro's 2018, 2019, with T2 chip: iBridge Display */ > + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, > + USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY) }, > + { }, No comma. ... > + Redundant blank line. > +MODULE_DEVICE_TABLE(hid, appletb_hid_ids); ... > +#ifdef CONFIG_PM > + .suspend = appletb_suspend, > + .reset_resume = appletb_reset_resume, > +#endif Why not using .driver.pm ? ... > +module_init(appletb_init); > +module_exit(appletb_exit); Just move them closer to the implementation. -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip. 2023-02-10 3:43 ` [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip Aditya Garg 2023-02-10 3:44 ` [PATCH 2/3] HID: apple-touchbar: Add driver for the Touch Bar on MacBook Pros Aditya Garg @ 2023-02-10 4:56 ` Thomas Weißschuh 2023-02-10 8:30 ` Aditya Garg 2023-02-10 12:05 ` Aditya Garg 2023-02-12 11:35 ` Andy Shevchenko 2 siblings, 2 replies; 32+ messages in thread From: Thomas Weißschuh @ 2023-02-10 4:56 UTC (permalink / raw) To: Aditya Garg Cc: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain Hi, some comments inline. On Fri, Feb 10, 2023 at 03:43:24AM +0000, Aditya Garg wrote: > From: Ronald Tschalär <ronald@innovation.ch> > > The iBridge device provides access to several devices, including: > - the Touch Bar > - the iSight webcam > - the light sensor > - the fingerprint sensor > > This driver provides the core support for managing the iBridge device > and the access to the underlying devices. In particular, the > functionality for the touch bar and light sensor is exposed via USB HID > interfaces, and on devices with the T1 chip one of the HID devices is > used for both functions. So this driver creates virtual HID devices, one > per top-level report collection on each HID device (for a total of 3 > virtual HID devices). The sub-drivers then bind to these virtual HID > devices. > > This way the Touch Bar and ALS drivers can be kept in their own modules, > while at the same time making them look very much like as if they were > connected to the real HID devices. And those drivers then work (mostly) > without further changes on MacBooks with the T2 chip that don't need > this driver. > > Signed-off-by: Ronald Tschalär <ronald@innovation.ch> > [Kerem Karabay: convert to a platform driver] > [Kerem Karabay: fix appleib_forward_int_op] > [Kerem Karabay: rely on HID core's parsing in appleib_add_device] > Signed-off-by: Kerem Karabay <kekrby@gmail.com> > Signed-off-by: Aditya Garg <gargaditya08@live.com> > --- > drivers/hid/Kconfig | 15 + > drivers/hid/Makefile | 1 + > drivers/hid/apple-ibridge.c | 610 ++++++++++++++++++++++++++++++++++++ > drivers/hid/apple-ibridge.h | 15 + > drivers/hid/hid-ids.h | 1 + > drivers/hid/hid-quirks.c | 3 + > 6 files changed, 645 insertions(+) > create mode 100644 drivers/hid/apple-ibridge.c > create mode 100644 drivers/hid/apple-ibridge.h > > diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig > index e2a5d30c8..e69afa5f4 100644 > --- a/drivers/hid/Kconfig > +++ b/drivers/hid/Kconfig > @@ -130,6 +130,21 @@ config HID_APPLE > Say Y here if you want support for keyboards of Apple iBooks, PowerBooks, > MacBooks, MacBook Pros and Apple Aluminum. > > +config HID_APPLE_IBRIDGE > + tristate "Apple iBridge" > + depends on USB_HID > + depends on (X86 && ACPI) || COMPILE_TEST > + imply HID_SENSOR_HUB > + imply HID_SENSOR_ALS > + help > + This module provides the core support for the Apple T1 chip found > + on 2016 and 2017 MacBookPro's, also known as the iBridge. The drivers > + for the Touch Bar (apple-touchbar) and light sensor (hid-sensor-hub > + and hid-sensor-als) need to be enabled separately. > + > + To compile this driver as a module, choose M here: the > + module will be called apple-ibridge. > + > config HID_APPLEIR > tristate "Apple infrared receiver" > depends on (USB_HID) > diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile > index e8014c1a2..b61373cd8 100644 > --- a/drivers/hid/Makefile > +++ b/drivers/hid/Makefile > @@ -26,6 +26,7 @@ obj-$(CONFIG_HID_ACCUTOUCH) += hid-accutouch.o > obj-$(CONFIG_HID_ALPS) += hid-alps.o > obj-$(CONFIG_HID_ACRUX) += hid-axff.o > obj-$(CONFIG_HID_APPLE) += hid-apple.o > +obj-$(CONFIG_HID_APPLE_IBRIDGE) += apple-ibridge.o > obj-$(CONFIG_HID_APPLEIR) += hid-appleir.o > obj-$(CONFIG_HID_CREATIVE_SB0540) += hid-creative-sb0540.o > obj-$(CONFIG_HID_ASUS) += hid-asus.o > diff --git a/drivers/hid/apple-ibridge.c b/drivers/hid/apple-ibridge.c > new file mode 100644 > index 000000000..4d26f8d66 > --- /dev/null > +++ b/drivers/hid/apple-ibridge.c > @@ -0,0 +1,610 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Apple iBridge Driver > + * > + * Copyright (c) 2018 Ronald Tschalär > + */ > + > +/** > + * DOC: Overview > + * > + * 2016 and 2017 MacBookPro models with a Touch Bar (MacBookPro13,[23] and > + * MacBookPro14,[23]) have an Apple iBridge chip (also known as T1 chip) which > + * exposes the touch bar, built-in webcam (iSight), ambient light sensor, and > + * Secure Enclave Processor (SEP) for TouchID. It shows up in the system as a > + * USB device with 3 configurations: 'Default iBridge Interfaces', 'Default > + * iBridge Interfaces(OS X)', and 'Default iBridge Interfaces(Recovery)'. > + * > + * In the first (default after boot) configuration, 4 usb interfaces are > + * exposed: 2 related to the webcam, and 2 USB HID interfaces representing > + * the touch bar and the ambient light sensor. The webcam interfaces are > + * already handled by the uvcvideo driver. However, there is a problem with > + * the other two interfaces: one of them contains functionality (HID reports) > + * used by both the touch bar and the ALS, which is an issue because the kernel > + * allows only one driver to be attached to a given device. This driver exists > + * to solve this issue. > + * > + * This driver is implemented as a HID driver that attaches to both HID > + * interfaces and in turn creates several virtual child HID devices, one for > + * each top-level collection found in each interfaces report descriptor. The > + * touch bar and ALS drivers then attach to these virtual HID devices, and this > + * driver forwards the operations between the real and virtual devices. > + * > + * One important aspect of this approach is that resulting (virtual) HID > + * devices look much like the HID devices found on the later MacBookPro models > + * which have a T2 chip, where there are separate USB interfaces for the touch > + * bar and ALS functionality, which means that the touch bar and ALS drivers > + * work (mostly) the same on both types of models. > + * > + * Lastly, this driver also takes care of the power-management for the > + * iBridge when suspending and resuming. > + */ Maybe add a pr_fmt definition here? > + > +#include <linux/platform_device.h> > +#include <linux/acpi.h> > +#include <linux/device.h> > +#include <linux/hid.h> > +#include <linux/list.h> > +#include <linux/module.h> > +#include <linux/slab.h> > +#include <linux/usb.h> > + > +#include "hid-ids.h" > +#include "../hid/usbhid/usbhid.h" > +#include "apple-ibridge.h" > + > +#define APPLEIB_BASIC_CONFIG 1 > + > +static struct hid_device_id appleib_sub_hid_ids[] = { > + { HID_USB_DEVICE(USB_VENDOR_ID_LINUX_FOUNDATION, > + USB_DEVICE_ID_IBRIDGE_TB) }, > + { HID_USB_DEVICE(USB_VENDOR_ID_LINUX_FOUNDATION, > + USB_DEVICE_ID_IBRIDGE_ALS) }, > +}; Structs like this should be "const". > + > +static struct { > + unsigned int usage; > + struct hid_device_id *dev_id; > +} appleib_usage_map[] = { > + /* Default iBridge configuration, key inputs and mode settings */ > + { 0x00010006, &appleib_sub_hid_ids[0] }, > + /* OS X iBridge configuration, digitizer inputs */ > + { 0x000D0005, &appleib_sub_hid_ids[0] }, > + /* All iBridge configurations, display/DFR settings */ > + { 0xFF120001, &appleib_sub_hid_ids[0] }, > + /* All iBridge configurations, ALS */ > + { 0x00200041, &appleib_sub_hid_ids[1] }, > +}; const > + > +struct appleib_device { > + acpi_handle asoc_socw; > +}; > + > +struct appleib_hid_dev_info { > + struct hid_device *hdev; > + struct hid_device *sub_hdevs[ARRAY_SIZE(appleib_sub_hid_ids)]; > + bool sub_open[ARRAY_SIZE(appleib_sub_hid_ids)]; > +}; > + > +static int appleib_hid_raw_event(struct hid_device *hdev, > + struct hid_report *report, u8 *data, int size) > +{ > + struct appleib_hid_dev_info *hdev_info = hid_get_drvdata(hdev); > + int i; > + > + for (i = 0; i < ARRAY_SIZE(hdev_info->sub_hdevs); i++) { > + if (READ_ONCE(hdev_info->sub_open[i])) > + hid_input_report(hdev_info->sub_hdevs[i], report->type, > + data, size, 0); > + } > + > + return 0; > +} > + > +static __u8 *appleib_report_fixup(struct hid_device *hdev, __u8 *rdesc, > + unsigned int *rsize) > +{ > + /* Some fields have a size of 64 bits, which according to HID 1.11 > + * Section 8.4 is not valid ("An item field cannot span more than 4 > + * bytes in a report"). Furthermore, hid_field_extract() complains > + * when encountering such a field. So turn them into two 32-bit fields > + * instead. > + */ > + > + if (*rsize == 634 && > + /* Usage Page 0xff12 (vendor defined) */ > + rdesc[212] == 0x06 && rdesc[213] == 0x12 && rdesc[214] == 0xff && > + /* Usage 0x51 */ > + rdesc[416] == 0x09 && rdesc[417] == 0x51 && > + /* report size 64 */ > + rdesc[432] == 0x75 && rdesc[433] == 64 && > + /* report count 1 */ > + rdesc[434] == 0x95 && rdesc[435] == 1) { > + rdesc[433] = 32; > + rdesc[435] = 2; > + hid_dbg(hdev, "Fixed up first 64-bit field\n"); > + } > + > + if (*rsize == 634 && > + /* Usage Page 0xff12 (vendor defined) */ > + rdesc[212] == 0x06 && rdesc[213] == 0x12 && rdesc[214] == 0xff && > + /* Usage 0x51 */ > + rdesc[611] == 0x09 && rdesc[612] == 0x51 && > + /* report size 64 */ > + rdesc[627] == 0x75 && rdesc[628] == 64 && > + /* report count 1 */ > + rdesc[629] == 0x95 && rdesc[630] == 1) { > + rdesc[628] = 32; > + rdesc[630] = 2; > + hid_dbg(hdev, "Fixed up second 64-bit field\n"); > + } > + > + return rdesc; > +} > + > +#ifdef CONFIG_PM > +/** > + * appleib_forward_int_op() - Forward a hid-driver callback to all drivers on > + * all virtual HID devices attached to the given real HID device. > + * @hdev the real hid-device > + * @forward a function that calls the callback on the given driver > + * @args arguments for the forward function > + * > + * This is for callbacks that return a status as an int. > + * > + * Returns: 0 on success, or the first error returned by the @forward function. > + */ > +static int appleib_forward_int_op(struct hid_device *hdev, > + int (*forward)(struct hid_driver *, > + struct hid_device *, void *), > + void *args) > +{ > + struct appleib_hid_dev_info *hdev_info = hid_get_drvdata(hdev); > + struct hid_device *sub_hdev; > + int rc; > + int i; > + > + for (i = 0; i < ARRAY_SIZE(hdev_info->sub_hdevs); i++) { > + sub_hdev = hdev_info->sub_hdevs[i]; > + if (sub_hdev->driver) { > + rc = forward(sub_hdev->driver, sub_hdev, args); > + if (rc) > + return rc; > + } > + } > + > + return 0; > +} > + > +static int appleib_hid_suspend_fwd(struct hid_driver *drv, > + struct hid_device *hdev, void *args) > +{ > + int rc = 0; > + > + if (drv->suspend) > + rc = drv->suspend(hdev, *(pm_message_t *)args); > + > + return rc; > +} > + > +static int appleib_hid_suspend(struct hid_device *hdev, pm_message_t message) > +{ > + return appleib_forward_int_op(hdev, appleib_hid_suspend_fwd, &message); > +} > + > +static int appleib_hid_resume_fwd(struct hid_driver *drv, > + struct hid_device *hdev, void *args) > +{ > + int rc = 0; > + > + if (drv->resume) > + rc = drv->resume(hdev); > + > + return rc; > +} > + > +static int appleib_hid_resume(struct hid_device *hdev) > +{ > + return appleib_forward_int_op(hdev, appleib_hid_resume_fwd, NULL); > +} > + > +static int appleib_hid_reset_resume_fwd(struct hid_driver *drv, > + struct hid_device *hdev, void *args) > +{ > + int rc = 0; > + > + if (drv->reset_resume) > + rc = drv->reset_resume(hdev); > + > + return rc; > +} > + > +static int appleib_hid_reset_resume(struct hid_device *hdev) > +{ > + return appleib_forward_int_op(hdev, appleib_hid_reset_resume_fwd, NULL); > +} > +#endif /* CONFIG_PM */ > + > +static int appleib_ll_start(struct hid_device *hdev) > +{ > + return 0; > +} > + > +static void appleib_ll_stop(struct hid_device *hdev) > +{ > +} > + > +static int appleib_set_open(struct hid_device *hdev, bool open) > +{ > + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; > + int i; > + > + for (i = 0; i < ARRAY_SIZE(hdev_info->sub_hdevs); i++) { > + /* > + * hid_hw_open(), and hence appleib_ll_open(), is called > + * from the driver's probe function, which in turn is called > + * while adding the sub-hdev; but at this point we haven't yet > + * added the sub-hdev to our list. So if we don't find the > + * sub-hdev in our list assume it's in the process of being > + * added and set the flag on the first unset sub-hdev. > + */ > + if (hdev_info->sub_hdevs[i] == hdev || > + !hdev_info->sub_hdevs[i]) { > + WRITE_ONCE(hdev_info->sub_open[i], open); > + return 0; > + } > + } > + > + return -ENODEV; > +} > + > +static int appleib_ll_open(struct hid_device *hdev) > +{ > + return appleib_set_open(hdev, true); > +} > + > +static void appleib_ll_close(struct hid_device *hdev) > +{ > + appleib_set_open(hdev, false); > +} > + > +static int appleib_ll_power(struct hid_device *hdev, int level) > +{ > + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; > + > + return hid_hw_power(hdev_info->hdev, level); > +} > + > +static int appleib_ll_parse(struct hid_device *hdev) > +{ > + /* we've already called hid_parse_report() */ > + return 0; > +} > + > +static void appleib_ll_request(struct hid_device *hdev, > + struct hid_report *report, int reqtype) > +{ > + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; > + > + hid_hw_request(hdev_info->hdev, report, reqtype); > +} > + > +static int appleib_ll_wait(struct hid_device *hdev) > +{ > + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; > + > + hid_hw_wait(hdev_info->hdev); > + return 0; > +} > + > +static int appleib_ll_raw_request(struct hid_device *hdev, > + unsigned char reportnum, __u8 *buf, > + size_t len, unsigned char rtype, int reqtype) > +{ > + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; > + > + return hid_hw_raw_request(hdev_info->hdev, reportnum, buf, len, rtype, > + reqtype); > +} > + > +static int appleib_ll_output_report(struct hid_device *hdev, __u8 *buf, > + size_t len) > +{ > + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; > + > + return hid_hw_output_report(hdev_info->hdev, buf, len); > +} > + > +static struct hid_ll_driver appleib_ll_driver = { > + .start = appleib_ll_start, > + .stop = appleib_ll_stop, > + .open = appleib_ll_open, > + .close = appleib_ll_close, > + .power = appleib_ll_power, > + .parse = appleib_ll_parse, > + .request = appleib_ll_request, > + .wait = appleib_ll_wait, > + .raw_request = appleib_ll_raw_request, > + .output_report = appleib_ll_output_report, > +}; const > + > +static struct hid_device_id *appleib_find_dev_id_for_usage(unsigned int usage) > +{ > + int i; > + > + for (i = 0; i < ARRAY_SIZE(appleib_usage_map); i++) { > + if (appleib_usage_map[i].usage == usage) > + return appleib_usage_map[i].dev_id; > + } > + > + return NULL; > +} > + > +static struct hid_device * > +appleib_add_sub_dev(struct appleib_hid_dev_info *hdev_info, > + struct hid_device_id *dev_id) > +{ > + struct hid_device *sub_hdev; > + int rc; > + > + sub_hdev = hid_allocate_device(); > + if (IS_ERR(sub_hdev)) > + return sub_hdev; > + > + sub_hdev->dev.parent = &hdev_info->hdev->dev; > + > + sub_hdev->bus = dev_id->bus; > + sub_hdev->group = dev_id->group; > + sub_hdev->vendor = dev_id->vendor; > + sub_hdev->product = dev_id->product; > + > + sub_hdev->ll_driver = &appleib_ll_driver; > + > + snprintf(sub_hdev->name, sizeof(sub_hdev->name), > + "iBridge Virtual HID %s/%04x:%04x", > + dev_name(sub_hdev->dev.parent), sub_hdev->vendor, > + sub_hdev->product); > + > + sub_hdev->driver_data = hdev_info; > + > + rc = hid_add_device(sub_hdev); > + if (rc) { > + hid_destroy_device(sub_hdev); > + return ERR_PTR(rc); > + } > + > + return sub_hdev; > +} > + > +static struct appleib_hid_dev_info *appleib_add_device(struct hid_device *hdev) > +{ > + struct appleib_hid_dev_info *hdev_info; > + struct hid_device_id *dev_id; > + unsigned int usage; > + int i; > + > + hdev_info = devm_kzalloc(&hdev->dev, sizeof(*hdev_info), GFP_KERNEL); > + if (!hdev_info) > + return ERR_PTR(-ENOMEM); > + > + hdev_info->hdev = hdev; > + > + for (i = 0; i < hdev->maxcollection; i++) { > + usage = hdev->collection[i].usage; > + dev_id = appleib_find_dev_id_for_usage(usage); > + > + if (!dev_id) { > + hid_warn(hdev, "Unknown collection encountered with usage %x\n", > + usage); > + } else { > + hdev_info->sub_hdevs[i] = appleib_add_sub_dev(hdev_info, dev_id); > + > + if (IS_ERR(hdev_info->sub_hdevs[i])) { > + while (i-- > 0) > + hid_destroy_device(hdev_info->sub_hdevs[i]); > + return (void *)hdev_info->sub_hdevs[i]; > + } > + } > + } > + > + return hdev_info; > +} > + > +static void appleib_remove_device(struct hid_device *hdev) > +{ > + struct appleib_hid_dev_info *hdev_info = hid_get_drvdata(hdev); > + int i; > + > + for (i = 0; i < ARRAY_SIZE(hdev_info->sub_hdevs); i++) { > + if (hdev_info->sub_hdevs[i]) > + hid_destroy_device(hdev_info->sub_hdevs[i]); > + } > + > + hid_set_drvdata(hdev, NULL); > +} > + > +static int appleib_hid_probe(struct hid_device *hdev, > + const struct hid_device_id *id) > +{ > + struct appleib_hid_dev_info *hdev_info; > + struct usb_device *udev; > + int rc; > + > + /* check and set usb config first */ > + udev = hid_to_usb_dev(hdev); I don't think hid_to_usb_dev() does any check that hdev is connected via USB and will produce undefined behavior when used on a non-USB device. Use hid_is_usb() first. > + > + if (udev->actconfig->desc.bConfigurationValue != APPLEIB_BASIC_CONFIG) { > + rc = usb_driver_set_configuration(udev, APPLEIB_BASIC_CONFIG); > + return rc ? rc : -ENODEV; > + } > + > + rc = hid_parse(hdev); > + if (rc) { > + hid_err(hdev, "ib: hid parse failed (%d)\n", rc); > + goto error; > + } > + > + rc = hid_hw_start(hdev, HID_CONNECT_DRIVER); > + if (rc) { > + hid_err(hdev, "ib: hw start failed (%d)\n", rc); > + goto error; > + } > + > + hdev_info = appleib_add_device(hdev); > + if (IS_ERR(hdev_info)) { > + rc = PTR_ERR(hdev_info); > + goto stop_hw; > + } > + > + hid_set_drvdata(hdev, hdev_info); > + > + rc = hid_hw_open(hdev); > + if (rc) { > + hid_err(hdev, "ib: failed to open hid: %d\n", rc); > + goto remove_dev; > + } > + > + return 0; > + > +remove_dev: > + appleib_remove_device(hdev); > +stop_hw: > + hid_hw_stop(hdev); > +error: > + return rc; > +} > + > +static void appleib_hid_remove(struct hid_device *hdev) > +{ > + hid_hw_close(hdev); > + appleib_remove_device(hdev); > + hid_hw_stop(hdev); > +} > + > +static const struct hid_device_id appleib_hid_ids[] = { > + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IBRIDGE) }, > + { }, > +}; > + > +static struct hid_driver appleib_hid_driver = { > + .name = "apple-ibridge-hid", > + .id_table = appleib_hid_ids, > + .probe = appleib_hid_probe, > + .remove = appleib_hid_remove, > + .raw_event = appleib_hid_raw_event, > + .report_fixup = appleib_report_fixup, > +#ifdef CONFIG_PM > + .suspend = appleib_hid_suspend, > + .resume = appleib_hid_resume, > + .reset_resume = appleib_hid_reset_resume, > +#endif > +}; const > + > +static struct appleib_device *appleib_alloc_device(struct platform_device *pdev) > +{ > + struct appleib_device *ib_dev; > + acpi_status sts; > + > + ib_dev = devm_kzalloc(&pdev->dev, sizeof(*ib_dev), GFP_KERNEL); > + if (!ib_dev) > + return ERR_PTR(-ENOMEM); > + > + /* get iBridge acpi power control method for suspend/resume */ > + sts = acpi_get_handle(ACPI_HANDLE(&pdev->dev), "SOCW", &ib_dev->asoc_socw); > + if (ACPI_FAILURE(sts)) { > + dev_err(&pdev->dev, > + "Error getting handle for ASOC.SOCW method: %s\n", > + acpi_format_exception(sts)); > + return ERR_PTR(-ENXIO); > + } > + > + /* ensure iBridge is powered on */ > + sts = acpi_execute_simple_method(ib_dev->asoc_socw, NULL, 1); > + if (ACPI_FAILURE(sts)) > + dev_warn(&pdev->dev, "SOCW(1) failed: %s\n", > + acpi_format_exception(sts)); > + > + return ib_dev; > +} > + > +static int appleib_probe(struct platform_device *pdev) > +{ > + struct appleib_device *ib_dev; > + int ret; > + > + ib_dev = appleib_alloc_device(pdev); > + if (IS_ERR(ib_dev)) > + return PTR_ERR(ib_dev); > + > + ret = hid_register_driver(&appleib_hid_driver); > + if (ret) { > + dev_err(&pdev->dev, "Error registering hid driver: %d\n", > + ret); > + return ret; > + } > + > + platform_set_drvdata(pdev, ib_dev); > + > + return 0; > +} > + > +static int appleib_remove(struct platform_device *pdev) > +{ > + hid_unregister_driver(&appleib_hid_driver); > + > + return 0; > +} > + > +static int appleib_suspend(struct platform_device *pdev, pm_message_t message) > +{ > + struct appleib_device *ib_dev; > + int rc; > + > + ib_dev = platform_get_drvdata(pdev); > + > + rc = acpi_execute_simple_method(ib_dev->asoc_socw, NULL, 0); > + if (ACPI_FAILURE(rc)) > + dev_warn(&pdev->dev, "SOCW(0) failed: %s\n", > + acpi_format_exception(rc)); > + > + return 0; > +} > + > +static int appleib_resume(struct platform_device *pdev) > +{ > + struct appleib_device *ib_dev; > + int rc; > + > + ib_dev = platform_get_drvdata(pdev); > + > + rc = acpi_execute_simple_method(ib_dev->asoc_socw, NULL, 1); > + if (ACPI_FAILURE(rc)) > + dev_warn(&pdev->dev, "SOCW(1) failed: %s\n", > + acpi_format_exception(rc)); > + > + return 0; > +} > + > +static const struct acpi_device_id appleib_acpi_match[] = { > + { "APP7777", 0 }, > + { }, No trailing comma after end-of-array marker. > +}; > + > +MODULE_DEVICE_TABLE(acpi, appleib_acpi_match); > + > +static struct platform_driver appleib_driver = { > + .probe = appleib_probe, > + .remove = appleib_remove, > + .suspend = appleib_suspend, > + .resume = appleib_resume, > + .driver = { > + .name = "apple-ibridge", > + .acpi_match_table = appleib_acpi_match, > + }, > +}; > + > +module_platform_driver(appleib_driver); > + > +MODULE_AUTHOR("Ronald Tschalär"); > +MODULE_DESCRIPTION("Apple iBridge driver"); > +MODULE_LICENSE("GPL"); > diff --git a/drivers/hid/apple-ibridge.h b/drivers/hid/apple-ibridge.h > new file mode 100644 > index 000000000..8aefcf615 > --- /dev/null > +++ b/drivers/hid/apple-ibridge.h > @@ -0,0 +1,15 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Apple iBridge Driver > + * > + * Copyright (c) 2018 Ronald Tschalär > + */ > + > +#ifndef __LINUX_APPLE_IBRDIGE_H > +#define __LINUX_APPLE_IBRDIGE_H > + > +#define USB_VENDOR_ID_LINUX_FOUNDATION 0x1d6b > +#define USB_DEVICE_ID_IBRIDGE_TB 0x0301 > +#define USB_DEVICE_ID_IBRIDGE_ALS 0x0302 > + > +#endif > diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h > index 0f8c11842..0c62e6280 100644 > --- a/drivers/hid/hid-ids.h > +++ b/drivers/hid/hid-ids.h > @@ -187,6 +187,7 @@ > #define USB_DEVICE_ID_APPLE_MAGIC_KEYBOARD_NUMPAD_2021 0x029f > #define USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT 0x8102 > #define USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY 0x8302 > +#define USB_DEVICE_ID_APPLE_IBRIDGE 0x8600 > > #define USB_VENDOR_ID_ASUS 0x0486 > #define USB_DEVICE_ID_ASUS_T91MT 0x0185 > diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c > index be3ad0257..c03535c4b 100644 > --- a/drivers/hid/hid-quirks.c > +++ b/drivers/hid/hid-quirks.c > @@ -319,6 +319,9 @@ static const struct hid_device_id hid_have_special_driver[] = { > { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_BACKLIGHT) }, > { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_TOUCHBAR_DISPLAY) }, > #endif > +#if IS_ENABLED(CONFIG_HID_APPLE_IBRIDGE) > + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IBRIDGE) }, > +#endif > #if IS_ENABLED(CONFIG_HID_APPLEIR) > { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) }, > { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL2) }, > -- > 2.37.2 > ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip. 2023-02-10 4:56 ` [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip Thomas Weißschuh @ 2023-02-10 8:30 ` Aditya Garg 2023-02-10 8:39 ` Benjamin Tissoires 2023-02-10 12:05 ` Aditya Garg 1 sibling, 1 reply; 32+ messages in thread From: Aditya Garg @ 2023-02-10 8:30 UTC (permalink / raw) To: Thomas Weißschuh Cc: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain > On 10-Feb-2023, at 10:26 AM, Thomas Weißschuh <thomas@t-8ch.de> wrote: > > Hi, > > some comments inline. > > On Fri, Feb 10, 2023 at 03:43:24AM +0000, Aditya Garg wrote: >> From: Ronald Tschalär <ronald@innovation.ch> >> >> The iBridge device provides access to several devices, including: >> - the Touch Bar >> - the iSight webcam >> - the light sensor >> - the fingerprint sensor >> >> This driver provides the core support for managing the iBridge device >> and the access to the underlying devices. In particular, the >> functionality for the touch bar and light sensor is exposed via USB HID >> interfaces, and on devices with the T1 chip one of the HID devices is >> used for both functions. So this driver creates virtual HID devices, one >> per top-level report collection on each HID device (for a total of 3 >> virtual HID devices). The sub-drivers then bind to these virtual HID >> devices. >> >> This way the Touch Bar and ALS drivers can be kept in their own modules, >> while at the same time making them look very much like as if they were >> connected to the real HID devices. And those drivers then work (mostly) >> without further changes on MacBooks with the T2 chip that don't need >> this driver. >> >> Signed-off-by: Ronald Tschalär <ronald@innovation.ch> >> [Kerem Karabay: convert to a platform driver] >> [Kerem Karabay: fix appleib_forward_int_op] >> [Kerem Karabay: rely on HID core's parsing in appleib_add_device] >> Signed-off-by: Kerem Karabay <kekrby@gmail.com> >> Signed-off-by: Aditya Garg <gargaditya08@live.com> >> --- >> drivers/hid/Kconfig | 15 + >> drivers/hid/Makefile | 1 + >> drivers/hid/apple-ibridge.c | 610 ++++++++++++++++++++++++++++++++++++ >> drivers/hid/apple-ibridge.h | 15 + >> drivers/hid/hid-ids.h | 1 + >> drivers/hid/hid-quirks.c | 3 + >> 6 files changed, 645 insertions(+) >> create mode 100644 drivers/hid/apple-ibridge.c >> create mode 100644 drivers/hid/apple-ibridge.h >> > >> >> +} >> + >> +static int appleib_ll_raw_request(struct hid_device *hdev, >> + unsigned char reportnum, __u8 *buf, >> + size_t len, unsigned char rtype, int reqtype) >> +{ >> + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; >> + >> + return hid_hw_raw_request(hdev_info->hdev, reportnum, buf, len, rtype, >> + reqtype); >> +} >> + >> +static int appleib_ll_output_report(struct hid_device *hdev, __u8 *buf, >> + size_t len) >> +{ >> + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; >> + >> + return hid_hw_output_report(hdev_info->hdev, buf, len); >> +} >> + >> +static struct hid_ll_driver appleib_ll_driver = { >> + .start = appleib_ll_start, >> + .stop = appleib_ll_stop, >> + .open = appleib_ll_open, >> + .close = appleib_ll_close, >> + .power = appleib_ll_power, >> + .parse = appleib_ll_parse, >> + .request = appleib_ll_request, >> + .wait = appleib_ll_wait, >> + .raw_request = appleib_ll_raw_request, >> + .output_report = appleib_ll_output_report, >> +}; > > const Are you sure about const here? > >> + >> + if (udev->actconfig->desc.bConfigurationValue != APPLEIB_BASIC_CONFIG) { >> + rc = usb_driver_set_configuration(udev, APPLEIB_BASIC_CONFIG); >> + return rc ? rc : -ENODEV; >> + } >> + >> + rc = hid_parse(hdev); >> + if (rc) { >> + hid_err(hdev, "ib: hid parse failed (%d)\n", rc); >> + goto error; >> + } >> + >> + rc = hid_hw_start(hdev, HID_CONNECT_DRIVER); >> + if (rc) { >> + hid_err(hdev, "ib: hw start failed (%d)\n", rc); >> + goto error; >> + } >> + >> + hdev_info = appleib_add_device(hdev); >> + if (IS_ERR(hdev_info)) { >> + rc = PTR_ERR(hdev_info); >> + goto stop_hw; >> + } >> + >> + hid_set_drvdata(hdev, hdev_info); >> + >> + rc = hid_hw_open(hdev); >> + if (rc) { >> + hid_err(hdev, "ib: failed to open hid: %d\n", rc); >> + goto remove_dev; >> + } >> + >> + return 0; >> + >> +remove_dev: >> + appleib_remove_device(hdev); >> +stop_hw: >> + hid_hw_stop(hdev); >> +error: >> + return rc; >> +} >> + >> +static void appleib_hid_remove(struct hid_device *hdev) >> +{ >> + hid_hw_close(hdev); >> + appleib_remove_device(hdev); >> + hid_hw_stop(hdev); >> +} >> + >> +static const struct hid_device_id appleib_hid_ids[] = { >> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IBRIDGE) }, >> + { }, >> +}; >> + >> +static struct hid_driver appleib_hid_driver = { >> + .name = "apple-ibridge-hid", >> + .id_table = appleib_hid_ids, >> + .probe = appleib_hid_probe, >> + .remove = appleib_hid_remove, >> + .raw_event = appleib_hid_raw_event, >> + .report_fixup = appleib_report_fixup, >> +#ifdef CONFIG_PM >> + .suspend = appleib_hid_suspend, >> + .resume = appleib_hid_resume, >> + .reset_resume = appleib_hid_reset_resume, >> +#endif >> +}; > > const Are you sure you want to do const here, cause other hid-drivers are NOT using const. >> + >> +static struct appleib_device *appleib_alloc_device(struct platform_device *pdev) >> +{ >> + struct appleib_device *ib_dev; >> + acpi_status sts; ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip. 2023-02-10 8:30 ` Aditya Garg @ 2023-02-10 8:39 ` Benjamin Tissoires 2023-02-10 8:54 ` Aditya Garg 0 siblings, 1 reply; 32+ messages in thread From: Benjamin Tissoires @ 2023-02-10 8:39 UTC (permalink / raw) To: Aditya Garg Cc: Thomas Weißschuh, Jiri Kosina, jkosina, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain On Fri, Feb 10, 2023 at 9:30 AM Aditya Garg <gargaditya08@live.com> wrote: > > > > > On 10-Feb-2023, at 10:26 AM, Thomas Weißschuh <thomas@t-8ch.de> wrote: > > > > Hi, > > > > some comments inline. > > > > On Fri, Feb 10, 2023 at 03:43:24AM +0000, Aditya Garg wrote: > >> From: Ronald Tschalär <ronald@innovation.ch> > >> > >> The iBridge device provides access to several devices, including: > >> - the Touch Bar > >> - the iSight webcam > >> - the light sensor > >> - the fingerprint sensor > >> > >> This driver provides the core support for managing the iBridge device > >> and the access to the underlying devices. In particular, the > >> functionality for the touch bar and light sensor is exposed via USB HID > >> interfaces, and on devices with the T1 chip one of the HID devices is > >> used for both functions. So this driver creates virtual HID devices, one > >> per top-level report collection on each HID device (for a total of 3 > >> virtual HID devices). The sub-drivers then bind to these virtual HID > >> devices. > >> > >> This way the Touch Bar and ALS drivers can be kept in their own modules, > >> while at the same time making them look very much like as if they were > >> connected to the real HID devices. And those drivers then work (mostly) > >> without further changes on MacBooks with the T2 chip that don't need > >> this driver. > >> > >> Signed-off-by: Ronald Tschalär <ronald@innovation.ch> > >> [Kerem Karabay: convert to a platform driver] > >> [Kerem Karabay: fix appleib_forward_int_op] > >> [Kerem Karabay: rely on HID core's parsing in appleib_add_device] > >> Signed-off-by: Kerem Karabay <kekrby@gmail.com> > >> Signed-off-by: Aditya Garg <gargaditya08@live.com> > >> --- > >> drivers/hid/Kconfig | 15 + > >> drivers/hid/Makefile | 1 + > >> drivers/hid/apple-ibridge.c | 610 ++++++++++++++++++++++++++++++++++++ > >> drivers/hid/apple-ibridge.h | 15 + > >> drivers/hid/hid-ids.h | 1 + > >> drivers/hid/hid-quirks.c | 3 + > >> 6 files changed, 645 insertions(+) > >> create mode 100644 drivers/hid/apple-ibridge.c > >> create mode 100644 drivers/hid/apple-ibridge.h > >> > > > >> > >> +} > >> + > >> +static int appleib_ll_raw_request(struct hid_device *hdev, > >> + unsigned char reportnum, __u8 *buf, > >> + size_t len, unsigned char rtype, int reqtype) > >> +{ > >> + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; > >> + > >> + return hid_hw_raw_request(hdev_info->hdev, reportnum, buf, len, rtype, > >> + reqtype); > >> +} > >> + > >> +static int appleib_ll_output_report(struct hid_device *hdev, __u8 *buf, > >> + size_t len) > >> +{ > >> + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; > >> + > >> + return hid_hw_output_report(hdev_info->hdev, buf, len); > >> +} > >> + > >> +static struct hid_ll_driver appleib_ll_driver = { > >> + .start = appleib_ll_start, > >> + .stop = appleib_ll_stop, > >> + .open = appleib_ll_open, > >> + .close = appleib_ll_close, > >> + .power = appleib_ll_power, > >> + .parse = appleib_ll_parse, > >> + .request = appleib_ll_request, > >> + .wait = appleib_ll_wait, > >> + .raw_request = appleib_ll_raw_request, > >> + .output_report = appleib_ll_output_report, > >> +}; > > > > const > > Are you sure about const here? > > > > >> + > >> + if (udev->actconfig->desc.bConfigurationValue != APPLEIB_BASIC_CONFIG) { > >> + rc = usb_driver_set_configuration(udev, APPLEIB_BASIC_CONFIG); > >> + return rc ? rc : -ENODEV; > >> + } > >> + > >> + rc = hid_parse(hdev); > >> + if (rc) { > >> + hid_err(hdev, "ib: hid parse failed (%d)\n", rc); > >> + goto error; > >> + } > >> + > >> + rc = hid_hw_start(hdev, HID_CONNECT_DRIVER); > >> + if (rc) { > >> + hid_err(hdev, "ib: hw start failed (%d)\n", rc); > >> + goto error; > >> + } > >> + > >> + hdev_info = appleib_add_device(hdev); > >> + if (IS_ERR(hdev_info)) { > >> + rc = PTR_ERR(hdev_info); > >> + goto stop_hw; > >> + } > >> + > >> + hid_set_drvdata(hdev, hdev_info); > >> + > >> + rc = hid_hw_open(hdev); > >> + if (rc) { > >> + hid_err(hdev, "ib: failed to open hid: %d\n", rc); > >> + goto remove_dev; > >> + } > >> + > >> + return 0; > >> + > >> +remove_dev: > >> + appleib_remove_device(hdev); > >> +stop_hw: > >> + hid_hw_stop(hdev); > >> +error: > >> + return rc; > >> +} > >> + > >> +static void appleib_hid_remove(struct hid_device *hdev) > >> +{ > >> + hid_hw_close(hdev); > >> + appleib_remove_device(hdev); > >> + hid_hw_stop(hdev); > >> +} > >> + > >> +static const struct hid_device_id appleib_hid_ids[] = { > >> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IBRIDGE) }, > >> + { }, > >> +}; > >> + > >> +static struct hid_driver appleib_hid_driver = { > >> + .name = "apple-ibridge-hid", > >> + .id_table = appleib_hid_ids, > >> + .probe = appleib_hid_probe, > >> + .remove = appleib_hid_remove, > >> + .raw_event = appleib_hid_raw_event, > >> + .report_fixup = appleib_report_fixup, > >> +#ifdef CONFIG_PM > >> + .suspend = appleib_hid_suspend, > >> + .resume = appleib_hid_resume, > >> + .reset_resume = appleib_hid_reset_resume, > >> +#endif > >> +}; > > > > const > > Are you sure you want to do const here, cause other hid-drivers are NOT using const. It is scheduled for 6.3: https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git/log/?h=for-6.3/hid-core So yes, please make them const. Cheers, Benjamin > > >> + > >> +static struct appleib_device *appleib_alloc_device(struct platform_device *pdev) > >> +{ > >> + struct appleib_device *ib_dev; > >> + acpi_status sts; > ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip. 2023-02-10 8:39 ` Benjamin Tissoires @ 2023-02-10 8:54 ` Aditya Garg 2023-02-10 9:21 ` Benjamin Tissoires 0 siblings, 1 reply; 32+ messages in thread From: Aditya Garg @ 2023-02-10 8:54 UTC (permalink / raw) To: Benjamin Tissoires Cc: Thomas Weißschuh, Jiri Kosina, jkosina, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain > On 10-Feb-2023, at 2:09 PM, Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote: > > On Fri, Feb 10, 2023 at 9:30 AM Aditya Garg <gargaditya08@live.com> wrote: >> >> >> >>> On 10-Feb-2023, at 10:26 AM, Thomas Weißschuh <thomas@t-8ch.de> wrote: >>> >>> Hi, >>> >>> some comments inline. >>> >>> On Fri, Feb 10, 2023 at 03:43:24AM +0000, Aditya Garg wrote: >>>> From: Ronald Tschalär <ronald@innovation.ch> >>>> >>>> The iBridge device provides access to several devices, including: >>>> - the Touch Bar >>>> - the iSight webcam >>>> - the light sensor >>>> - the fingerprint sensor >>>> >>>> This driver provides the core support for managing the iBridge device >>>> and the access to the underlying devices. In particular, the >>>> functionality for the touch bar and light sensor is exposed via USB HID >>>> interfaces, and on devices with the T1 chip one of the HID devices is >>>> used for both functions. So this driver creates virtual HID devices, one >>>> per top-level report collection on each HID device (for a total of 3 >>>> virtual HID devices). The sub-drivers then bind to these virtual HID >>>> devices. >>>> >>>> This way the Touch Bar and ALS drivers can be kept in their own modules, >>>> while at the same time making them look very much like as if they were >>>> connected to the real HID devices. And those drivers then work (mostly) >>>> without further changes on MacBooks with the T2 chip that don't need >>>> this driver. >>>> >>>> Signed-off-by: Ronald Tschalär <ronald@innovation.ch> >>>> [Kerem Karabay: convert to a platform driver] >>>> [Kerem Karabay: fix appleib_forward_int_op] >>>> [Kerem Karabay: rely on HID core's parsing in appleib_add_device] >>>> Signed-off-by: Kerem Karabay <kekrby@gmail.com> >>>> Signed-off-by: Aditya Garg <gargaditya08@live.com> >>>> --- >>>> drivers/hid/Kconfig | 15 + >>>> drivers/hid/Makefile | 1 + >>>> drivers/hid/apple-ibridge.c | 610 ++++++++++++++++++++++++++++++++++++ >>>> drivers/hid/apple-ibridge.h | 15 + >>>> drivers/hid/hid-ids.h | 1 + >>>> drivers/hid/hid-quirks.c | 3 + >>>> 6 files changed, 645 insertions(+) >>>> create mode 100644 drivers/hid/apple-ibridge.c >>>> create mode 100644 drivers/hid/apple-ibridge.h >>>> >>> >>>> >>>> +} >>>> + >>>> +static int appleib_ll_raw_request(struct hid_device *hdev, >>>> + unsigned char reportnum, __u8 *buf, >>>> + size_t len, unsigned char rtype, int reqtype) >>>> +{ >>>> + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; >>>> + >>>> + return hid_hw_raw_request(hdev_info->hdev, reportnum, buf, len, rtype, >>>> + reqtype); >>>> +} >>>> + >>>> +static int appleib_ll_output_report(struct hid_device *hdev, __u8 *buf, >>>> + size_t len) >>>> +{ >>>> + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; >>>> + >>>> + return hid_hw_output_report(hdev_info->hdev, buf, len); >>>> +} >>>> + >>>> +static struct hid_ll_driver appleib_ll_driver = { >>>> + .start = appleib_ll_start, >>>> + .stop = appleib_ll_stop, >>>> + .open = appleib_ll_open, >>>> + .close = appleib_ll_close, >>>> + .power = appleib_ll_power, >>>> + .parse = appleib_ll_parse, >>>> + .request = appleib_ll_request, >>>> + .wait = appleib_ll_wait, >>>> + .raw_request = appleib_ll_raw_request, >>>> + .output_report = appleib_ll_output_report, >>>> +}; >>> >>> const >> >> Are you sure about const here? >> >>> >>>> + >>>> + if (udev->actconfig->desc.bConfigurationValue != APPLEIB_BASIC_CONFIG) { >>>> + rc = usb_driver_set_configuration(udev, APPLEIB_BASIC_CONFIG); >>>> + return rc ? rc : -ENODEV; >>>> + } >>>> + >>>> + rc = hid_parse(hdev); >>>> + if (rc) { >>>> + hid_err(hdev, "ib: hid parse failed (%d)\n", rc); >>>> + goto error; >>>> + } >>>> + >>>> + rc = hid_hw_start(hdev, HID_CONNECT_DRIVER); >>>> + if (rc) { >>>> + hid_err(hdev, "ib: hw start failed (%d)\n", rc); >>>> + goto error; >>>> + } >>>> + >>>> + hdev_info = appleib_add_device(hdev); >>>> + if (IS_ERR(hdev_info)) { >>>> + rc = PTR_ERR(hdev_info); >>>> + goto stop_hw; >>>> + } >>>> + >>>> + hid_set_drvdata(hdev, hdev_info); >>>> + >>>> + rc = hid_hw_open(hdev); >>>> + if (rc) { >>>> + hid_err(hdev, "ib: failed to open hid: %d\n", rc); >>>> + goto remove_dev; >>>> + } >>>> + >>>> + return 0; >>>> + >>>> +remove_dev: >>>> + appleib_remove_device(hdev); >>>> +stop_hw: >>>> + hid_hw_stop(hdev); >>>> +error: >>>> + return rc; >>>> +} >>>> + >>>> +static void appleib_hid_remove(struct hid_device *hdev) >>>> +{ >>>> + hid_hw_close(hdev); >>>> + appleib_remove_device(hdev); >>>> + hid_hw_stop(hdev); >>>> +} >>>> + >>>> +static const struct hid_device_id appleib_hid_ids[] = { >>>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IBRIDGE) }, >>>> + { }, >>>> +}; >>>> + >>>> +static struct hid_driver appleib_hid_driver = { >>>> + .name = "apple-ibridge-hid", >>>> + .id_table = appleib_hid_ids, >>>> + .probe = appleib_hid_probe, >>>> + .remove = appleib_hid_remove, >>>> + .raw_event = appleib_hid_raw_event, >>>> + .report_fixup = appleib_report_fixup, >>>> +#ifdef CONFIG_PM >>>> + .suspend = appleib_hid_suspend, >>>> + .resume = appleib_hid_resume, >>>> + .reset_resume = appleib_hid_reset_resume, >>>> +#endif >>>> +}; >>> >>> const >> >> Are you sure you want to do const here, cause other hid-drivers are NOT using const. > > It is scheduled for 6.3: > https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git/log/?h=for-6.3/hid-core > > So yes, please make them const. Makes sense for `hid_ll_driver` as per the tree you send me, but I don’t see such a thing for `static struct hid_driver`. Is that scheduled as well? > > Cheers, > Benjamin > >> >>>> + >>>> +static struct appleib_device *appleib_alloc_device(struct platform_device *pdev) >>>> +{ >>>> + struct appleib_device *ib_dev; >>>> + acpi_status sts; ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip. 2023-02-10 8:54 ` Aditya Garg @ 2023-02-10 9:21 ` Benjamin Tissoires 0 siblings, 0 replies; 32+ messages in thread From: Benjamin Tissoires @ 2023-02-10 9:21 UTC (permalink / raw) To: Aditya Garg Cc: Thomas Weißschuh, Jiri Kosina, jkosina, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain On Fri, Feb 10, 2023 at 9:54 AM Aditya Garg <gargaditya08@live.com> wrote: > > > > > On 10-Feb-2023, at 2:09 PM, Benjamin Tissoires <benjamin.tissoires@redhat.com> wrote: > > > > On Fri, Feb 10, 2023 at 9:30 AM Aditya Garg <gargaditya08@live.com> wrote: > >> > >> > >> > >>> On 10-Feb-2023, at 10:26 AM, Thomas Weißschuh <thomas@t-8ch.de> wrote: > >>> > >>> Hi, > >>> > >>> some comments inline. > >>> > >>> On Fri, Feb 10, 2023 at 03:43:24AM +0000, Aditya Garg wrote: > >>>> From: Ronald Tschalär <ronald@innovation.ch> > >>>> > >>>> The iBridge device provides access to several devices, including: > >>>> - the Touch Bar > >>>> - the iSight webcam > >>>> - the light sensor > >>>> - the fingerprint sensor > >>>> > >>>> This driver provides the core support for managing the iBridge device > >>>> and the access to the underlying devices. In particular, the > >>>> functionality for the touch bar and light sensor is exposed via USB HID > >>>> interfaces, and on devices with the T1 chip one of the HID devices is > >>>> used for both functions. So this driver creates virtual HID devices, one > >>>> per top-level report collection on each HID device (for a total of 3 > >>>> virtual HID devices). The sub-drivers then bind to these virtual HID > >>>> devices. > >>>> > >>>> This way the Touch Bar and ALS drivers can be kept in their own modules, > >>>> while at the same time making them look very much like as if they were > >>>> connected to the real HID devices. And those drivers then work (mostly) > >>>> without further changes on MacBooks with the T2 chip that don't need > >>>> this driver. > >>>> > >>>> Signed-off-by: Ronald Tschalär <ronald@innovation.ch> > >>>> [Kerem Karabay: convert to a platform driver] > >>>> [Kerem Karabay: fix appleib_forward_int_op] > >>>> [Kerem Karabay: rely on HID core's parsing in appleib_add_device] > >>>> Signed-off-by: Kerem Karabay <kekrby@gmail.com> > >>>> Signed-off-by: Aditya Garg <gargaditya08@live.com> > >>>> --- > >>>> drivers/hid/Kconfig | 15 + > >>>> drivers/hid/Makefile | 1 + > >>>> drivers/hid/apple-ibridge.c | 610 ++++++++++++++++++++++++++++++++++++ > >>>> drivers/hid/apple-ibridge.h | 15 + > >>>> drivers/hid/hid-ids.h | 1 + > >>>> drivers/hid/hid-quirks.c | 3 + > >>>> 6 files changed, 645 insertions(+) > >>>> create mode 100644 drivers/hid/apple-ibridge.c > >>>> create mode 100644 drivers/hid/apple-ibridge.h > >>>> > >>> > >>>> > >>>> +} > >>>> + > >>>> +static int appleib_ll_raw_request(struct hid_device *hdev, > >>>> + unsigned char reportnum, __u8 *buf, > >>>> + size_t len, unsigned char rtype, int reqtype) > >>>> +{ > >>>> + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; > >>>> + > >>>> + return hid_hw_raw_request(hdev_info->hdev, reportnum, buf, len, rtype, > >>>> + reqtype); > >>>> +} > >>>> + > >>>> +static int appleib_ll_output_report(struct hid_device *hdev, __u8 *buf, > >>>> + size_t len) > >>>> +{ > >>>> + struct appleib_hid_dev_info *hdev_info = hdev->driver_data; > >>>> + > >>>> + return hid_hw_output_report(hdev_info->hdev, buf, len); > >>>> +} > >>>> + > >>>> +static struct hid_ll_driver appleib_ll_driver = { > >>>> + .start = appleib_ll_start, > >>>> + .stop = appleib_ll_stop, > >>>> + .open = appleib_ll_open, > >>>> + .close = appleib_ll_close, > >>>> + .power = appleib_ll_power, > >>>> + .parse = appleib_ll_parse, > >>>> + .request = appleib_ll_request, > >>>> + .wait = appleib_ll_wait, > >>>> + .raw_request = appleib_ll_raw_request, > >>>> + .output_report = appleib_ll_output_report, > >>>> +}; > >>> > >>> const > >> > >> Are you sure about const here? > >> > >>> > >>>> + > >>>> + if (udev->actconfig->desc.bConfigurationValue != APPLEIB_BASIC_CONFIG) { > >>>> + rc = usb_driver_set_configuration(udev, APPLEIB_BASIC_CONFIG); > >>>> + return rc ? rc : -ENODEV; > >>>> + } > >>>> + > >>>> + rc = hid_parse(hdev); > >>>> + if (rc) { > >>>> + hid_err(hdev, "ib: hid parse failed (%d)\n", rc); > >>>> + goto error; > >>>> + } > >>>> + > >>>> + rc = hid_hw_start(hdev, HID_CONNECT_DRIVER); > >>>> + if (rc) { > >>>> + hid_err(hdev, "ib: hw start failed (%d)\n", rc); > >>>> + goto error; > >>>> + } > >>>> + > >>>> + hdev_info = appleib_add_device(hdev); > >>>> + if (IS_ERR(hdev_info)) { > >>>> + rc = PTR_ERR(hdev_info); > >>>> + goto stop_hw; > >>>> + } > >>>> + > >>>> + hid_set_drvdata(hdev, hdev_info); > >>>> + > >>>> + rc = hid_hw_open(hdev); > >>>> + if (rc) { > >>>> + hid_err(hdev, "ib: failed to open hid: %d\n", rc); > >>>> + goto remove_dev; > >>>> + } > >>>> + > >>>> + return 0; > >>>> + > >>>> +remove_dev: > >>>> + appleib_remove_device(hdev); > >>>> +stop_hw: > >>>> + hid_hw_stop(hdev); > >>>> +error: > >>>> + return rc; > >>>> +} > >>>> + > >>>> +static void appleib_hid_remove(struct hid_device *hdev) > >>>> +{ > >>>> + hid_hw_close(hdev); > >>>> + appleib_remove_device(hdev); > >>>> + hid_hw_stop(hdev); > >>>> +} > >>>> + > >>>> +static const struct hid_device_id appleib_hid_ids[] = { > >>>> + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IBRIDGE) }, > >>>> + { }, > >>>> +}; > >>>> + > >>>> +static struct hid_driver appleib_hid_driver = { > >>>> + .name = "apple-ibridge-hid", > >>>> + .id_table = appleib_hid_ids, > >>>> + .probe = appleib_hid_probe, > >>>> + .remove = appleib_hid_remove, > >>>> + .raw_event = appleib_hid_raw_event, > >>>> + .report_fixup = appleib_report_fixup, > >>>> +#ifdef CONFIG_PM > >>>> + .suspend = appleib_hid_suspend, > >>>> + .resume = appleib_hid_resume, > >>>> + .reset_resume = appleib_hid_reset_resume, > >>>> +#endif > >>>> +}; > >>> > >>> const > >> > >> Are you sure you want to do const here, cause other hid-drivers are NOT using const. > > > > It is scheduled for 6.3: > > https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git/log/?h=for-6.3/hid-core > > > > So yes, please make them const. > > Makes sense for `hid_ll_driver` as per the tree you send me, but I don’t see such a thing for > `static struct hid_driver`. Is that scheduled as well? Good point. I don't recall having seen such series now that you pinpoint this. Thomas, is this something you have planned to submit? Cheers, Benjamin > > > > > Cheers, > > Benjamin > > > >> > >>>> + > >>>> +static struct appleib_device *appleib_alloc_device(struct platform_device *pdev) > >>>> +{ > >>>> + struct appleib_device *ib_dev; > >>>> + acpi_status sts; > > ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip. 2023-02-10 4:56 ` [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip Thomas Weißschuh 2023-02-10 8:30 ` Aditya Garg @ 2023-02-10 12:05 ` Aditya Garg 2023-02-10 12:20 ` Orlando Chamberlain 2023-02-10 15:33 ` Thomas Weißschuh 1 sibling, 2 replies; 32+ messages in thread From: Aditya Garg @ 2023-02-10 12:05 UTC (permalink / raw) To: Thomas Weißschuh Cc: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain > On 10-Feb-2023, at 10:26 AM, Thomas Weißschuh <thomas@t-8ch.de> wrote: > > Hi, > > some comments inline. > > On Fri, Feb 10, 2023 at 03:43:24AM +0000, Aditya Garg wrote: > >> + >> +static struct { >> + unsigned int usage; >> + struct hid_device_id *dev_id; >> +} appleib_usage_map[] = { >> + /* Default iBridge configuration, key inputs and mode settings */ >> + { 0x00010006, &appleib_sub_hid_ids[0] }, >> + /* OS X iBridge configuration, digitizer inputs */ >> + { 0x000D0005, &appleib_sub_hid_ids[0] }, >> + /* All iBridge configurations, display/DFR settings */ >> + { 0xFF120001, &appleib_sub_hid_ids[0] }, >> + /* All iBridge configurations, ALS */ >> + { 0x00200041, &appleib_sub_hid_ids[1] }, >> +}; > > const > Constantifying this results in compiler giving warnings drivers/hid/apple-ibridge.c:78:23: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] 78 | { 0x00200041, &appleib_sub_hid_ids[1] }, | ^ drivers/hid/apple-ibridge.c: In function 'appleib_add_sub_dev': drivers/hid/apple-ibridge.c:363:29: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] 363 | sub_hdev->ll_driver = &appleib_ll_driver; | ^ drivers/hid/apple-ibridge.c: In function 'appleib_hid_probe': drivers/hid/apple-ibridge.c:436:12: error: expected '(' before 'hid_is_usb' 436 | if hid_is_usb(hdev) | ^~~~~~~~~~ | ( In file included from drivers/hid/apple-ibridge.c:48: drivers/hid/apple-ibridge.c: In function 'appleib_probe': drivers/hid/apple-ibridge.c:544:35: warning: passing argument 1 of '__hid_register_driver' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] 544 | ret = hid_register_driver(&appleib_hid_driver); | ^~~~~~~~~~~~~~~~~~~ ./include/linux/hid.h:898:31: note: in definition of macro 'hid_register_driver' 898 | __hid_register_driver(driver, THIS_MODULE, KBUILD_MODNAME) | ^~~~~~ ./include/linux/hid.h:893:47: note: expected 'struct hid_driver *' but argument is of type 'const struct hid_driver *' 893 | extern int __must_check __hid_register_driver(struct hid_driver *, | ^~~~~~~~~~~~~~~~~~~ drivers/hid/apple-ibridge.c: In function 'appleib_remove': drivers/hid/apple-ibridge.c:558:31: warning: passing argument 1 of 'hid_unregister_driver' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] 558 | hid_unregister_driver(&appleib_hid_driver); | ^~~~~~~~~~~~~~~~~~~ ./include/linux/hid.h:900:35: note: expected 'struct hid_driver *' but argument is of type 'const struct hid_driver *' 900 | extern void hid_unregister_driver(struct hid_driver *); | ^~~~~~~~~~~~~~~~~~~ make[6]: *** [scripts/Makefile.build:250: drivers/hid/apple-ibridge.o] Error 1 make[5]: *** [scripts/Makefile.build:500: drivers/hid] Error 2 make[5]: *** Waiting for unfinished jobs…. Some warnings are also due to a typo in if and constantifying `static struct hid_driver`, although they probably can be fixed. In short, Thomas, do you really want me to constantify the structure I am talking about in this email, as well `static struct hid_driver`? ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip. 2023-02-10 12:05 ` Aditya Garg @ 2023-02-10 12:20 ` Orlando Chamberlain 2023-02-10 13:07 ` Aditya Garg 2023-02-10 15:33 ` Thomas Weißschuh 1 sibling, 1 reply; 32+ messages in thread From: Orlando Chamberlain @ 2023-02-10 12:20 UTC (permalink / raw) To: Aditya Garg Cc: Thomas Weißschuh, Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby On Fri, 10 Feb 2023 12:05:13 +0000 Aditya Garg <gargaditya08@live.com> wrote: > > On 10-Feb-2023, at 10:26 AM, Thomas Weißschuh <thomas@t-8ch.de> > > wrote: > > > > Hi, > > > > some comments inline. > > > > On Fri, Feb 10, 2023 at 03:43:24AM +0000, Aditya Garg wrote: > > > >> + > >> +static struct { > >> + unsigned int usage; > >> + struct hid_device_id *dev_id; > >> +} appleib_usage_map[] = { > >> + /* Default iBridge configuration, key inputs and mode settings */ > >> + { 0x00010006, &appleib_sub_hid_ids[0] }, > >> + /* OS X iBridge configuration, digitizer inputs */ > >> + { 0x000D0005, &appleib_sub_hid_ids[0] }, > >> + /* All iBridge configurations, display/DFR settings */ > >> + { 0xFF120001, &appleib_sub_hid_ids[0] }, > >> + /* All iBridge configurations, ALS */ > >> + { 0x00200041, &appleib_sub_hid_ids[1] }, > >> +}; > > > > const > > > > Constantifying this results in compiler giving warnings > > drivers/hid/apple-ibridge.c:78:23: warning: initialization discards > 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] > 78 | { 0x00200041, &appleib_sub_hid_ids[1] }, | > ^ drivers/hid/apple-ibridge.c: In function > 'appleib_add_sub_dev': drivers/hid/apple-ibridge.c:363:29: warning: > assignment discards 'const' qualifier from pointer target type > [-Wdiscarded-qualifiers] 363 | sub_hdev->ll_driver = > &appleib_ll_driver; | ^ > drivers/hid/apple-ibridge.c: In function 'appleib_hid_probe': > drivers/hid/apple-ibridge.c:436:12: error: expected '(' before > 'hid_is_usb' 436 | if hid_is_usb(hdev) | ^~~~~~~~~~ > | ( > In file included from drivers/hid/apple-ibridge.c:48: > drivers/hid/apple-ibridge.c: In function 'appleib_probe': > drivers/hid/apple-ibridge.c:544:35: warning: passing argument 1 of > '__hid_register_driver' discards 'const' qualifier from pointer > target type [-Wdiscarded-qualifiers] 544 | ret = > hid_register_driver(&appleib_hid_driver); | > ^~~~~~~~~~~~~~~~~~~ ./include/linux/hid.h:898:31: note: in > definition of macro 'hid_register_driver' 898 | > __hid_register_driver(driver, THIS_MODULE, KBUILD_MODNAME) | > ^~~~~~ ./include/linux/hid.h:893:47: note: > expected 'struct hid_driver *' but argument is of type 'const struct > hid_driver *' 893 | extern int __must_check > __hid_register_driver(struct hid_driver *, | > ^~~~~~~~~~~~~~~~~~~ drivers/hid/apple-ibridge.c: > In function 'appleib_remove': drivers/hid/apple-ibridge.c:558:31: > warning: passing argument 1 of 'hid_unregister_driver' discards > 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] > 558 | hid_unregister_driver(&appleib_hid_driver); | > ^~~~~~~~~~~~~~~~~~~ ./include/linux/hid.h:900:35: > note: expected 'struct hid_driver *' but argument is of type 'const > struct hid_driver *' 900 | extern void hid_unregister_driver(struct > hid_driver *); | > ^~~~~~~~~~~~~~~~~~~ make[6]: *** [scripts/Makefile.build:250: > drivers/hid/apple-ibridge.o] Error 1 make[5]: *** > [scripts/Makefile.build:500: drivers/hid] Error 2 make[5]: *** > Waiting for unfinished jobs…. > > Some warnings are also due to a typo in if and constantifying `static > struct hid_driver`, although they probably can be fixed. > > In short, Thomas, do you really want me to constantify the structure > I am talking about in this email, as well `static struct hid_driver`? > Were the changes needed for these structs to be const in the linux-input tree for 6.3? If so then if you're applying the patches onto linus' tree that might be why there are errors about consts. ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip. 2023-02-10 12:20 ` Orlando Chamberlain @ 2023-02-10 13:07 ` Aditya Garg 2023-02-10 14:01 ` Benjamin Tissoires 0 siblings, 1 reply; 32+ messages in thread From: Aditya Garg @ 2023-02-10 13:07 UTC (permalink / raw) To: Orlando Chamberlain Cc: Thomas Weißschuh, Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby > Were the changes needed for these structs to be const in the > linux-input tree for 6.3? If so then if you're applying the patches > onto linus' tree that might be why there are errors about consts. I’d want the maintainers comment on this. Imo, these 2 structures needn’t be constantified. Also, it would be nice if we could get a review on the other 2 patches, so that a v2 can be prepared. ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip. 2023-02-10 13:07 ` Aditya Garg @ 2023-02-10 14:01 ` Benjamin Tissoires 0 siblings, 0 replies; 32+ messages in thread From: Benjamin Tissoires @ 2023-02-10 14:01 UTC (permalink / raw) To: Aditya Garg Cc: Orlando Chamberlain, Thomas Weißschuh, Jiri Kosina, jkosina, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby On Feb 10 2023, Aditya Garg wrote: > > > Were the changes needed for these structs to be const in the > > linux-input tree for 6.3? If so then if you're applying the patches > > onto linus' tree that might be why there are errors about consts. > > I’d want the maintainers comment on this. Imo, these 2 structures needn’t be constantified. The struct hid_ll_driver has to be constified, because otherwise it will introduce an error/warning when this patch is merged in the hid tree. For the struct hid_driver, as mentioned previously I don't think we have the hid-core changes for that, and so you can't really constify them. Cheers, Benjamin > > Also, it would be nice if we could get a review on the other 2 patches, so that a v2 can be prepared. ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip. 2023-02-10 12:05 ` Aditya Garg 2023-02-10 12:20 ` Orlando Chamberlain @ 2023-02-10 15:33 ` Thomas Weißschuh 2023-02-10 15:49 ` Aditya Garg 1 sibling, 1 reply; 32+ messages in thread From: Thomas Weißschuh @ 2023-02-10 15:33 UTC (permalink / raw) To: Aditya Garg Cc: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain Responses inline On Fri, Feb 10, 2023 at 12:05:13PM +0000, Aditya Garg wrote: > > On 10-Feb-2023, at 10:26 AM, Thomas Weißschuh <thomas@t-8ch.de> wrote: > > > > Hi, > > > > some comments inline. > > > > On Fri, Feb 10, 2023 at 03:43:24AM +0000, Aditya Garg wrote: > > > >> + > >> +static struct { > >> + unsigned int usage; > >> + struct hid_device_id *dev_id; > >> +} appleib_usage_map[] = { > >> + /* Default iBridge configuration, key inputs and mode settings */ > >> + { 0x00010006, &appleib_sub_hid_ids[0] }, > >> + /* OS X iBridge configuration, digitizer inputs */ > >> + { 0x000D0005, &appleib_sub_hid_ids[0] }, > >> + /* All iBridge configurations, display/DFR settings */ > >> + { 0xFF120001, &appleib_sub_hid_ids[0] }, > >> + /* All iBridge configurations, ALS */ > >> + { 0x00200041, &appleib_sub_hid_ids[1] }, > >> +}; > > > > const > > > > Constantifying this results in compiler giving warnings > > drivers/hid/apple-ibridge.c:78:23: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] > 78 | { 0x00200041, &appleib_sub_hid_ids[1] }, For this you also have to constify the hid_device_id *dev_id in appleib_usage_map. And then propagate this change to some functions and variables. > | ^ > drivers/hid/apple-ibridge.c: In function 'appleib_add_sub_dev': > drivers/hid/apple-ibridge.c:363:29: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] > 363 | sub_hdev->ll_driver = &appleib_ll_driver; As Benjamin said this is because your changes are based on Linus' tree but they will break as soon as they will be merged into the HID tree. You should base your changes off of the HID tree: https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git/log/?h=for-6.3/hid-core This issue is essentially unlucky timing. > | ^ > drivers/hid/apple-ibridge.c: In function 'appleib_hid_probe': > drivers/hid/apple-ibridge.c:436:12: error: expected '(' before 'hid_is_usb' > 436 | if hid_is_usb(hdev) > | ^~~~~~~~~~ > | ( As the error message indicates, this is invalid syntax and missing a '('. What you want to do is to check for if (!hid_is_usb(hdev)) return -ENODEV; *before* calling hid_to_usb_dev(hdev); > In file included from drivers/hid/apple-ibridge.c:48: > drivers/hid/apple-ibridge.c: In function 'appleib_probe': > drivers/hid/apple-ibridge.c:544:35: warning: passing argument 1 of '__hid_register_driver' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] > 544 | ret = hid_register_driver(&appleib_hid_driver); > | ^~~~~~~~~~~~~~~~~~~ > ./include/linux/hid.h:898:31: note: in definition of macro 'hid_register_driver' > 898 | __hid_register_driver(driver, THIS_MODULE, KBUILD_MODNAME) > | ^~~~~~ > ./include/linux/hid.h:893:47: note: expected 'struct hid_driver *' but argument is of type 'const struct hid_driver *' > 893 | extern int __must_check __hid_register_driver(struct hid_driver *, > | ^~~~~~~~~~~~~~~~~~~ > drivers/hid/apple-ibridge.c: In function 'appleib_remove': > drivers/hid/apple-ibridge.c:558:31: warning: passing argument 1 of 'hid_unregister_driver' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] > 558 | hid_unregister_driver(&appleib_hid_driver); > | ^~~~~~~~~~~~~~~~~~~ > ./include/linux/hid.h:900:35: note: expected 'struct hid_driver *' but argument is of type 'const struct hid_driver *' > 900 | extern void hid_unregister_driver(struct hid_driver *); > | ^~~~~~~~~~~~~~~~~~~ These are all because applib_hid_driver can not be const. Sorry for the wrong advice. Benjamin: HID drivers can not be const because they embed a 'struct driver' that is needed by the driver core to be mutable. Fixing this is probably a larger enterprise. > make[6]: *** [scripts/Makefile.build:250: drivers/hid/apple-ibridge.o] Error 1 > make[5]: *** [scripts/Makefile.build:500: drivers/hid] Error 2 > make[5]: *** Waiting for unfinished jobs…. > > Some warnings are also due to a typo in if and constantifying `static struct hid_driver`, although they probably can > be fixed. > > In short, Thomas, do you really want me to constantify the structure I > am talking about in this email, as well `static struct hid_driver`? struct hid_driver: Don't constify all others: Do constify Thomas ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip. 2023-02-10 15:33 ` Thomas Weißschuh @ 2023-02-10 15:49 ` Aditya Garg 2023-02-10 18:36 ` Thomas Weißschuh 0 siblings, 1 reply; 32+ messages in thread From: Aditya Garg @ 2023-02-10 15:49 UTC (permalink / raw) To: Thomas Weißschuh Cc: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain > On 10-Feb-2023, at 9:04 PM, Thomas Weißschuh <thomas@t-8ch.de> wrote: > > Responses inline > > On Fri, Feb 10, 2023 at 12:05:13PM +0000, Aditya Garg wrote: >>>> On 10-Feb-2023, at 10:26 AM, Thomas Weißschuh <thomas@t-8ch.de> wrote: >>> >>> Hi, >>> >>> some comments inline. >>> >>>> On Fri, Feb 10, 2023 at 03:43:24AM +0000, Aditya Garg wrote: >>> >>>> + >>>> +static struct { >>>> + unsigned int usage; >>>> + struct hid_device_id *dev_id; >>>> +} appleib_usage_map[] = { >>>> + /* Default iBridge configuration, key inputs and mode settings */ >>>> + { 0x00010006, &appleib_sub_hid_ids[0] }, >>>> + /* OS X iBridge configuration, digitizer inputs */ >>>> + { 0x000D0005, &appleib_sub_hid_ids[0] }, >>>> + /* All iBridge configurations, display/DFR settings */ >>>> + { 0xFF120001, &appleib_sub_hid_ids[0] }, >>>> + /* All iBridge configurations, ALS */ >>>> + { 0x00200041, &appleib_sub_hid_ids[1] }, >>>> +}; >>> >>> const >>> >> >> Constantifying this results in compiler giving warnings >> >> drivers/hid/apple-ibridge.c:78:23: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] >> 78 | { 0x00200041, &appleib_sub_hid_ids[1] }, > > For this you also have to constify the hid_device_id *dev_id in > appleib_usage_map. And then propagate this change to some functions and > variables. > >> | ^ >> drivers/hid/apple-ibridge.c: In function 'appleib_add_sub_dev': >> drivers/hid/apple-ibridge.c:363:29: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] >> 363 | sub_hdev->ll_driver = &appleib_ll_driver; > > As Benjamin said this is because your changes are based on Linus' tree > but they will break as soon as they will be merged into the HID tree. > You should base your changes off of the HID tree: > https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git/log/?h=for-6.3/hid-core > > This issue is essentially unlucky timing. > >> | ^ >> drivers/hid/apple-ibridge.c: In function 'appleib_hid_probe': >> drivers/hid/apple-ibridge.c:436:12: error: expected '(' before 'hid_is_usb' >> 436 | if hid_is_usb(hdev) >> | ^~~~~~~~~~ >> | ( > > As the error message indicates, this is invalid syntax and missing a > '('. > What you want to do is to check for > > if (!hid_is_usb(hdev)) > return -ENODEV; It was a typo on my part + /* check and set usb config first */ + if (hid_is_usb(hdev)) + udev = hid_to_usb_dev(hdev); + else + return -EINVAL; This is what I have in my patch set now. If there is something wrong with this, then do tell me Thanks > > *before* calling hid_to_usb_dev(hdev); > >> In file included from drivers/hid/apple-ibridge.c:48: >> drivers/hid/apple-ibridge.c: In function 'appleib_probe': >> drivers/hid/apple-ibridge.c:544:35: warning: passing argument 1 of '__hid_register_driver' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] >> 544 | ret = hid_register_driver(&appleib_hid_driver); >> | ^~~~~~~~~~~~~~~~~~~ >> ./include/linux/hid.h:898:31: note: in definition of macro 'hid_register_driver' >> 898 | __hid_register_driver(driver, THIS_MODULE, KBUILD_MODNAME) >> | ^~~~~~ >> ./include/linux/hid.h:893:47: note: expected 'struct hid_driver *' but argument is of type 'const struct hid_driver *' >> 893 | extern int __must_check __hid_register_driver(struct hid_driver *, >> | ^~~~~~~~~~~~~~~~~~~ >> drivers/hid/apple-ibridge.c: In function 'appleib_remove': >> drivers/hid/apple-ibridge.c:558:31: warning: passing argument 1 of 'hid_unregister_driver' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] >> 558 | hid_unregister_driver(&appleib_hid_driver); >> | ^~~~~~~~~~~~~~~~~~~ >> ./include/linux/hid.h:900:35: note: expected 'struct hid_driver *' but argument is of type 'const struct hid_driver *' >> 900 | extern void hid_unregister_driver(struct hid_driver *); >> | ^~~~~~~~~~~~~~~~~~~ > > These are all because applib_hid_driver can not be const. > Sorry for the wrong advice. > > Benjamin: > HID drivers can not be const because they embed a 'struct driver' that > is needed by the driver core to be mutable. > Fixing this is probably a larger enterprise. > >> make[6]: *** [scripts/Makefile.build:250: drivers/hid/apple-ibridge.o] Error 1 >> make[5]: *** [scripts/Makefile.build:500: drivers/hid] Error 2 >> make[5]: *** Waiting for unfinished jobs…. >> >> Some warnings are also due to a typo in if and constantifying `static struct hid_driver`, although they probably can >> be fixed. >> >> In short, Thomas, do you really want me to constantify the structure I >> am talking about in this email, as well `static struct hid_driver`? > > struct hid_driver: Don't constify > all others: Do constify > > Thomas ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip. 2023-02-10 15:49 ` Aditya Garg @ 2023-02-10 18:36 ` Thomas Weißschuh 0 siblings, 0 replies; 32+ messages in thread From: Thomas Weißschuh @ 2023-02-10 18:36 UTC (permalink / raw) To: Aditya Garg Cc: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, andy.shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain Feb 10, 2023 08:50:12 Aditya Garg <gargaditya08@live.com>: > > >> On 10-Feb-2023, at 9:04 PM, Thomas Weißschuh <thomas@t-8ch.de> wrote: >> >> Responses inline >> >> On Fri, Feb 10, 2023 at 12:05:13PM +0000, Aditya Garg wrote: >>>>> On 10-Feb-2023, at 10:26 AM, Thomas Weißschuh <thomas@t-8ch.de> wrote: >>>> >>>> Hi, >>>> >>>> some comments inline. >>>> >>>>> On Fri, Feb 10, 2023 at 03:43:24AM +0000, Aditya Garg wrote: >>>> >>>>> + >>>>> +static struct { >>>>> + unsigned int usage; >>>>> + struct hid_device_id *dev_id; >>>>> +} appleib_usage_map[] = { >>>>> + /* Default iBridge configuration, key inputs and mode settings */ >>>>> + { 0x00010006, &appleib_sub_hid_ids[0] }, >>>>> + /* OS X iBridge configuration, digitizer inputs */ >>>>> + { 0x000D0005, &appleib_sub_hid_ids[0] }, >>>>> + /* All iBridge configurations, display/DFR settings */ >>>>> + { 0xFF120001, &appleib_sub_hid_ids[0] }, >>>>> + /* All iBridge configurations, ALS */ >>>>> + { 0x00200041, &appleib_sub_hid_ids[1] }, >>>>> +}; >>>> >>>> const >>>> >>> >>> Constantifying this results in compiler giving warnings >>> >>> drivers/hid/apple-ibridge.c:78:23: warning: initialization discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] >>> 78 | { 0x00200041, &appleib_sub_hid_ids[1] }, >> >> For this you also have to constify the hid_device_id *dev_id in >> appleib_usage_map. And then propagate this change to some functions and >> variables. >> >>> | ^ >>> drivers/hid/apple-ibridge.c: In function 'appleib_add_sub_dev': >>> drivers/hid/apple-ibridge.c:363:29: warning: assignment discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] >>> 363 | sub_hdev->ll_driver = &appleib_ll_driver; >> >> As Benjamin said this is because your changes are based on Linus' tree >> but they will break as soon as they will be merged into the HID tree. >> You should base your changes off of the HID tree: >> https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git/log/?h=for-6.3/hid-core >> >> This issue is essentially unlucky timing. >> >>> | ^ >>> drivers/hid/apple-ibridge.c: In function 'appleib_hid_probe': >>> drivers/hid/apple-ibridge.c:436:12: error: expected '(' before 'hid_is_usb' >>> 436 | if hid_is_usb(hdev) >>> | ^~~~~~~~~~ >>> | ( >> >> As the error message indicates, this is invalid syntax and missing a >> '('. >> What you want to do is to check for >> >> if (!hid_is_usb(hdev)) >> return -ENODEV; > > It was a typo on my part > > + /* check and set usb config first */ > + if (hid_is_usb(hdev)) > + udev = hid_to_usb_dev(hdev); > + else > + return -EINVAL; I would prefer if (!hid_is_usb(hdev)) return -EINVAL; udev = hid_to_usb_dev(hdev); > > This is what I have in my patch set now. > > If there is something wrong with this, then do tell me > > Thanks >> >> *before* calling hid_to_usb_dev(hdev); >> >>> In file included from drivers/hid/apple-ibridge.c:48: >>> drivers/hid/apple-ibridge.c: In function 'appleib_probe': >>> drivers/hid/apple-ibridge.c:544:35: warning: passing argument 1 of '__hid_register_driver' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] >>> 544 | ret = hid_register_driver(&appleib_hid_driver); >>> | ^~~~~~~~~~~~~~~~~~~ >>> ./include/linux/hid.h:898:31: note: in definition of macro 'hid_register_driver' >>> 898 | __hid_register_driver(driver, THIS_MODULE, KBUILD_MODNAME) >>> | ^~~~~~ >>> ./include/linux/hid.h:893:47: note: expected 'struct hid_driver *' but argument is of type 'const struct hid_driver *' >>> 893 | extern int __must_check __hid_register_driver(struct hid_driver *, >>> | ^~~~~~~~~~~~~~~~~~~ >>> drivers/hid/apple-ibridge.c: In function 'appleib_remove': >>> drivers/hid/apple-ibridge.c:558:31: warning: passing argument 1 of 'hid_unregister_driver' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] >>> 558 | hid_unregister_driver(&appleib_hid_driver); >>> | ^~~~~~~~~~~~~~~~~~~ >>> ./include/linux/hid.h:900:35: note: expected 'struct hid_driver *' but argument is of type 'const struct hid_driver *' >>> 900 | extern void hid_unregister_driver(struct hid_driver *); >>> | ^~~~~~~~~~~~~~~~~~~ >> >> These are all because applib_hid_driver can not be const. >> Sorry for the wrong advice. >> >> Benjamin: >> HID drivers can not be const because they embed a 'struct driver' that >> is needed by the driver core to be mutable. >> Fixing this is probably a larger enterprise. >> >>> make[6]: *** [scripts/Makefile.build:250: drivers/hid/apple-ibridge.o] Error 1 >>> make[5]: *** [scripts/Makefile.build:500: drivers/hid] Error 2 >>> make[5]: *** Waiting for unfinished jobs…. >>> >>> Some warnings are also due to a typo in if and constantifying `static struct hid_driver`, although they probably can >>> be fixed. >>> >>> In short, Thomas, do you really want me to constantify the structure I >>> am talking about in this email, as well `static struct hid_driver`? >> >> struct hid_driver: Don't constify >> all others: Do constify >> >> Thomas ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip. 2023-02-10 3:43 ` [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip Aditya Garg 2023-02-10 3:44 ` [PATCH 2/3] HID: apple-touchbar: Add driver for the Touch Bar on MacBook Pros Aditya Garg 2023-02-10 4:56 ` [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip Thomas Weißschuh @ 2023-02-12 11:35 ` Andy Shevchenko 2 siblings, 0 replies; 32+ messages in thread From: Andy Shevchenko @ 2023-02-12 11:35 UTC (permalink / raw) To: Aditya Garg Cc: Jiri Kosina, jkosina, benjamin.tissoires, LKML, linux-input, ronald, kekrby, Orlando Chamberlain On Fri, Feb 10, 2023 at 03:43:24AM +0000, Aditya Garg wrote: > From: Ronald Tschalär <ronald@innovation.ch> > > The iBridge device provides access to several devices, including: > - the Touch Bar > - the iSight webcam > - the light sensor > - the fingerprint sensor > > This driver provides the core support for managing the iBridge device > and the access to the underlying devices. In particular, the > functionality for the touch bar and light sensor is exposed via USB HID > interfaces, and on devices with the T1 chip one of the HID devices is > used for both functions. So this driver creates virtual HID devices, one > per top-level report collection on each HID device (for a total of 3 > virtual HID devices). The sub-drivers then bind to these virtual HID > devices. > > This way the Touch Bar and ALS drivers can be kept in their own modules, > while at the same time making them look very much like as if they were > connected to the real HID devices. And those drivers then work (mostly) > without further changes on MacBooks with the T2 chip that don't need > this driver. ... > [Kerem Karabay: convert to a platform driver] > [Kerem Karabay: fix appleib_forward_int_op] > [Kerem Karabay: rely on HID core's parsing in appleib_add_device] If somebody is going to update this (and update seems required for upstreaming) the list of changes will grow. I suggest to consider Co-developed-by and move these lines to cover-letter changelog. > Signed-off-by: Kerem Karabay <kekrby@gmail.com> ... > +#include <linux/platform_device.h> > +#include <linux/acpi.h> > +#include <linux/device.h> > +#include <linux/hid.h> > +#include <linux/list.h> > +#include <linux/module.h> > +#include <linux/slab.h> > +#include <linux/usb.h> Can we keep it sorted? > +#include "hid-ids.h" > +#include "../hid/usbhid/usbhid.h" + Blank line? > +#include "apple-ibridge.h" ... > +static struct hid_device_id appleib_sub_hid_ids[] = { > + { HID_USB_DEVICE(USB_VENDOR_ID_LINUX_FOUNDATION, > + USB_DEVICE_ID_IBRIDGE_TB) }, > + { HID_USB_DEVICE(USB_VENDOR_ID_LINUX_FOUNDATION, > + USB_DEVICE_ID_IBRIDGE_ALS) }, > +}; > + > +static struct { > + unsigned int usage; > + struct hid_device_id *dev_id; > +} appleib_usage_map[] = { > + /* Default iBridge configuration, key inputs and mode settings */ > + { 0x00010006, &appleib_sub_hid_ids[0] }, > + /* OS X iBridge configuration, digitizer inputs */ > + { 0x000D0005, &appleib_sub_hid_ids[0] }, > + /* All iBridge configurations, display/DFR settings */ > + { 0xFF120001, &appleib_sub_hid_ids[0] }, > + /* All iBridge configurations, ALS */ > + { 0x00200041, &appleib_sub_hid_ids[1] }, > +}; Shouldn't be other way around, i.e. via driver_data? ... > +struct appleib_device { > + acpi_handle asoc_socw; > +}; What's the point of having struct out of a single member? Can you use it directly? (you can try and see if it's not ugly, in some cases struct can be justified) ... > + bool sub_open[ARRAY_SIZE(appleib_sub_hid_ids)]; Why not using bitmap? DECLARE_BITMAP(sub_open, ARRAY_SIZE(...)); ... > +static __u8 *appleib_report_fixup(struct hid_device *hdev, __u8 *rdesc, > + unsigned int *rsize) Why __ types are in use? Is it part of ABI? ... > +static int appleib_forward_int_op(struct hid_device *hdev, > + int (*forward)(struct hid_driver *, > + struct hid_device *, void *), This can be on one line > + void *args) ... > + if (drv->suspend) > + rc = drv->suspend(hdev, *(pm_message_t *)args); This looks like a hack. What's going on here and why the pm_message_t is in use? All new PM callbacks do not use it. ... > + for (i = 0; i < ARRAY_SIZE(hdev_info->sub_hdevs); i++) { > + /* > + * hid_hw_open(), and hence appleib_ll_open(), is called > + * from the driver's probe function, which in turn is called > + * while adding the sub-hdev; but at this point we haven't yet > + * added the sub-hdev to our list. So if we don't find the > + * sub-hdev in our list assume it's in the process of being > + * added and set the flag on the first unset sub-hdev. > + */ > + if (hdev_info->sub_hdevs[i] == hdev || > + !hdev_info->sub_hdevs[i]) { Unusual order of || operator arguments. This will have a side effect, i.e. if hdev is equal to NULL it will go to the true branch. Is it by design? > + WRITE_ONCE(hdev_info->sub_open[i], open); > + return 0; > + } > + } ... > + while (i-- > 0) while (i--) ? > + hid_destroy_device(hdev_info->sub_hdevs[i]); > + return (void *)hdev_info->sub_hdevs[i]; This casting is strange. And entire code piece. You will always return 0 element as a pointer here, why 'i'? Needs a lot of explanation. ... > +static const struct hid_device_id appleib_hid_ids[] = { > + { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IBRIDGE) }, > + { }, No comma for the terminator entry. > +}; ... > +#ifdef CONFIG_PM > + .suspend = appleib_hid_suspend, > + .resume = appleib_hid_resume, > + .reset_resume = appleib_hid_reset_resume, > +#endif Why not using .driver = { .pm = ...; }, ? ... > + ret = hid_register_driver(&appleib_hid_driver); > + if (ret) { > + dev_err(&pdev->dev, "Error registering hid driver: %d\n", > + ret); > + return ret; return dev_err_probe(...); > + } ... > +static int appleib_suspend(struct platform_device *pdev, pm_message_t message) > +{ > + struct appleib_device *ib_dev; > + int rc; > + ib_dev = platform_get_drvdata(pdev); Just unite it with the definition above. Ditto for the similar cases here and there. > + rc = acpi_execute_simple_method(ib_dev->asoc_socw, NULL, 0); > + if (ACPI_FAILURE(rc)) > + dev_warn(&pdev->dev, "SOCW(0) failed: %s\n", > + acpi_format_exception(rc)); > + > + return 0; > +} ... > +static const struct acpi_device_id appleib_acpi_match[] = { > + { "APP7777", 0 }, > + { }, No comma for terminator entry. > +}; -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 0/3] Touch Bar and Keyboard backlight driver for Intel Macs 2023-02-10 3:41 [PATCH 0/3] Touch Bar and Keyboard backlight driver for Intel Macs Aditya Garg 2023-02-10 3:43 ` [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip Aditya Garg @ 2023-02-10 10:18 ` Andy Shevchenko 2023-02-10 10:41 ` Aditya Garg 1 sibling, 1 reply; 32+ messages in thread From: Andy Shevchenko @ 2023-02-10 10:18 UTC (permalink / raw) To: Aditya Garg Cc: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain On Fri, Feb 10, 2023 at 5:41 AM Aditya Garg <gargaditya08@live.com> wrote: > > Greetings from t2linux! > > 2 years ago an attempt was made to send the driver for the Touch Bar on > MacBook Pros by Ronald Tschalär [1]. > > Due to some issues pointed out by the maintainers upstream, unfortunately > it didn't make it upstream. Now we at t2linux [2] have addressed those > issues in this patchset and also improved the touchbar driver for the T2 > Macs. We also have added a new driver for keyboard backlight support on > T2 MacBooks with Magic Keyboard. > > The first 2 patches of this patchset are the ones sent by Ronald before, > with the issues addressed as pointed out in [1]. > > The third patch introduces a new driver, apple-magic-backlight, which adds > support for keyboard backlight on T2 MacBooks with the Magic Keyboard. > > Note: Apart from these drivers, for the T2 Macs, an additional driver > shall be required to communicate with the T2 Security Chip, as the Touch > Bar, the internal keyboard, trackpad, camera, ambient light sensor, > headphone controls, and NCM Ethernet are accessed through a USB VHCI > created with DMA channels to the "T2 Bridge Controller" 106b:1801 PCI > device. A work in progress linux driver called apple-bce [3], or USB > device passthrough to a Linux VM guest on a Windows host with Apple > Bootcamp drivers can be used to get Linux these USB devices working and > test these patches. > > [1] https://lore.kernel.org/lkml/20210228012643.69944-1-ronald@innovation.ch/ > [2] https://t2linux.org/ > [3] https://github.com/t2linux/apple-bce-drv Quick observation. Do you miss the Co-developed-by: tags in the patches? -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 0/3] Touch Bar and Keyboard backlight driver for Intel Macs 2023-02-10 10:18 ` [PATCH 0/3] Touch Bar and Keyboard backlight driver for Intel Macs Andy Shevchenko @ 2023-02-10 10:41 ` Aditya Garg 2023-02-10 10:47 ` Orlando Chamberlain 0 siblings, 1 reply; 32+ messages in thread From: Aditya Garg @ 2023-02-10 10:41 UTC (permalink / raw) To: Andy Shevchenko Cc: Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, LKML, linux-input, ronald, kekrby, Orlando Chamberlain, Thomas Weißschuh > > Quick observation. Do you miss the Co-developed-by: tags in the patches? Most of the changes are minor in the 1st and 2nd patch, we haven't changed most of the code. The changes were written as per the documentation given in https://www.kernel.org/doc/html/latest/maintainer/modifying-patches.html Do you think a Co-developed-by is still required? The third patch was actually written by 2 people, so there is a Co-developed-by there. > > -- > With Best Regards, > Andy Shevchenko ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 0/3] Touch Bar and Keyboard backlight driver for Intel Macs 2023-02-10 10:41 ` Aditya Garg @ 2023-02-10 10:47 ` Orlando Chamberlain 2023-02-10 11:12 ` Andy Shevchenko 0 siblings, 1 reply; 32+ messages in thread From: Orlando Chamberlain @ 2023-02-10 10:47 UTC (permalink / raw) To: Aditya Garg Cc: Andy Shevchenko, Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, LKML, linux-input, ronald, kekrby, Thomas Weißschuh On Fri, 10 Feb 2023 10:41:07 +0000 Aditya Garg <gargaditya08@live.com> wrote: > > > > Quick observation. Do you miss the Co-developed-by: tags in the > > patches? > > Most of the changes are minor in the 1st and 2nd patch, we haven't > changed most of the code. The changes were written as per the > documentation given in > https://www.kernel.org/doc/html/latest/maintainer/modifying-patches.html > > Do you think a Co-developed-by is still required? > > The third patch was actually written by 2 people, so there is a > Co-developed-by there. > To add onto this, for patches 1 and 2, as we haven't been able to contact the original author (Ronald), I think the only ways we are allowed to make changes are either doing them in separate patches, or with the [name <email>: changes] tags. For the latter I thought you had to do a Signed-off-by after it, but given the changes aren't just to make the patch apply on a newer version, do you think the Co-developed-by tag is also needed? > > > > -- > > With Best Regards, > > Andy Shevchenko > ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 0/3] Touch Bar and Keyboard backlight driver for Intel Macs 2023-02-10 10:47 ` Orlando Chamberlain @ 2023-02-10 11:12 ` Andy Shevchenko 0 siblings, 0 replies; 32+ messages in thread From: Andy Shevchenko @ 2023-02-10 11:12 UTC (permalink / raw) To: Orlando Chamberlain Cc: Aditya Garg, Jiri Kosina, jkosina, benjamin.tissoires, Andy Shevchenko, LKML, linux-input, ronald, kekrby, Thomas Weißschuh On Fri, Feb 10, 2023 at 12:47 PM Orlando Chamberlain <orlandoch.dev@gmail.com> wrote: > On Fri, 10 Feb 2023 10:41:07 +0000 > Aditya Garg <gargaditya08@live.com> wrote: ... > > > Quick observation. Do you miss the Co-developed-by: tags in the > > > patches? > > > > Most of the changes are minor in the 1st and 2nd patch, we haven't > > changed most of the code. The changes were written as per the > > documentation given in > > https://www.kernel.org/doc/html/latest/maintainer/modifying-patches.html > > > > Do you think a Co-developed-by is still required? > > > > The third patch was actually written by 2 people, so there is a > > Co-developed-by there. > > > > To add onto this, for patches 1 and 2, as we haven't been able to > contact the original author (Ronald), I think the only ways we are > allowed to make changes are either doing them in separate patches, or > with the [name <email>: changes] tags. For the latter I thought you had > to do a Signed-off-by after it, but given the changes aren't just to > make the patch apply on a newer version, do you think the > Co-developed-by tag is also needed? I'm not insisting, just asking :-) So, if you think it's not needed, fine to me! -- With Best Regards, Andy Shevchenko ^ permalink raw reply [flat|nested] 32+ messages in thread
end of thread, other threads:[~2023-02-16 1:17 UTC | newest] Thread overview: 32+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-02-10 3:41 [PATCH 0/3] Touch Bar and Keyboard backlight driver for Intel Macs Aditya Garg 2023-02-10 3:43 ` [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip Aditya Garg 2023-02-10 3:44 ` [PATCH 2/3] HID: apple-touchbar: Add driver for the Touch Bar on MacBook Pros Aditya Garg 2023-02-10 3:45 ` [PATCH 3/3] HID: apple-magic-backlight: Add driver for keyboard backlight on internal Magic Keyboards Aditya Garg 2023-02-10 16:25 ` Thomas Weißschuh 2023-02-10 23:24 ` Orlando Chamberlain 2023-02-11 2:23 ` Thomas Weißschuh 2023-02-11 2:42 ` Thomas Weißschuh 2023-02-11 16:56 ` Pavel Machek 2023-02-12 2:28 ` Orlando Chamberlain 2023-02-12 5:16 ` Aditya Garg 2023-02-12 11:18 ` Andy Shevchenko 2023-02-16 1:17 ` Orlando Chamberlain 2023-02-10 16:13 ` [PATCH 2/3] HID: apple-touchbar: Add driver for the Touch Bar on MacBook Pros Thomas Weißschuh 2023-02-12 11:56 ` Andy Shevchenko 2023-02-10 4:56 ` [PATCH 1/3] HID: apple-ibridge: Add Apple iBridge HID driver for T1 chip Thomas Weißschuh 2023-02-10 8:30 ` Aditya Garg 2023-02-10 8:39 ` Benjamin Tissoires 2023-02-10 8:54 ` Aditya Garg 2023-02-10 9:21 ` Benjamin Tissoires 2023-02-10 12:05 ` Aditya Garg 2023-02-10 12:20 ` Orlando Chamberlain 2023-02-10 13:07 ` Aditya Garg 2023-02-10 14:01 ` Benjamin Tissoires 2023-02-10 15:33 ` Thomas Weißschuh 2023-02-10 15:49 ` Aditya Garg 2023-02-10 18:36 ` Thomas Weißschuh 2023-02-12 11:35 ` Andy Shevchenko 2023-02-10 10:18 ` [PATCH 0/3] Touch Bar and Keyboard backlight driver for Intel Macs Andy Shevchenko 2023-02-10 10:41 ` Aditya Garg 2023-02-10 10:47 ` Orlando Chamberlain 2023-02-10 11:12 ` Andy Shevchenko
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.