All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] platform/x86: dell-privacy: Fix SW_CAMERA_LENS_COVER reporting
@ 2022-12-21 22:07 Hans de Goede
  2022-12-21 22:07 ` [PATCH 2/2] platform/x86: dell-privacy: Only register SW_CAMERA_LENS_COVER if present Hans de Goede
  2023-01-12 18:40 ` [PATCH 1/2] platform/x86: dell-privacy: Fix SW_CAMERA_LENS_COVER reporting Hans de Goede
  0 siblings, 2 replies; 3+ messages in thread
From: Hans de Goede @ 2022-12-21 22:07 UTC (permalink / raw)
  To: Mark Gross, Andy Shevchenko, Dell.Client.Kernel
  Cc: Hans de Goede, platform-driver-x86

Use KE_VSW instead of KE_SW for the SW_CAMERA_LENS_COVER key_entry
and get the value of the switch from the status field when handling
SW_CAMERA_LENS_COVER events, instead of always reporting 0.

Also correctly set the initial SW_CAMERA_LENS_COVER value.

Fixes: 8af9fa37b8a3 ("platform/x86: dell-privacy: Add support for Dell hardware privacy")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/platform/x86/dell/dell-wmi-privacy.c | 22 ++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/drivers/platform/x86/dell/dell-wmi-privacy.c b/drivers/platform/x86/dell/dell-wmi-privacy.c
index c82b3d6867c5..915d5deeb971 100644
--- a/drivers/platform/x86/dell/dell-wmi-privacy.c
+++ b/drivers/platform/x86/dell/dell-wmi-privacy.c
@@ -61,7 +61,7 @@ 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_VSW, 0x0002, { SW_CAMERA_LENS_COVER } },
 	{ KE_END, 0},
 };
 
@@ -115,11 +115,15 @@ bool dell_privacy_process_event(int type, int code, int status)
 
 	switch (code) {
 	case DELL_PRIVACY_AUDIO_EVENT: /* Mic mute */
-	case DELL_PRIVACY_CAMERA_EVENT: /* Camera mute */
 		priv->last_status = status;
 		sparse_keymap_report_entry(priv->input_dev, key, 1, true);
 		ret = true;
 		break;
+	case DELL_PRIVACY_CAMERA_EVENT: /* Camera mute */
+		priv->last_status = status;
+		sparse_keymap_report_entry(priv->input_dev, key, !(status & CAMERA_STATUS), false);
+		ret = true;
+		break;
 	default:
 		dev_dbg(&priv->wdev->dev, "unknown event type 0x%04x 0x%04x\n", type, code);
 	}
@@ -304,6 +308,11 @@ static int dell_privacy_wmi_probe(struct wmi_device *wdev, const void *context)
 
 	dev_set_drvdata(&wdev->dev, priv);
 	priv->wdev = wdev;
+
+	ret = get_current_status(priv->wdev);
+	if (ret)
+		return ret;
+
 	/* create evdev passing interface */
 	priv->input_dev = devm_input_allocate_device(&wdev->dev);
 	if (!priv->input_dev)
@@ -331,11 +340,12 @@ static int dell_privacy_wmi_probe(struct wmi_device *wdev, const void *context)
 	priv->input_dev->name = "Dell Privacy Driver";
 	priv->input_dev->id.bustype = BUS_HOST;
 
-	ret = input_register_device(priv->input_dev);
-	if (ret)
-		return ret;
+	/* Report initial camera-cover status */
+	if (priv->features_present & BIT(DELL_PRIVACY_TYPE_CAMERA))
+		input_report_switch(priv->input_dev, SW_CAMERA_LENS_COVER,
+				    !(priv->last_status & CAMERA_STATUS));
 
-	ret = get_current_status(priv->wdev);
+	ret = input_register_device(priv->input_dev);
 	if (ret)
 		return ret;
 
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH 2/2] platform/x86: dell-privacy: Only register SW_CAMERA_LENS_COVER if present
  2022-12-21 22:07 [PATCH 1/2] platform/x86: dell-privacy: Fix SW_CAMERA_LENS_COVER reporting Hans de Goede
