[PATCH] dell-rbtn: Ignore ACPI notifications if device is suspended

[PATCH] dell-rbtn: Ignore ACPI notifications if device is suspended

[Gabriele Mazzotta]

Some BIOSes unconditionally send an ACPI notification to RBTN when the
system is resuming from suspend. This makes dell-rbtn send an input
event to userspace as if a function key was pressed. Prevent this by
ignoring all the notifications received while the device is suspended.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=106031
Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
---
 drivers/platform/x86/dell-rbtn.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/drivers/platform/x86/dell-rbtn.c b/drivers/platform/x86/dell-rbtn.c
index cd410e3..1d64b72 100644
--- a/drivers/platform/x86/dell-rbtn.c
+++ b/drivers/platform/x86/dell-rbtn.c
@@ -28,6 +28,7 @@ struct rbtn_data {
 	enum rbtn_type type;
 	struct rfkill *rfkill;
 	struct input_dev *input_dev;
+	bool suspended;
 };
 
 
@@ -220,9 +221,33 @@ static const struct acpi_device_id rbtn_ids[] = {
 	{ "", 0 },
 };
 
+#ifdef CONFIG_PM_SLEEP
+static int rbtn_suspend(struct device *dev)
+{
+	struct acpi_device *device = to_acpi_device(dev);
+	struct rbtn_data *rbtn_data = acpi_driver_data(device);
+
+	rbtn_data->suspended = true;
+
+	return 0;
+}
+
+static int rbtn_resume(struct device *dev)
+{
+	struct acpi_device *device = to_acpi_device(dev);
+	struct rbtn_data *rbtn_data = acpi_driver_data(device);
+
+	rbtn_data->suspended = false;
+
+	return 0;
+}
+#endif
+static SIMPLE_DEV_PM_OPS(rbtn_pm_ops, rbtn_suspend, rbtn_resume);
+
 static struct acpi_driver rbtn_driver = {
 	.name = "dell-rbtn",
 	.ids = rbtn_ids,
+	.drv.pm = &rbtn_pm_ops,
 	.ops = {
 		.add = rbtn_add,
 		.remove = rbtn_remove,
@@ -384,6 +409,9 @@ static void rbtn_notify(struct acpi_device *device, u32 event)
 {
 	struct rbtn_data *rbtn_data = device->driver_data;
 
+	if (rbtn_data->suspended)
+		return;
+
 	if (event != 0x80) {
 		dev_info(&device->dev, "Received unknown event (0x%x)\n",
 			 event);
-- 
2.6.2

Re: [PATCH] dell-rbtn: Ignore ACPI notifications if device is suspended

[Pali Rohár]

[-- Attachment #1: Type: Text/Plain, Size: 2538 bytes --]

On Saturday 21 November 2015 15:16:15 Gabriele Mazzotta wrote:
> Some BIOSes unconditionally send an ACPI notification to RBTN when
> the system is resuming from suspend. This makes dell-rbtn send an
> input event to userspace as if a function key was pressed. Prevent
> this by ignoring all the notifications received while the device is
> suspended.
> 
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=106031
> Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>

Looks like we need to ignore ACPI events when RBTN device is suspended. 
So for me it is OK. If ACPI people are OK with implementation, add my 
Acked-By: Pali Rohár <pali.rohar@gmail.com>

> ---
>  drivers/platform/x86/dell-rbtn.c | 28 ++++++++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
> 
> diff --git a/drivers/platform/x86/dell-rbtn.c
> b/drivers/platform/x86/dell-rbtn.c index cd410e3..1d64b72 100644
> --- a/drivers/platform/x86/dell-rbtn.c
> +++ b/drivers/platform/x86/dell-rbtn.c
> @@ -28,6 +28,7 @@ struct rbtn_data {
>  	enum rbtn_type type;
>  	struct rfkill *rfkill;
>  	struct input_dev *input_dev;
> +	bool suspended;
>  };
> 
> 
> @@ -220,9 +221,33 @@ static const struct acpi_device_id rbtn_ids[] =
> { { "", 0 },
>  };
> 
> +#ifdef CONFIG_PM_SLEEP
> +static int rbtn_suspend(struct device *dev)
> +{
> +	struct acpi_device *device = to_acpi_device(dev);
> +	struct rbtn_data *rbtn_data = acpi_driver_data(device);
> +
> +	rbtn_data->suspended = true;
> +
> +	return 0;
> +}
> +
> +static int rbtn_resume(struct device *dev)
> +{
> +	struct acpi_device *device = to_acpi_device(dev);
> +	struct rbtn_data *rbtn_data = acpi_driver_data(device);
> +
> +	rbtn_data->suspended = false;
> +
> +	return 0;
> +}
> +#endif
> +static SIMPLE_DEV_PM_OPS(rbtn_pm_ops, rbtn_suspend, rbtn_resume);
> +
>  static struct acpi_driver rbtn_driver = {
>  	.name = "dell-rbtn",
>  	.ids = rbtn_ids,
> +	.drv.pm = &rbtn_pm_ops,
>  	.ops = {
>  		.add = rbtn_add,
>  		.remove = rbtn_remove,
> @@ -384,6 +409,9 @@ static void rbtn_notify(struct acpi_device
> *device, u32 event) {
>  	struct rbtn_data *rbtn_data = device->driver_data;
> 
> +	if (rbtn_data->suspended)
> +		return;
> +
>  	if (event != 0x80) {
>  		dev_info(&device->dev, "Received unknown event (0x%x)\n",
>  			 event);

CCing Rafael & linux-acpi.

Is this correct way (via "suspended" variable and hooks in PM) how to 
ignore ACPI events when device is suspended?

-- 
Pali Rohár
pali.rohar@gmail.com

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH] dell-rbtn: Ignore ACPI notifications if device is suspended

[Pali Rohár]

On Saturday 21 November 2015 15:16:15 Gabriele Mazzotta wrote:
> Some BIOSes unconditionally send an ACPI notification to RBTN when the
> system is resuming from suspend. This makes dell-rbtn send an input
> event to userspace as if a function key was pressed. Prevent this by
> ignoring all the notifications received while the device is suspended.
> 
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=106031
> Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>

Andrei Borzenkov (CCed) tested this patch and patch does not fix bug.
Probably there is race condition and ACPI event is sent *after* function
rbtn_resume is called.

-- 
Pali Rohár
pali.rohar@gmail.com

Re: [PATCH] dell-rbtn: Ignore ACPI notifications if device is suspended

[Darren Hart]

On Mon, Nov 23, 2015 at 03:48:58PM +0100, Pali Rohár wrote:
> On Saturday 21 November 2015 15:16:15 Gabriele Mazzotta wrote:
> > Some BIOSes unconditionally send an ACPI notification to RBTN when the
> > system is resuming from suspend. This makes dell-rbtn send an input
> > event to userspace as if a function key was pressed. Prevent this by
> > ignoring all the notifications received while the device is suspended.
> > 
> > Link: https://bugzilla.kernel.org/show_bug.cgi?id=106031
> > Signed-off-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
> 
> Andrei Borzenkov (CCed) tested this patch and patch does not fix bug.
> Probably there is race condition and ACPI event is sent *after* function
> rbtn_resume is called.

I'm dropping this one until we can sort out a proper fix.

Is direction still needed from the ACPI side?
+Rafael
-- 
Darren Hart
Intel Open Source Technology Center