* [PATCH v7] platform/x86: lenovo-wmi-camera: Use SW_CAMERA_LENS_COVER instead of KEY_CAMERA_ACESS
@ 2025-01-15 2:28 Ai Chao
2025-01-15 9:38 ` Hans de Goede
2025-01-15 14:39 ` Ilpo Järvinen
0 siblings, 2 replies; 3+ messages in thread
From: Ai Chao @ 2025-01-15 2:28 UTC (permalink / raw)
To: hdegoede, ilpo.jarvinen, platform-driver-x86, linux-kernel; +Cc: Ai Chao
Use SW_CAMERA_LENS_COVER instead of KEY_CAMERA_ACESS_ENABLE and
KEY_CAMERA_ACESS_DISABLE. When the camera toggle switch was hit,
the lenovo-wmi-camera driver would report an event code.
Signed-off-by: Ai Chao <aichao@kylinos.cn>
---
change for v7
-Move notify_lock into lenovo_wmi_priv struct.
change for v6
-Change mutex() to guard().
change for v5
-Add input_report_switch before input_register_device.
change for v4
-Add mutex_unlock and report a switch state of 0 if SW_CAMERA_ON.
change for v3
-Used input_register_device and input_allocate_device.
change for v2
-Only delays the input-device registration and switches to reporting SW_CAMERA_LENS_COVER.
drivers/platform/x86/lenovo-wmi-camera.c | 69 +++++++++++++++---------
1 file changed, 44 insertions(+), 25 deletions(-)
diff --git a/drivers/platform/x86/lenovo-wmi-camera.c b/drivers/platform/x86/lenovo-wmi-camera.c
index 0c0bedaf7407..eb60fb9a5b3f 100644
--- a/drivers/platform/x86/lenovo-wmi-camera.c
+++ b/drivers/platform/x86/lenovo-wmi-camera.c
@@ -13,6 +13,7 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/wmi.h>
+#include <linux/cleanup.h>
#define WMI_LENOVO_CAMERABUTTON_EVENT_GUID "50C76F1F-D8E4-D895-0A3D-62F4EA400013"
@@ -26,10 +27,38 @@ enum {
SW_CAMERA_ON = 1,
};
+static int camera_shutter_input_setup(struct wmi_device *wdev, u8 camera_mode)
+{
+ struct lenovo_wmi_priv *priv = dev_get_drvdata(&wdev->dev);
+ int err;
+
+ priv->idev = input_allocate_device();
+ if (!priv->idev)
+ return -ENOMEM;
+
+ priv->idev->name = "Lenovo WMI Camera Button";
+ priv->idev->phys = "wmi/input0";
+ priv->idev->id.bustype = BUS_HOST;
+ priv->idev->dev.parent = &wdev->dev;
+
+ input_set_capability(priv->idev, EV_SW, SW_CAMERA_LENS_COVER);
+
+ input_report_switch(priv->idev, SW_CAMERA_LENS_COVER,
+ camera_mode == SW_CAMERA_ON ? 0 : 1);
+ input_sync(priv->idev);
+
+ err = input_register_device(priv->idev);
+ if (err) {
+ input_free_device(priv->idev);
+ priv->idev = NULL;
+ }
+
+ return err;
+}
+
static void lenovo_wmi_notify(struct wmi_device *wdev, union acpi_object *obj)
{
struct lenovo_wmi_priv *priv = dev_get_drvdata(&wdev->dev);
- unsigned int keycode;
u8 camera_mode;
if (obj->type != ACPI_TYPE_BUFFER) {
@@ -53,22 +82,24 @@ static void lenovo_wmi_notify(struct wmi_device *wdev, union acpi_object *obj)
return;
}
- mutex_lock(&priv->notify_lock);
+ guard(mutex)(&priv->notify_lock);
- keycode = camera_mode == SW_CAMERA_ON ?
- KEY_CAMERA_ACCESS_ENABLE : KEY_CAMERA_ACCESS_DISABLE;
- input_report_key(priv->idev, keycode, 1);
- input_sync(priv->idev);
- input_report_key(priv->idev, keycode, 0);
- input_sync(priv->idev);
+ if (!priv->idev) {
+ if (camera_shutter_input_setup(wdev, camera_mode))
+ dev_warn(&wdev->dev, "Failed to register input device\n");
+ return;
+ }
- mutex_unlock(&priv->notify_lock);
+ if (camera_mode == SW_CAMERA_ON)
+ input_report_switch(priv->idev, SW_CAMERA_LENS_COVER, 0);
+ else
+ input_report_switch(priv->idev, SW_CAMERA_LENS_COVER, 1);
+ input_sync(priv->idev);
}
static int lenovo_wmi_probe(struct wmi_device *wdev, const void *context)
{
struct lenovo_wmi_priv *priv;
- int ret;
priv = devm_kzalloc(&wdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
@@ -76,21 +107,6 @@ static int lenovo_wmi_probe(struct wmi_device *wdev, const void *context)
dev_set_drvdata(&wdev->dev, priv);
- priv->idev = devm_input_allocate_device(&wdev->dev);
- if (!priv->idev)
- return -ENOMEM;
-
- priv->idev->name = "Lenovo WMI Camera Button";
- priv->idev->phys = "wmi/input0";
- priv->idev->id.bustype = BUS_HOST;
- priv->idev->dev.parent = &wdev->dev;
- input_set_capability(priv->idev, EV_KEY, KEY_CAMERA_ACCESS_ENABLE);
- input_set_capability(priv->idev, EV_KEY, KEY_CAMERA_ACCESS_DISABLE);
-
- ret = input_register_device(priv->idev);
- if (ret)
- return ret;
-
mutex_init(&priv->notify_lock);
return 0;
@@ -100,6 +116,9 @@ static void lenovo_wmi_remove(struct wmi_device *wdev)
{
struct lenovo_wmi_priv *priv = dev_get_drvdata(&wdev->dev);
+ if (priv->idev)
+ input_unregister_device(priv->idev);
+
mutex_destroy(&priv->notify_lock);
}
--
2.25.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v7] platform/x86: lenovo-wmi-camera: Use SW_CAMERA_LENS_COVER instead of KEY_CAMERA_ACESS
2025-01-15 2:28 [PATCH v7] platform/x86: lenovo-wmi-camera: Use SW_CAMERA_LENS_COVER instead of KEY_CAMERA_ACESS Ai Chao
@ 2025-01-15 9:38 ` Hans de Goede
2025-01-15 14:39 ` Ilpo Järvinen
1 sibling, 0 replies; 3+ messages in thread
From: Hans de Goede @ 2025-01-15 9:38 UTC (permalink / raw)
To: Ai Chao, ilpo.jarvinen, platform-driver-x86, linux-kernel
Hi,
On 15-Jan-25 3:28 AM, Ai Chao wrote:
> Use SW_CAMERA_LENS_COVER instead of KEY_CAMERA_ACESS_ENABLE and
> KEY_CAMERA_ACESS_DISABLE. When the camera toggle switch was hit,
> the lenovo-wmi-camera driver would report an event code.
>
> Signed-off-by: Ai Chao <aichao@kylinos.cn>
> ---
> change for v7
> -Move notify_lock into lenovo_wmi_priv struct.
Thanks, patch looks good to me:
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
> change for v6
> -Change mutex() to guard().
> change for v5
> -Add input_report_switch before input_register_device.
> change for v4
> -Add mutex_unlock and report a switch state of 0 if SW_CAMERA_ON.
> change for v3
> -Used input_register_device and input_allocate_device.
> change for v2
> -Only delays the input-device registration and switches to reporting SW_CAMERA_LENS_COVER.
>
> drivers/platform/x86/lenovo-wmi-camera.c | 69 +++++++++++++++---------
> 1 file changed, 44 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/platform/x86/lenovo-wmi-camera.c b/drivers/platform/x86/lenovo-wmi-camera.c
> index 0c0bedaf7407..eb60fb9a5b3f 100644
> --- a/drivers/platform/x86/lenovo-wmi-camera.c
> +++ b/drivers/platform/x86/lenovo-wmi-camera.c
> @@ -13,6 +13,7 @@
> #include <linux/module.h>
> #include <linux/mutex.h>
> #include <linux/wmi.h>
> +#include <linux/cleanup.h>
>
> #define WMI_LENOVO_CAMERABUTTON_EVENT_GUID "50C76F1F-D8E4-D895-0A3D-62F4EA400013"
>
> @@ -26,10 +27,38 @@ enum {
> SW_CAMERA_ON = 1,
> };
>
> +static int camera_shutter_input_setup(struct wmi_device *wdev, u8 camera_mode)
> +{
> + struct lenovo_wmi_priv *priv = dev_get_drvdata(&wdev->dev);
> + int err;
> +
> + priv->idev = input_allocate_device();
> + if (!priv->idev)
> + return -ENOMEM;
> +
> + priv->idev->name = "Lenovo WMI Camera Button";
> + priv->idev->phys = "wmi/input0";
> + priv->idev->id.bustype = BUS_HOST;
> + priv->idev->dev.parent = &wdev->dev;
> +
> + input_set_capability(priv->idev, EV_SW, SW_CAMERA_LENS_COVER);
> +
> + input_report_switch(priv->idev, SW_CAMERA_LENS_COVER,
> + camera_mode == SW_CAMERA_ON ? 0 : 1);
> + input_sync(priv->idev);
> +
> + err = input_register_device(priv->idev);
> + if (err) {
> + input_free_device(priv->idev);
> + priv->idev = NULL;
> + }
> +
> + return err;
> +}
> +
> static void lenovo_wmi_notify(struct wmi_device *wdev, union acpi_object *obj)
> {
> struct lenovo_wmi_priv *priv = dev_get_drvdata(&wdev->dev);
> - unsigned int keycode;
> u8 camera_mode;
>
> if (obj->type != ACPI_TYPE_BUFFER) {
> @@ -53,22 +82,24 @@ static void lenovo_wmi_notify(struct wmi_device *wdev, union acpi_object *obj)
> return;
> }
>
> - mutex_lock(&priv->notify_lock);
> + guard(mutex)(&priv->notify_lock);
>
> - keycode = camera_mode == SW_CAMERA_ON ?
> - KEY_CAMERA_ACCESS_ENABLE : KEY_CAMERA_ACCESS_DISABLE;
> - input_report_key(priv->idev, keycode, 1);
> - input_sync(priv->idev);
> - input_report_key(priv->idev, keycode, 0);
> - input_sync(priv->idev);
> + if (!priv->idev) {
> + if (camera_shutter_input_setup(wdev, camera_mode))
> + dev_warn(&wdev->dev, "Failed to register input device\n");
> + return;
> + }
>
> - mutex_unlock(&priv->notify_lock);
> + if (camera_mode == SW_CAMERA_ON)
> + input_report_switch(priv->idev, SW_CAMERA_LENS_COVER, 0);
> + else
> + input_report_switch(priv->idev, SW_CAMERA_LENS_COVER, 1);
> + input_sync(priv->idev);
> }
>
> static int lenovo_wmi_probe(struct wmi_device *wdev, const void *context)
> {
> struct lenovo_wmi_priv *priv;
> - int ret;
>
> priv = devm_kzalloc(&wdev->dev, sizeof(*priv), GFP_KERNEL);
> if (!priv)
> @@ -76,21 +107,6 @@ static int lenovo_wmi_probe(struct wmi_device *wdev, const void *context)
>
> dev_set_drvdata(&wdev->dev, priv);
>
> - priv->idev = devm_input_allocate_device(&wdev->dev);
> - if (!priv->idev)
> - return -ENOMEM;
> -
> - priv->idev->name = "Lenovo WMI Camera Button";
> - priv->idev->phys = "wmi/input0";
> - priv->idev->id.bustype = BUS_HOST;
> - priv->idev->dev.parent = &wdev->dev;
> - input_set_capability(priv->idev, EV_KEY, KEY_CAMERA_ACCESS_ENABLE);
> - input_set_capability(priv->idev, EV_KEY, KEY_CAMERA_ACCESS_DISABLE);
> -
> - ret = input_register_device(priv->idev);
> - if (ret)
> - return ret;
> -
> mutex_init(&priv->notify_lock);
>
> return 0;
> @@ -100,6 +116,9 @@ static void lenovo_wmi_remove(struct wmi_device *wdev)
> {
> struct lenovo_wmi_priv *priv = dev_get_drvdata(&wdev->dev);
>
> + if (priv->idev)
> + input_unregister_device(priv->idev);
> +
> mutex_destroy(&priv->notify_lock);
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v7] platform/x86: lenovo-wmi-camera: Use SW_CAMERA_LENS_COVER instead of KEY_CAMERA_ACESS
2025-01-15 2:28 [PATCH v7] platform/x86: lenovo-wmi-camera: Use SW_CAMERA_LENS_COVER instead of KEY_CAMERA_ACESS Ai Chao
2025-01-15 9:38 ` Hans de Goede
@ 2025-01-15 14:39 ` Ilpo Järvinen
1 sibling, 0 replies; 3+ messages in thread
From: Ilpo Järvinen @ 2025-01-15 14:39 UTC (permalink / raw)
To: hdegoede, platform-driver-x86, linux-kernel, Ai Chao
On Wed, 15 Jan 2025 10:28:24 +0800, Ai Chao wrote:
> Use SW_CAMERA_LENS_COVER instead of KEY_CAMERA_ACESS_ENABLE and
> KEY_CAMERA_ACESS_DISABLE. When the camera toggle switch was hit,
> the lenovo-wmi-camera driver would report an event code.
>
>
Thank you for your contribution, it has been applied to my local
review-ilpo-next branch. Note it will show up in the public
platform-drivers-x86/review-ilpo-next branch only once I've pushed my
local branch there, which might take a while.
The list of commits applied:
[1/1] platform/x86: lenovo-wmi-camera: Use SW_CAMERA_LENS_COVER instead of KEY_CAMERA_ACESS
commit: d98bf6a6ed61a8047e199495b0887cce392f8e5b
--
i.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-01-15 14:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-15 2:28 [PATCH v7] platform/x86: lenovo-wmi-camera: Use SW_CAMERA_LENS_COVER instead of KEY_CAMERA_ACESS Ai Chao
2025-01-15 9:38 ` Hans de Goede
2025-01-15 14:39 ` Ilpo Järvinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®