@ 2022-12-21 22:07 ` Hans de Goede
  2023-01-12 18:40 ` [PATCH 1/2] platform/x86: dell-privacy: Fix SW_CAMERA_LENS_COVER reporting Hans de Goede
  1 sibling, 0 replies; 3+ messages in thread
From: Hans de Goede @ 2022-12-21 22:07 UTC (permalink / raw)
  To: Mark Gross, Andy Shevchenko, Dell.Client.Kernel
  Cc: Hans de Goede, platform-driver-x86

Unlike keys where userspace only reacts to keypresses, userspace may act
on switches in both (0 and 1) of their positions.

For example if a SW_TABLET_MODE switch is registered then GNOME will not
automatically show the onscreen keyboard when a text field gets focus on
touchscreen devices when SW_TABLET_MODE reports 0 and when SW_TABLET_MODE
reports 1 libinput will block (filter out) builtin keyboard and touchpad
events.

So to avoid unwanted side-effects EV_SW type inputs should only be
registered if they are actually present, only register SW_CAMERA_LENS_COVER
if it is actually there.

Fixes: 8af9fa37b8a3 ("platform/x86: dell-privacy: Add support for Dell hardware privacy")
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 drivers/platform/x86/dell/dell-wmi-privacy.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/x86/dell/dell-wmi-privacy.c b/drivers/platform/x86/dell/dell-wmi-privacy.c
index 915d5deeb971..c517bd45dd32 100644
--- a/drivers/platform/x86/dell/dell-wmi-privacy.c
+++ b/drivers/platform/x86/dell/dell-wmi-privacy.c
@@ -296,7 +296,7 @@ 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;
+	int ret, i, j;
 
 	ret = wmi_has_guid(DELL_PRIVACY_GUID);
 	if (!ret)
@@ -327,9 +327,20 @@ static int dell_privacy_wmi_probe(struct wmi_device *wdev, const void *context)
 	/* 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[i] = dell_wmi_keymap_type_0012[i];
-		keymap[i].code |= (0x0012 << 16);
+	for (i = 0, j = 0; i < ARRAY_SIZE(dell_wmi_keymap_type_0012); i++) {
+		/*
+		 * Unlike keys where only presses matter, userspace may act
+		 * on switches in both of their positions. Only register
+		 * SW_CAMERA_LENS_COVER if it is actually there.
+		 */
+		if (dell_wmi_keymap_type_0012[i].type == KE_VSW &&
+		    dell_wmi_keymap_type_0012[i].sw.code == SW_CAMERA_LENS_COVER &&
+		    !(priv->features_present & BIT(DELL_PRIVACY_TYPE_CAMERA)))
+			continue;
+
+		keymap[j] = dell_wmi_keymap_type_0012[i];
+		keymap[j].code |= (0x0012 << 16);
+		j++;
 	}
 	ret = sparse_keymap_setup(priv->input_dev, keymap, NULL);
 	kfree(keymap);
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] platform/x86: dell-privacy: Fix SW_CAMERA_LENS_COVER reporting
  2022-12-21 22:07 [PATCH 1/2] platform/x86: dell-privacy: Fix SW_CAMERA_LENS_COVER reporting Hans de Goede
  2022-12-21 22:07 ` [PATCH 2/2] platform/x86: dell-privacy: Only register SW_CAMERA_LENS_COVER if present Hans de Goede
@ 2023-01-12 18:40 ` Hans de Goede
  1 sibling, 0 replies; 3+ messages in thread
From: Hans de Goede @ 2023-01-12 18:40 UTC (permalink / raw)
  To: Mark Gross, Andy Shevchenko, Dell.Client.Kernel; +Cc: platform-driver-x86

Hi,

