| Message ID | 20201228133831.17464-1-Perry_Yuan@Dell.com |
|---|---|
| State | New |
| Headers | show |
| Series | None | expand |
On Mon, Dec 28, 2020 at 09:38:31PM +0800, Perry Yuan wrote: > From: Perry Yuan <perry_yuan@dell.com> > > Some new Dell system is going to support audio internal micphone > privacy setting from hardware level with micmute led state changing I'm missing patch 1 of this series - what's the story with dependencies and so on?
> -----Original Message----- > From: Mark Brown <broonie@kernel.org> > Sent: Tuesday, December 29, 2020 8:41 PM > To: Yuan, Perry > Cc: oder_chiou@realtek.com; perex@perex.cz; tiwai@suse.com; > lgirdwood@gmail.com; alsa-devel@alsa-project.org; linux- > kernel@vger.kernel.org; Limonciello, Mario > Subject: Re: [PATCH v2 2/2] ASoC: rt715:add Mic Mute LED control support > > On Mon, Dec 28, 2020 at 09:38:31PM +0800, Perry Yuan wrote: > > From: Perry Yuan <perry_yuan@dell.com> > > > > Some new Dell system is going to support audio internal micphone > > privacy setting from hardware level with micmute led state changing > > I'm missing patch 1 of this series - what's the story with dependencies and so > on? HI Mark: Sorry to make this confused. The two patches are not in the same module, I use different cc list for each patch. I will send another v3 looping all the cc list and some new improvement. From: Perry Yuan <perry_yuan@dell.com> add support for dell privacy driver for the dell units equipped hardware privacy design, which protect users privacy of audio and camera from hardware level. once the audio or camera privacy mode enabled, any applications will not get any audio or video stream. when user pressed ctrl+F4 hotkey, audio privacy mode will be enabled,Micmute led will be also changed accordingly. The micmute led is fully controlled by hardware & EC. and camera mute hotkey is ctrl+F9.currently design only emmit SW_CAMERA_LENS_COVER event while the camera LENS shutter will be changed by EC & HW control. *The flow is like this: 1) User presses key. HW does stuff with this key (timeout is started) 2) Event is emitted from FW 3) Event received by dell-privacy 4) KEY_MICMUTE emitted from dell-privacy 5) Userland picks up key and modifies kcontrol for SW mute 6) Codec kernel driver catches and calls ledtrig_audio_set, like this: ledtrig_audio_set(LED_AUDIO_MICMUTE, rt715->micmute_led ? LED_ON :LED_OFF); 7) If "LED" is set to on dell-privacy notifies ec, and timeout is cancelled,HW mic mute activated. Signed-off-by: Perry Yuan <perry_yuan@dell.com> Signed-off-by: Limonciello Mario <mario_limonciello@dell.com> --- v1 -> v2: * query EC handle from EC driver directly. * fix some code style. * add KEY_END to keymap array. * clean platform device when cleanup called * use hexadecimal format for log print in dev_dbg * remove __set_bit for the report keys from probe. * fix keymap leak * add err_free_keymap in dell_privacy_wmi_probe * wmi driver will be unregistered if privacy_acpi_init() fails * add sysfs attribute files for user space query. * add leds micmute driver to privacy acpi * add more design info the commit info --- --- drivers/platform/x86/Kconfig | 17 ++ drivers/platform/x86/Makefile | 4 +- drivers/platform/x86/dell-laptop.c | 29 ++- drivers/platform/x86/dell-privacy-acpi.c | 165 ++++++++++++ drivers/platform/x86/dell-privacy-wmi.c | 309 +++++++++++++++++++++++ drivers/platform/x86/dell-privacy-wmi.h | 33 +++ drivers/platform/x86/dell-wmi.c | 26 +- 7 files changed, 567 insertions(+), 16 deletions(-) create mode 100644 drivers/platform/x86/dell-privacy-acpi.c create mode 100644 drivers/platform/x86/dell-privacy-wmi.c create mode 100644 drivers/platform/x86/dell-privacy-wmi.h diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 91e6176cdfbd..9d5cc2454b3e 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -491,6 +491,23 @@ config DELL_WMI_LED This adds support for the Latitude 2100 and similar notebooks that have an external LED. +config DELL_PRIVACY + tristate "Dell Hardware Privacy Support" + depends on ACPI + depends on ACPI_WMI + depends on INPUT + depends on DELL_LAPTOP + depends on LEDS_TRIGGER_AUDIO + select DELL_WMI + help + This driver provides support for the "Dell Hardware Privacy" feature + of Dell laptops. + Support for a micmute and camera mute privacy will be provided as + hardware button Ctrl+F4 and Ctrl+F9 hotkey + + To compile this driver as a module, choose M here: the module will + be called dell_privacy. + config AMILO_RFKILL tristate "Fujitsu-Siemens Amilo rfkill support" depends on RFKILL diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 581475f59819..18c430456de7 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -51,7 +51,9 @@ obj-$(CONFIG_DELL_WMI_DESCRIPTOR) += dell-wmi-descriptor.o obj-$(CONFIG_DELL_WMI_AIO) += dell-wmi-aio.o obj-$(CONFIG_DELL_WMI_LED) += dell-wmi-led.o obj-$(CONFIG_DELL_WMI_SYSMAN) += dell-wmi-sysman/ - +obj-$(CONFIG_DELL_PRIVACY) += dell-privacy.o +dell-privacy-objs := dell-privacy-wmi.o \ + dell-privacy-acpi.o # Fujitsu obj-$(CONFIG_AMILO_RFKILL) += amilo-rfkill.o obj-$(CONFIG_FUJITSU_LAPTOP) += fujitsu-laptop.o diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index 70edc5bb3a14..ea0c8a8099ff 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c @@ -30,6 +30,7 @@ #include <acpi/video.h> #include "dell-rbtn.h" #include "dell-smbios.h" +#include "dell-privacy-wmi.h" struct quirk_entry { bool touchpad_led; @@ -90,6 +91,7 @@ static struct rfkill *wifi_rfkill; static struct rfkill *bluetooth_rfkill; static struct rfkill *wwan_rfkill; static bool force_rfkill; +static bool privacy_valid; module_param(force_rfkill, bool, 0444); MODULE_PARM_DESC(force_rfkill, "enable rfkill on non whitelisted models"); @@ -1587,10 +1589,10 @@ static ssize_t kbd_led_timeout_store(struct device *dev, switch (unit) { case KBD_TIMEOUT_DAYS: value *= 24; - fallthrough; + /* fall through */ case KBD_TIMEOUT_HOURS: value *= 60; - fallthrough; + /* fall through */ case KBD_TIMEOUT_MINUTES: value *= 60; unit = KBD_TIMEOUT_SECONDS; @@ -2205,11 +2207,18 @@ static int __init dell_init(void) dell_laptop_register_notifier(&dell_laptop_notifier); if (dell_smbios_find_token(GLOBAL_MIC_MUTE_DISABLE) && - dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE)) { - micmute_led_cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE); - ret = led_classdev_register(&platform_device->dev, &micmute_led_cdev); - if (ret < 0) - goto fail_led; + dell_smbios_find_token(GLOBAL_MIC_MUTE_ENABLE)) { +#if IS_ENABLED(CONFIG_DELL_PRIVACY) + ret = dell_privacy_valid(); + if (!ret) + privacy_valid = true; +#endif + if (!privacy_valid) { + micmute_led_cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE); + ret = led_classdev_register(&platform_device->dev, &micmute_led_cdev); + if (ret < 0) + goto fail_led; + } } if (acpi_video_get_backlight_type() != acpi_backlight_vendor) @@ -2257,7 +2266,8 @@ static int __init dell_init(void) fail_get_brightness: backlight_device_unregister(dell_backlight_device); fail_backlight: - led_classdev_unregister(&micmute_led_cdev); + if (!privacy_valid) + led_classdev_unregister(&micmute_led_cdev); fail_led: dell_cleanup_rfkill(); fail_rfkill: @@ -2278,7 +2288,8 @@ static void __exit dell_exit(void) touchpad_led_exit(); kbd_led_exit(); backlight_device_unregister(dell_backlight_device); - led_classdev_unregister(&micmute_led_cdev); + if (!privacy_valid) + led_classdev_unregister(&micmute_led_cdev); dell_cleanup_rfkill(); if (platform_device) { platform_device_unregister(platform_device); diff --git a/drivers/platform/x86/dell-privacy-acpi.c b/drivers/platform/x86/dell-privacy-acpi.c new file mode 100644 index 000000000000..fef781555b67 --- /dev/null +++ b/drivers/platform/x86/dell-privacy-acpi.c @@ -0,0 +1,165 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Dell privacy notification driver + * + * Copyright (C) 2021 Dell Inc. All Rights Reserved. + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include <linux/acpi.h> +#include <linux/device.h> +#include <linux/fs.h> +#include <linux/kernel.h> +#include <linux/leds.h> +#include <linux/module.h> +#include <linux/string.h> +#include <linux/sysfs.h> +#include <linux/types.h> +#include <linux/wmi.h> +#include <linux/slab.h> +#include <linux/bits.h> +#include <linux/mutex.h> +#include <linux/platform_device.h> +#include "dell-privacy-wmi.h" + +#define PRIVACY_PLATFORM_NAME "dell-privacy-acpi" +#define DELL_PRIVACY_GUID "6932965F-1671-4CEB-B988-D3AB0A901919" + +struct privacy_acpi_priv { + struct device *dev; + struct platform_device *platform_device; + struct led_classdev cdev; +}; +static struct privacy_acpi_priv *privacy_acpi; + +static int dell_privacy_micmute_led_set(struct led_classdev *led_cdev, + enum led_brightness brightness) +{ + struct privacy_acpi_priv *priv = privacy_acpi; + acpi_status status; + acpi_handle handle; + char *acpi_method; + + handle = ec_get_handle(); + if (!handle) + return -EIO; + if (acpi_has_method(handle, "ECAK")) + acpi_method = "ECAK"; + else + return -ENODEV; + + status = acpi_evaluate_object(handle, acpi_method, NULL, NULL); + if (ACPI_FAILURE(status)) { + dev_err(priv->dev, "Error setting privacy EC ack value: %s\n", + acpi_format_exception(status)); + return -EIO; + } + return 0; +} + +static int dell_privacy_acpi_remove(struct platform_device *pdev) +{ + struct privacy_acpi_priv *priv = dev_get_drvdata(privacy_acpi->dev); + + led_classdev_unregister(&priv->cdev); + dev_set_drvdata(&pdev->dev, NULL); + + return 0; +} +/* + * Pressing the mute key activates a time delayed circuit to physically cut + * off the mute. The LED is in the same circuit, so it reflects the true + * state of the HW mute. The reason for the EC "ack" is so that software + * can first invoke a SW mute before the HW circuit is cut off. Without SW + * cutting this off first does not affect the time delayed muting or status + * of the LED but there is a possibility of a "popping" noise. + * + * If the EC receives the SW ack, the circuit will be activated before the + * delay completed. + * + * Exposing as an LED device allows the codec drivers notification path to + * EC ACK to work + */ +static void dell_privacy_leds_setup(struct device *dev) +{ + struct privacy_acpi_priv *priv = dev_get_drvdata(dev); + + priv->cdev.name = "privacy::micmute"; + priv->cdev.max_brightness = 1; + priv->cdev.brightness_set_blocking = dell_privacy_micmute_led_set; + priv->cdev.default_trigger = "audio-micmute"; + priv->cdev.brightness = ledtrig_audio_get(LED_AUDIO_MICMUTE); + priv->cdev.dev = dev; + devm_led_classdev_register(dev, &priv->cdev); +} + +static int dell_privacy_acpi_probe(struct platform_device *pdev) +{ + platform_set_drvdata(pdev, privacy_acpi); + privacy_acpi->dev = &pdev->dev; + privacy_acpi->platform_device = pdev; + return 0; +} + +static const struct acpi_device_id privacy_acpi_device_ids[] = { + {"PNP0C09", 0}, + { }, +}; +MODULE_DEVICE_TABLE(acpi, privacy_acpi_device_ids); + +static struct platform_driver dell_privacy_platform_drv = { + .driver = { + .name = PRIVACY_PLATFORM_NAME, + .acpi_match_table = ACPI_PTR(privacy_acpi_device_ids), + }, + .remove = dell_privacy_acpi_remove, +}; + +int dell_privacy_acpi_init(void) +{ + int err; + struct platform_device *pdev; + int privacy_capable = wmi_has_guid(DELL_PRIVACY_GUID); + + if (!privacy_capable) + return -ENODEV; + + privacy_acpi = kzalloc(sizeof(struct privacy_acpi_priv), GFP_KERNEL); + if (!privacy_acpi) + return -ENOMEM; + + pdev = platform_device_register_simple( + PRIVACY_PLATFORM_NAME, -1, NULL, 0); + if (IS_ERR(pdev)) { + err = PTR_ERR(pdev); + goto pdev_err; + } + err = platform_driver_probe(&dell_privacy_platform_drv, + dell_privacy_acpi_probe); + if (err) + goto pdrv_err; + + dell_privacy_leds_setup(&pdev->dev); + + return 0; + +pdrv_err: + platform_device_unregister(pdev); +pdev_err: + kfree(privacy_acpi); + return err; +} + +void dell_privacy_acpi_exit(void) +{ + struct platform_device *pdev = to_platform_device(privacy_acpi->dev); + + platform_device_unregister(pdev); + platform_driver_unregister(&dell_privacy_platform_drv); + kfree(privacy_acpi); +} + +MODULE_AUTHOR("Perry Yuan <perry_yuan@dell.com>"); +MODULE_DESCRIPTION("DELL Privacy ACPI Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/platform/x86/dell-privacy-wmi.c b/drivers/platform/x86/dell-privacy-wmi.c new file mode 100644 index 000000000000..80637c7f617c --- /dev/null +++ b/drivers/platform/x86/dell-privacy-wmi.c @@ -0,0 +1,309 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Dell privacy notification driver + * + * Copyright (C) 2021 Dell Inc. All Rights Reserved. + */ + +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +#include <linux/acpi.h> +#include <linux/input.h> +#include <linux/input/sparse-keymap.h> +#include <linux/list.h> +#include <linux/module.h> +#include <linux/wmi.h> +#include "dell-privacy-wmi.h" + +#define DELL_PRIVACY_GUID "6932965F-1671-4CEB-B988-D3AB0A901919" +#define MICROPHONE_STATUS BIT(0) +#define CAMERA_STATUS BIT(1) +#define PRIVACY_SCREEN_STATUS BIT(2) + +static int privacy_valid = -EPROBE_DEFER; +static LIST_HEAD(wmi_list); +static DEFINE_MUTEX(list_mutex); + +struct privacy_wmi_data { + struct input_dev *input_dev; + struct wmi_device *wdev; + struct list_head list; + u32 features_present; + u32 last_status; +}; + +/* + * Keymap for WMI Privacy events of type 0x0012 + */ +static const struct key_entry dell_wmi_keymap_type_0012[] = { + /* Privacy MIC Mute */ + { KE_KEY, 0x0001, { KEY_MICMUTE } }, + /* Privacy Camera Mute */ + { KE_SW, 0x0002, { SW_CAMERA_LENS_COVER } }, + { KE_END, 0}, +}; + +int dell_privacy_valid(void) +{ + int ret; + + ret = wmi_has_guid(DELL_PRIVACY_GUID); + if (!ret) + return -ENODEV; + ret = privacy_valid; + return ret; +} +EXPORT_SYMBOL_GPL(dell_privacy_valid); + +void dell_privacy_process_event(int type, int code, int status) +{ + struct privacy_wmi_data *priv; + const struct key_entry *key; + + mutex_lock(&list_mutex); + priv = list_first_entry_or_null(&wmi_list, + struct privacy_wmi_data, + list); + if (!priv) { + pr_err("dell privacy priv is NULL\n"); + goto error; + } + key = sparse_keymap_entry_from_scancode(priv->input_dev, (type << 16)|code); + if (!key) { + dev_dbg(&priv->wdev->dev, "Unknown key with type 0x%04x and code 0x%04x pressed\n", + type, code); + goto error; + } + switch (code) { + case DELL_PRIVACY_TYPE_AUDIO: /* Mic mute */ + priv->last_status = status; + sparse_keymap_report_entry(priv->input_dev, key, 1, true); + break; + case DELL_PRIVACY_TYPE_CAMERA: /* Camera mute */ + priv->last_status = status; + sparse_keymap_report_entry(priv->input_dev, key, 1, true); + break; + default: + dev_dbg(&priv->wdev->dev, "unknown event type 0x%04x 0x%04x", + type, code); + } +error: + mutex_unlock(&list_mutex); +} +EXPORT_SYMBOL_GPL(dell_privacy_process_event); + +static ssize_t devices_supported_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct privacy_wmi_data *priv = dev_get_drvdata(dev); + + return sprintf(buf, "%d\n", priv->features_present); +} + +static ssize_t current_state_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct privacy_wmi_data *priv = dev_get_drvdata(dev); + + return sprintf(buf, "%d\n", priv->last_status); +} + +static DEVICE_ATTR_RO(devices_supported); +static DEVICE_ATTR_RO(current_state); + +static struct attribute *platform_attributes[] = { + &dev_attr_devices_supported.attr, + &dev_attr_current_state.attr, + NULL, +}; + +static const struct attribute_group privacy_attribute_group = { + .attrs = platform_attributes +}; + +/* + * Describes the Device State class exposed by BIOS which can be consumed by + * various applications interested in knowing the Privacy feature capabilities. + * class DeviceState + * { + * [key, read] string InstanceName; + * [read] boolean ReadOnly; + * [WmiDataId(1), read] uint32 DevicesSupported; + * 0 – None, 0x1 – Microphone, 0x2 – Camera, 0x4 -ePrivacy Screen + * [WmiDataId(2), read] uint32 CurrentState; + * 0:Off; 1:On. Bit0 – Microphone, Bit1 – Camera, Bit2 - ePrivacyScreen + * }; + */ + +static int get_current_status(struct wmi_device *wdev) +{ + struct privacy_wmi_data *priv = dev_get_drvdata(&wdev->dev); + union acpi_object *obj_present = NULL; + u32 *buffer; + int ret = 0; + + if (priv == NULL) { + pr_err("dell privacy priv is NULL\n"); + return -EINVAL; + } + /* check privacy support features and device states */ + obj_present = wmidev_block_query(wdev, 0); + if (obj_present->type != ACPI_TYPE_BUFFER) { + dev_err(&wdev->dev, "Dell privacy failed to get device status!\n"); + ret = -EIO; + privacy_valid = ret; + goto obj_free; + } + /* Although it's not technically a failure, this would lead to + * unexpected behavior + */ + if (obj_present->buffer.length != 8) { + dev_err(&wdev->dev, "Dell privacy buffer has unexpected length (%d)!\n", + obj_present->buffer.length); + ret = -ENODEV; + privacy_valid = ret; + goto obj_free; + } + buffer = (u32 *)obj_present->buffer.pointer; + priv->features_present = buffer[0]; + priv->last_status = buffer[1]; + privacy_valid = 0; + +obj_free: + kfree(obj_present); + return ret; +} + +static int dell_privacy_wmi_probe(struct wmi_device *wdev, const void *context) +{ + struct privacy_wmi_data *priv; + struct key_entry *keymap; + int ret, i, pos = 0; + + priv = devm_kzalloc(&wdev->dev, sizeof(struct privacy_wmi_data), + GFP_KERNEL); + if (!priv) + return -ENOMEM; + + dev_set_drvdata(&wdev->dev, priv); + priv->wdev = wdev; + /* create evdev passing interface */ + priv->input_dev = devm_input_allocate_device(&wdev->dev); + if (!priv->input_dev) + return -ENOMEM; + /* remap the wmi keymap event to new keymap */ + keymap = kcalloc(ARRAY_SIZE(dell_wmi_keymap_type_0012) + + 1, + sizeof(struct key_entry), GFP_KERNEL); + if (!keymap) { + ret = -ENOMEM; + goto err_free_dev; + } + /* remap the keymap code with Dell privacy key type 0x12 as prefix + * KEY_MICMUTE scancode will be reported as 0x120001 + */ + for (i = 0; i < ARRAY_SIZE(dell_wmi_keymap_type_0012); i++) { + keymap[pos] = dell_wmi_keymap_type_0012[i]; + keymap[pos].code |= (0x0012 << 16); + pos++; + } + ret = sparse_keymap_setup(priv->input_dev, keymap, NULL); + if (ret) + return ret; + priv->input_dev->dev.parent = &wdev->dev; + priv->input_dev->name = "Dell Privacy Driver"; + priv->input_dev->id.bustype = BUS_HOST; + if (input_register_device(priv->input_dev)) { + pr_debug("input_register_device failed to register!\n"); + goto err_free_keymap; + } + mutex_lock(&list_mutex); + list_add_tail(&priv->list, &wmi_list); + mutex_unlock(&list_mutex); + if (get_current_status(priv->wdev)) + goto err_free_keymap; + ret = sysfs_create_group(&wdev->dev.kobj, &privacy_attribute_group); + if (ret) + goto err_free_keymap; + return 0; + +err_free_keymap: + privacy_valid = -ENODEV; + kfree(keymap); +err_free_dev: + return ret; +} + +static int dell_privacy_wmi_remove(struct wmi_device *wdev) +{ + struct privacy_wmi_data *priv = dev_get_drvdata(&wdev->dev); + + mutex_lock(&list_mutex); + list_del(&priv->list); + mutex_unlock(&list_mutex); + privacy_valid = -ENODEV; + sysfs_remove_group(&wdev->dev.kobj, &privacy_attribute_group); + + return 0; +} + +static const struct wmi_device_id dell_wmi_privacy_wmi_id_table[] = { + { .guid_string = DELL_PRIVACY_GUID }, + { }, +}; + +static struct wmi_driver dell_privacy_wmi_driver = { + .driver = { + .name = "dell-privacy", + }, + .probe = dell_privacy_wmi_probe, + .remove = dell_privacy_wmi_remove, + .id_table = dell_wmi_privacy_wmi_id_table, +}; + +static int __init init_dell_privacy(void) +{ + int ret; + + ret = wmi_has_guid(DELL_PRIVACY_GUID); + if (!ret) + return -ENODEV; + + ret = dell_privacy_acpi_init(); + if (ret) { + pr_err("failed to initialize privacy acpi driver: %d\n", ret); + goto err_init; + } + + ret = wmi_driver_register(&dell_privacy_wmi_driver); + if (ret) { + pr_err("failed to initialize privacy wmi driver: %d\n", ret); + return ret; + } + return 0; + +err_init: + wmi_driver_unregister(&dell_privacy_wmi_driver); + return ret; +} + +static void dell_privacy_wmi_exit(void) +{ + wmi_driver_unregister(&dell_privacy_wmi_driver); +} + +static void __exit exit_dell_privacy(void) +{ + dell_privacy_wmi_exit(); + dell_privacy_acpi_exit(); +} + +module_init(init_dell_privacy); +module_exit(exit_dell_privacy); + +MODULE_DEVICE_TABLE(wmi, dell_wmi_privacy_wmi_id_table); +MODULE_AUTHOR("Perry Yuan <perry_yuan@dell.com>"); +MODULE_DESCRIPTION("Dell Privacy WMI Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/platform/x86/dell-privacy-wmi.h b/drivers/platform/x86/dell-privacy-wmi.h new file mode 100644 index 000000000000..9fa01d084f7d --- /dev/null +++ b/drivers/platform/x86/dell-privacy-wmi.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Dell privacy notification driver + * + * Copyright (C) 2021 Dell Inc. All Rights Reserved. + */ + +#ifndef _DELL_PRIVACY_WMI_H_ +#define _DELL_PRIVACY_WMI_H_ + +#if IS_ENABLED(CONFIG_DELL_PRIVACY) +int dell_privacy_valid(void); +void dell_privacy_process_event(int type, int code, int status); +#else /* CONFIG_DELL_PRIVACY */ +static inline int dell_privacy_valid(void) +{ + return -ENODEV; +} + +static inline void dell_privacy_process_event(int type, int code, int status) +{} +#endif /* CONFIG_DELL_PRIVACY */ + +int dell_privacy_acpi_init(void); +void dell_privacy_acpi_exit(void); + +/* DELL Privacy Type */ +enum { + DELL_PRIVACY_TYPE_UNKNOWN = 0x0, + DELL_PRIVACY_TYPE_AUDIO, + DELL_PRIVACY_TYPE_CAMERA, +}; +#endif diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index bbdb3e860892..4b22bd21fc42 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c @@ -27,6 +27,7 @@ #include <acpi/video.h> #include "dell-smbios.h" #include "dell-wmi-descriptor.h" +#include "dell-privacy-wmi.h" MODULE_AUTHOR("Matthew Garrett <mjg@redhat.com>"); MODULE_AUTHOR("Pali Rohár <pali@kernel.org>"); @@ -381,6 +382,7 @@ static void dell_wmi_notify(struct wmi_device *wdev, u16 *buffer_entry, *buffer_end; acpi_size buffer_size; int len, i; + int err; if (obj->type != ACPI_TYPE_BUFFER) { pr_warn("bad response type %x\n", obj->type); @@ -427,18 +429,30 @@ static void dell_wmi_notify(struct wmi_device *wdev, switch (buffer_entry[1]) { case 0x0000: /* One key pressed or event occurred */ - case 0x0012: /* Event with extended data occurred */ - if (len > 2) - dell_wmi_process_key(wdev, buffer_entry[1], - buffer_entry[2]); - /* Extended data is currently ignored */ - break; case 0x0010: /* Sequence of keys pressed */ case 0x0011: /* Sequence of events occurred */ for (i = 2; i < len; ++i) dell_wmi_process_key(wdev, buffer_entry[1], buffer_entry[i]); break; + case 0x0012: +#if IS_ENABLED(CONFIG_DELL_PRIVACY) + err = dell_privacy_valid(); + if (err == 0) { + dell_privacy_process_event(buffer_entry[1], + buffer_entry[3], buffer_entry[4]); + } else { + if (len > 2) + dell_wmi_process_key(wdev, buffer_entry[1], + buffer_entry[2]); + } +#else + /* Extended data is currently ignored */ + if (len > 2) + dell_wmi_process_key(wdev, buffer_entry[1], + buffer_entry[2]); +#endif + break; default: /* Unknown event */ pr_info("Unknown WMI event type 0x%x\n", (int)buffer_entry[1]); -- 2.25.1
> -----Original Message----- > From: Yuan, Perry <Perry_Yuan@Dell.com> > Sent: Monday, January 4, 2021 3:10 > To: Mark Brown > Cc: oder_chiou@realtek.com; perex@perex.cz; tiwai@suse.com; > lgirdwood@gmail.com; alsa-devel@alsa-project.org; linux- > kernel@vger.kernel.org; Limonciello, Mario > Subject: RE: [PATCH v2 2/2] ASoC: rt715:add Mic Mute LED control support > > > -----Original Message----- > > From: Mark Brown <broonie@kernel.org> > > Sent: Tuesday, December 29, 2020 8:41 PM > > To: Yuan, Perry > > Cc: oder_chiou@realtek.com; perex@perex.cz; tiwai@suse.com; > > lgirdwood@gmail.com; alsa-devel@alsa-project.org; linux- > > kernel@vger.kernel.org; Limonciello, Mario > > Subject: Re: [PATCH v2 2/2] ASoC: rt715:add Mic Mute LED control support > > > > On Mon, Dec 28, 2020 at 09:38:31PM +0800, Perry Yuan wrote: > > > From: Perry Yuan <perry_yuan@dell.com> > > > > > > Some new Dell system is going to support audio internal micphone > > > privacy setting from hardware level with micmute led state changing > > > > I'm missing patch 1 of this series - what's the story with dependencies and > so > > on? > > HI Mark: > Sorry to make this confused. > The two patches are not in the same module, I use different cc list for each > patch. > I will send another v3 looping all the cc list and some new improvement. > Since the patches span subsystems and have a dependency, once reviewers are happy I think we'll have to get an agreement of which subsystem to bring them through. So yes, please keep all CC list the same for both patches for now when you submit v3.
Hi > -----Original Message----- > From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Sent: 2021年1月12日 2:07 > To: Yuan, Perry; oder_chiou@realtek.com; perex@perex.cz; tiwai@suse.com > Cc: alsa-devel@alsa-project.org; Limonciello, Mario; lgirdwood@gmail.com; > linux-kernel@vger.kernel.org; broonie@kernel.org > Subject: Re: [PATCH v2 2/2] ASoC: rt715:add Mic Mute LED control support > > > [EXTERNAL EMAIL] > > > > > > @@ -268,6 +269,7 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol > *kcontrol, > > unsigned int reg2 = mc->rreg; > > unsigned int reg = mc->reg; > > unsigned int max = mc->max; > > + unsigned int val0, val1; > > int err; > > > > val = ucontrol->value.integer.value[0]; @@ -286,7 +288,22 @@ static > > int rt715_sdca_put_volsw(struct snd_kcontrol *kcontrol, > > if (err < 0) > > return err; > > } > > - > > +#if IS_ENABLED(CONFIG_DELL_PRIVACY) > > + /* Privacy LED Trigger State Changed by muted/unmute switch */ > > + if (mc->invert) { > > + val0 = ucontrol->value.integer.value[0]; > > + val1 = ucontrol->value.integer.value[1]; > > + if (val0 == 1 && val1 == 1) { > > + rt715->micmute_led = LED_OFF; > > + ledtrig_audio_set(LED_AUDIO_MICMUTE, > > + rt715->micmute_led ? LED_ON : > LED_OFF); > > + } else if (val0 == 0 && val1 == 0) { > > + rt715->micmute_led = LED_ON; > > + ledtrig_audio_set(LED_AUDIO_MICMUTE, > > + rt715->micmute_led ? LED_ON : > LED_OFF); > > + } > > + } > > +#endif > > Should this be activated for specific DMI quirks? This driver is used in non-Dell > platforms (I am thinking of Intel RVPs or Realtek daughterboards), I am not > sure if a build-time behavior change makes sense. > > Or conversely could we just set the LEDs unconditionally if doing so is > harmless? The current mic mute led setting path is not common used for other vendors, just Dell platform support this mic mute led set operation. Do you think that I need to add one DMI quirk in the next version ? If so, I can add that. Perry Yuan Dell | Client Software Group | CDC Linux OS
> > -----Original Message----- > > From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > > Sent: 2021年1月12日 2:07 > > To: Yuan, Perry; oder_chiou@realtek.com; perex@perex.cz; tiwai@suse.com > > Cc: alsa-devel@alsa-project.org; Limonciello, Mario; lgirdwood@gmail.com; > > linux-kernel@vger.kernel.org; broonie@kernel.org > > Subject: Re: [PATCH v2 2/2] ASoC: rt715:add Mic Mute LED control support > > > > > > [EXTERNAL EMAIL] > > > > > > > > > > > @@ -268,6 +269,7 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol > > *kcontrol, > > > unsigned int reg2 = mc->rreg; > > > unsigned int reg = mc->reg; > > > unsigned int max = mc->max; > > > + unsigned int val0, val1; > > > int err; > > > > > > val = ucontrol->value.integer.value[0]; @@ -286,7 +288,22 @@ static > > > int rt715_sdca_put_volsw(struct snd_kcontrol *kcontrol, > > > if (err < 0) > > > return err; > > > } > > > - > > > +#if IS_ENABLED(CONFIG_DELL_PRIVACY) > > > + /* Privacy LED Trigger State Changed by muted/unmute switch */ > > > + if (mc->invert) { > > > + val0 = ucontrol->value.integer.value[0]; > > > + val1 = ucontrol->value.integer.value[1]; > > > + if (val0 == 1 && val1 == 1) { > > > + rt715->micmute_led = LED_OFF; > > > + ledtrig_audio_set(LED_AUDIO_MICMUTE, > > > + rt715->micmute_led ? LED_ON : > > LED_OFF); > > > + } else if (val0 == 0 && val1 == 0) { > > > + rt715->micmute_led = LED_ON; > > > + ledtrig_audio_set(LED_AUDIO_MICMUTE, > > > + rt715->micmute_led ? LED_ON : > > LED_OFF); > > > + } > > > + } > > > +#endif > > > > Should this be activated for specific DMI quirks? This driver is used in > non-Dell > > platforms (I am thinking of Intel RVPs or Realtek daughterboards), I am not > > sure if a build-time behavior change makes sense. > > > > Or conversely could we just set the LEDs unconditionally if doing so is > > harmless? > > The current mic mute led setting path is not common used for other vendors, > just Dell platform > support this mic mute led set operation. > > Do you think that I need to add one DMI quirk in the next version ? > If so, I can add that. > > In the HDA audio case this is modeled off of, the code runs whether or not a vendor has support for a mic mute LED. The calls to ledtrig_audio_set should be a no-op. I agree with @Pierre-Louis Bossart in this case, we should just be running it whether or not dell-privacy is compiled in. If another vendor chooses to add LED support they'll just need to set up their ledtrig supported backend and not change codec code.
> -----Original Message----- > From: Limonciello, Mario <Mario_Limonciello@Dell.com> > Sent: 2021年1月12日 22:48 > To: Yuan, Perry; Pierre-Louis Bossart; oder_chiou@realtek.com; > perex@perex.cz; tiwai@suse.com > Cc: alsa-devel@alsa-project.org; lgirdwood@gmail.com; linux- > kernel@vger.kernel.org; broonie@kernel.org > Subject: RE: [PATCH v2 2/2] ASoC: rt715:add Mic Mute LED control support > > > > -----Original Message----- > > > From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > > > Sent: 2021年1月12日 2:07 > > > To: Yuan, Perry; oder_chiou@realtek.com; perex@perex.cz; > > > tiwai@suse.com > > > Cc: alsa-devel@alsa-project.org; Limonciello, Mario; > > > lgirdwood@gmail.com; linux-kernel@vger.kernel.org; > > > broonie@kernel.org > > > Subject: Re: [PATCH v2 2/2] ASoC: rt715:add Mic Mute LED control > > > support > > > > > > > > > [EXTERNAL EMAIL] > > > > > > > > > > > > > > > > @@ -268,6 +269,7 @@ static int rt715_sdca_put_volsw(struct > > > > snd_kcontrol > > > *kcontrol, > > > > unsigned int reg2 = mc->rreg; > > > > unsigned int reg = mc->reg; > > > > unsigned int max = mc->max; > > > > + unsigned int val0, val1; > > > > int err; > > > > > > > > val = ucontrol->value.integer.value[0]; @@ -286,7 +288,22 @@ > > > > static int rt715_sdca_put_volsw(struct snd_kcontrol *kcontrol, > > > > if (err < 0) > > > > return err; > > > > } > > > > - > > > > +#if IS_ENABLED(CONFIG_DELL_PRIVACY) > > > > + /* Privacy LED Trigger State Changed by muted/unmute switch */ > > > > + if (mc->invert) { > > > > + val0 = ucontrol->value.integer.value[0]; > > > > + val1 = ucontrol->value.integer.value[1]; > > > > + if (val0 == 1 && val1 == 1) { > > > > + rt715->micmute_led = LED_OFF; > > > > + ledtrig_audio_set(LED_AUDIO_MICMUTE, > > > > + rt715->micmute_led ? LED_ON : > > > LED_OFF); > > > > + } else if (val0 == 0 && val1 == 0) { > > > > + rt715->micmute_led = LED_ON; > > > > + ledtrig_audio_set(LED_AUDIO_MICMUTE, > > > > + rt715->micmute_led ? LED_ON : > > > LED_OFF); > > > > + } > > > > + } > > > > +#endif > > > > > > Should this be activated for specific DMI quirks? This driver is > > > used in > > non-Dell > > > platforms (I am thinking of Intel RVPs or Realtek daughterboards), I > > > am not sure if a build-time behavior change makes sense. > > > > > > Or conversely could we just set the LEDs unconditionally if doing so > > > is harmless? > > > > The current mic mute led setting path is not common used for other > > vendors, just Dell platform support this mic mute led set operation. > > > > Do you think that I need to add one DMI quirk in the next version ? > > If so, I can add that. > > > > > > > In the HDA audio case this is modeled off of, the code runs whether or not a > vendor has support for a mic mute LED. The calls to ledtrig_audio_set should > be a no-op. I agree with @Pierre-Louis Bossart in this case, we should just be > running it whether or not dell-privacy is compiled in. If another vendor > chooses to add LED support they'll just need to set up their ledtrig supported > backend and not change codec code. Hi @Pierre-Louis Bossart Seems like that we have two way to go. * DMI quirks,seems like that it needs to maintain the quirk list when vendors have new system to support. * We just set the mic mute led state unconditionally . Which way would you prefer for next patch review?
>>>>> +#if IS_ENABLED(CONFIG_DELL_PRIVACY) >>>>> + /* Privacy LED Trigger State Changed by muted/unmute switch */ >>>>> + if (mc->invert) { >>>>> + val0 = ucontrol->value.integer.value[0]; >>>>> + val1 = ucontrol->value.integer.value[1]; >>>>> + if (val0 == 1 && val1 == 1) { >>>>> + rt715->micmute_led = LED_OFF; >>>>> + ledtrig_audio_set(LED_AUDIO_MICMUTE, >>>>> + rt715->micmute_led ? LED_ON : >>>> LED_OFF); >>>>> + } else if (val0 == 0 && val1 == 0) { >>>>> + rt715->micmute_led = LED_ON; >>>>> + ledtrig_audio_set(LED_AUDIO_MICMUTE, >>>>> + rt715->micmute_led ? LED_ON : >>>> LED_OFF); >>>>> + } >>>>> + } >>>>> +#endif >>>> >>>> Should this be activated for specific DMI quirks? This driver is >>>> used in >>> non-Dell >>>> platforms (I am thinking of Intel RVPs or Realtek daughterboards), I >>>> am not sure if a build-time behavior change makes sense. >>>> >>>> Or conversely could we just set the LEDs unconditionally if doing so >>>> is harmless? >>> >>> The current mic mute led setting path is not common used for other >>> vendors, just Dell platform support this mic mute led set operation. >>> >>> Do you think that I need to add one DMI quirk in the next version ? >>> If so, I can add that. >>> >>> >> >> >> In the HDA audio case this is modeled off of, the code runs whether or not a >> vendor has support for a mic mute LED. The calls to ledtrig_audio_set should >> be a no-op. I agree with @Pierre-Louis Bossart in this case, we should just be >> running it whether or not dell-privacy is compiled in. If another vendor >> chooses to add LED support they'll just need to set up their ledtrig supported >> backend and not change codec code. > > Hi @Pierre-Louis Bossart > Seems like that we have two way to go. > * DMI quirks,seems like that it needs to maintain the quirk list when vendors have new system to support. > * We just set the mic mute led state unconditionally . > > Which way would you prefer for next patch review? Maintaining quirks is a hassle, it's much simpler and consistent with HDaudio if the leds are set unconditionally. Thanks!
> -----Original Message----- > From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > Sent: 2021年1月13日 10:42 > To: Yuan, Perry; Limonciello, Mario; oder_chiou@realtek.com; > perex@perex.cz; tiwai@suse.com > Cc: alsa-devel@alsa-project.org; broonie@kernel.org; lgirdwood@gmail.com; > linux-kernel@vger.kernel.org > Subject: Re: [PATCH v2 2/2] ASoC: rt715:add Mic Mute LED control support > > > [EXTERNAL EMAIL] > > > >>>>> +#if IS_ENABLED(CONFIG_DELL_PRIVACY) > >>>>> + /* Privacy LED Trigger State Changed by muted/unmute switch */ > >>>>> + if (mc->invert) { > >>>>> + val0 = ucontrol->value.integer.value[0]; > >>>>> + val1 = ucontrol->value.integer.value[1]; > >>>>> + if (val0 == 1 && val1 == 1) { > >>>>> + rt715->micmute_led = LED_OFF; > >>>>> + ledtrig_audio_set(LED_AUDIO_MICMUTE, > >>>>> + rt715->micmute_led ? LED_ON : > >>>> LED_OFF); > >>>>> + } else if (val0 == 0 && val1 == 0) { > >>>>> + rt715->micmute_led = LED_ON; > >>>>> + ledtrig_audio_set(LED_AUDIO_MICMUTE, > >>>>> + rt715->micmute_led ? LED_ON : > >>>> LED_OFF); > >>>>> + } > >>>>> + } > >>>>> +#endif > >>>> > >>>> Should this be activated for specific DMI quirks? This driver is > >>>> used in > >>> non-Dell > >>>> platforms (I am thinking of Intel RVPs or Realtek daughterboards), > >>>> I am not sure if a build-time behavior change makes sense. > >>>> > >>>> Or conversely could we just set the LEDs unconditionally if doing > >>>> so is harmless? > >>> > >>> The current mic mute led setting path is not common used for other > >>> vendors, just Dell platform support this mic mute led set operation. > >>> > >>> Do you think that I need to add one DMI quirk in the next version ? > >>> If so, I can add that. > >>> > >>> > >> > >> > >> In the HDA audio case this is modeled off of, the code runs whether > >> or not a vendor has support for a mic mute LED. The calls to > >> ledtrig_audio_set should be a no-op. I agree with @Pierre-Louis > >> Bossart in this case, we should just be running it whether or not > >> dell-privacy is compiled in. If another vendor chooses to add LED > >> support they'll just need to set up their ledtrig supported backend and not > change codec code. > > > > Hi @Pierre-Louis Bossart > > Seems like that we have two way to go. > > * DMI quirks,seems like that it needs to maintain the quirk list when vendors > have new system to support. > > * We just set the mic mute led state unconditionally . > > > > Which way would you prefer for next patch review? > > Maintaining quirks is a hassle, it's much simpler and consistent with HDaudio > if the leds are set unconditionally. Thanks! Thank you for your confirm. I will take this to next patch V4. Perry Yuan Dell | Client Software Group | CDC Linux OS
diff --git a/sound/soc/codecs/rt715-sdca.c b/sound/soc/codecs/rt715-sdca.c index b43ac8559e45..e168ef6efcf5 100644 --- a/sound/soc/codecs/rt715-sdca.c +++ b/sound/soc/codecs/rt715-sdca.c @@ -12,6 +12,7 @@ #include <linux/version.h> #include <linux/kernel.h> #include <linux/init.h> +#include <linux/leds.h> #include <linux/pm_runtime.h> #include <linux/pm.h> #include <linux/soundwire/sdw.h> @@ -268,6 +269,7 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol *kcontrol, unsigned int reg2 = mc->rreg; unsigned int reg = mc->reg; unsigned int max = mc->max; + unsigned int val0, val1; int err; val = ucontrol->value.integer.value[0]; @@ -286,7 +288,22 @@ static int rt715_sdca_put_volsw(struct snd_kcontrol *kcontrol, if (err < 0) return err; } - +#if IS_ENABLED(CONFIG_DELL_PRIVACY) + /* Privacy LED Trigger State Changed by muted/unmute switch */ + if (mc->invert) { + val0 = ucontrol->value.integer.value[0]; + val1 = ucontrol->value.integer.value[1]; + if (val0 == 1 && val1 == 1) { + rt715->micmute_led = LED_OFF; + ledtrig_audio_set(LED_AUDIO_MICMUTE, + rt715->micmute_led ? LED_ON : LED_OFF); + } else if (val0 == 0 && val1 == 0) { + rt715->micmute_led = LED_ON; + ledtrig_audio_set(LED_AUDIO_MICMUTE, + rt715->micmute_led ? LED_ON : LED_OFF); + } + } +#endif return 0; } diff --git a/sound/soc/codecs/rt715-sdca.h b/sound/soc/codecs/rt715-sdca.h index 840c237895dd..2ab8724ae50b 100644 --- a/sound/soc/codecs/rt715-sdca.h +++ b/sound/soc/codecs/rt715-sdca.h @@ -31,6 +31,7 @@ struct rt715_sdca_priv { int l_is_unmute; int r_is_unmute; int hw_sdw_ver; + int micmute_led; }; struct rt715_sdw_stream_data { diff --git a/sound/soc/codecs/rt715.c b/sound/soc/codecs/rt715.c index cdcba70146da..faa4dee6b39a 100644 --- a/sound/soc/codecs/rt715.c +++ b/sound/soc/codecs/rt715.c @@ -13,6 +13,7 @@ #include <linux/init.h> #include <linux/delay.h> #include <linux/i2c.h> +#include <linux/leds.h> #include <linux/pm_runtime.h> #include <linux/pm.h> #include <linux/soundwire/sdw.h> @@ -88,13 +89,29 @@ static int rt715_set_amp_gain_put(struct snd_kcontrol *kcontrol, RT715_SET_GAIN_MIX_ADC2_L}; unsigned int addr_h, addr_l, val_h, val_ll, val_lr; unsigned int read_ll, read_rl, i, j, loop_cnt; + unsigned int val0, val1; if (strstr(ucontrol->id.name, "Main Capture Switch") || strstr(ucontrol->id.name, "Main Capture Volume")) loop_cnt = 4; else loop_cnt = 1; - +#if IS_ENABLED(CONFIG_DELL_PRIVACY) + /* Privacy micmute led trigger for muted/unmute switch */ + if (mc->invert) { + val0 = ucontrol->value.integer.value[0]; + val1 = ucontrol->value.integer.value[1]; + if (val0 == 1 && val1 == 1) { + rt715->micmute_led = LED_OFF; + ledtrig_audio_set(LED_AUDIO_MICMUTE, + rt715->micmute_led ? LED_ON : LED_OFF); + } else if (val0 == 0 && val1 == 0) { + rt715->micmute_led = LED_ON; + ledtrig_audio_set(LED_AUDIO_MICMUTE, + rt715->micmute_led ? LED_ON : LED_OFF); + } + } +#endif for (j = 0; j < loop_cnt; j++) { /* Can't use update bit function, so read the original value first */ if (loop_cnt == 1) { diff --git a/sound/soc/codecs/rt715.h b/sound/soc/codecs/rt715.h index 009a8266f606..2d3b5b299514 100644 --- a/sound/soc/codecs/rt715.h +++ b/sound/soc/codecs/rt715.h @@ -22,6 +22,7 @@ struct rt715_priv { struct sdw_bus_params params; bool hw_init; bool first_hw_init; + int micmute_led; }; struct sdw_stream_data {