On 12/21/22 23:07, Hans de Goede wrote:
> Use KE_VSW instead of KE_SW for the SW_CAMERA_LENS_COVER key_entry
> and get the value of the switch from the status field when handling
> SW_CAMERA_LENS_COVER events, instead of always reporting 0.
> 
> Also correctly set the initial SW_CAMERA_LENS_COVER value.
> 
> Fixes: 8af9fa37b8a3 ("platform/x86: dell-privacy: Add support for Dell hardware privacy")
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

I've added this series to my review-hans (soon to be fixes) branch now.

Regards,

Hans

> ---
>  drivers/platform/x86/dell/dell-wmi-privacy.c | 22 ++++++++++++++------
>  1 file changed, 16 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/platform/x86/dell/dell-wmi-privacy.c b/drivers/platform/x86/dell/dell-wmi-privacy.c
> index c82b3d6867c5..915d5deeb971 100644
> --- a/drivers/platform/x86/dell/dell-wmi-privacy.c
> +++ b/drivers/platform/x86/dell/dell-wmi-privacy.c
> @@ -61,7 +61,7 @@ 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_VSW, 0x0002, { SW_CAMERA_LENS_COVER } },
>  	{ KE_END, 0},
>  };
>  
> @@ -115,11 +115,15 @@ bool dell_privacy_process_event(int type, int code, int status)
>  
>  	switch (code) {
>  	case DELL_PRIVACY_AUDIO_EVENT: /* Mic mute */
> -	case DELL_PRIVACY_CAMERA_EVENT: /* Camera mute */
>  		priv->last_status = status;
>  		sparse_keymap_report_entry(priv->input_dev, key, 1, true);
>  		ret = true;
>  		break;
> +	case DELL_PRIVACY_CAMERA_EVENT: /* Camera mute */
> +		priv->last_status = status;
> +		sparse_keymap_report_entry(priv->input_dev, key, !(status & CAMERA_STATUS), false);
> +		ret = true;
> +		break;
>  	default:
>  		dev_dbg(&priv->wdev->dev, "unknown event type 0x%04x 0x%04x\n", type, code);
>  	}
> @@ -304,6 +308,11 @@ static int dell_privacy_wmi_probe(struct wmi_device *wdev, const void *context)
>  
>  	dev_set_drvdata(&wdev->dev, priv);
>  	priv->wdev = wdev;
> +
> +	ret = get_current_status(priv->wdev);
> +	if (ret)
> +		return ret;
> +
>  	/* create evdev passing interface */
>  	priv->input_dev = devm_input_allocate_device(&wdev->dev);
>  	if (!priv->input_dev)
> @@ -331,11 +340,12 @@ static int dell_privacy_wmi_probe(struct wmi_device *wdev, const void *context)
>  	priv->input_dev->name = "Dell Privacy Driver";
>  	priv->input_dev->id.bustype = BUS_HOST;
>  
> -	ret = input_register_device(priv->input_dev);
> -	if (ret)
> -		return ret;
> +	/* Report initial camera-cover status */
> +	if (priv->features_present & BIT(DELL_PRIVACY_TYPE_CAMERA))
> +		input_report_switch(priv->input_dev, SW_CAMERA_LENS_COVER,
> +				    !(priv->last_status & CAMERA_STATUS));
>  
> -	ret = get_current_status(priv->wdev);
> +	ret = input_register_device(priv->input_dev);
>  	if (ret)
>  		return ret;
>  


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-12 19:03 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-21 22:07 [PATCH 1/2] platform/x86: dell-privacy: Fix SW_CAMERA_LENS_COVER reporting Hans de Goede
2022-12-21 22:07 ` [PATCH 2/2] platform/x86: dell-privacy: Only register SW_CAMERA_LENS_COVER if present Hans de Goede
2023-01-12 18:40 ` [PATCH 1/2] platform/x86: dell-privacy: Fix SW_CAMERA_LENS_COVER reporting Hans de Goede

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.