From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934232AbcCNMPt (ORCPT ); Mon, 14 Mar 2016 08:15:49 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:35888 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933964AbcCNMPk convert rfc822-to-8bit (ORCPT ); Mon, 14 Mar 2016 08:15:40 -0400 MIME-Version: 1.0 In-Reply-To: <20160314114525.GK8413@pali> References: <1457740175-8327-1-git-send-email-gabriele.mzt@gmail.com> <20160314114525.GK8413@pali> Date: Mon, 14 Mar 2016 15:15:39 +0300 Message-ID: Subject: Re: [PATCH v2] dell-rbtn: Ignore ACPI notifications if device is suspended From: Andrei Borzenkov To: =?UTF-8?Q?Pali_Roh=C3=A1r?= Cc: Gabriele Mazzotta , "Rafael J. Wysocki" , "D. Jared Dominguez" , "platform-driver-x86@vger.kernel.org" , Alex Hung , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 14, 2016 at 2:45 PM, Pali Rohár wrote: > On Monday 14 March 2016 12:34:31 Gabriele Mazzotta wrote: >> 2016-03-12 0:49 GMT+01:00 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 >> > --- >> > drivers/platform/x86/dell-rbtn.c | 41 ++++++++++++++++++++++++++++++++++++++++ >> > 1 file changed, 41 insertions(+) >> > >> > diff --git a/drivers/platform/x86/dell-rbtn.c b/drivers/platform/x86/dell-rbtn.c >> > index cd410e3..56b0da7 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,44 @@ static const struct acpi_device_id rbtn_ids[] = { >> > { "", 0 }, >> > }; >> > >> > +#ifdef CONFIG_PM_SLEEP >> > +static void ACPI_SYSTEM_XFACE rbtn_acpi_clear_flag(void *context) >> > +{ >> > + struct rbtn_data *rbtn_data = context; >> > + >> > + rbtn_data->suspended = false; >> > +} >> > + >> > +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); >> > + acpi_status status; >> > + >> > + status = acpi_os_execute(OSL_NOTIFY_HANDLER, >> > + rbtn_acpi_clear_flag, rbtn_data); >> > + if (ACPI_FAILURE(status)) >> > + 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 +420,11 @@ static void rbtn_notify(struct acpi_device *device, u32 event) >> > { >> > struct rbtn_data *rbtn_data = device->driver_data; >> > >> > + if (rbtn_data->suspended) { >> > + dev_dbg(&device->dev, "ACPI notification ignored\n"); >> > + return; >> > + } >> > + >> > if (event != 0x80) { >> > dev_info(&device->dev, "Received unknown event (0x%x)\n", >> > event); >> > -- >> > 2.7.0 >> > >> >> I'm sorry, Pali, I must have missed your email address while sending >> this updated version. > > For me patch looks OK. I would suggest to add some comment about BIOS > into code too. > > Rafael, can you review that ACPI suspended/OSL_NOTIFY_HANDLER part? > > Andrei, can you test if it now really fix it on your machine? > Yes, but will take some time, later this week. From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrei Borzenkov Subject: Re: [PATCH v2] dell-rbtn: Ignore ACPI notifications if device is suspended Date: Mon, 14 Mar 2016 15:15:39 +0300 Message-ID: References: <1457740175-8327-1-git-send-email-gabriele.mzt@gmail.com> <20160314114525.GK8413@pali> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail-io0-f196.google.com ([209.85.223.196]:35888 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933964AbcCNMPk convert rfc822-to-8bit (ORCPT ); Mon, 14 Mar 2016 08:15:40 -0400 In-Reply-To: <20160314114525.GK8413@pali> Sender: platform-driver-x86-owner@vger.kernel.org List-ID: To: =?UTF-8?Q?Pali_Roh=C3=A1r?= Cc: Gabriele Mazzotta , "Rafael J. Wysocki" , "D. Jared Dominguez" , "platform-driver-x86@vger.kernel.org" , Alex Hung , "linux-kernel@vger.kernel.org" On Mon, Mar 14, 2016 at 2:45 PM, Pali Roh=C3=A1r = wrote: > On Monday 14 March 2016 12:34:31 Gabriele Mazzotta wrote: >> 2016-03-12 0:49 GMT+01:00 Gabriele Mazzotta = : >> > Some BIOSes unconditionally send an ACPI notification to RBTN when= the >> > system is resuming from suspend. This makes dell-rbtn send an inpu= t >> > event to userspace as if a function key was pressed. Prevent this = by >> > ignoring all the notifications received while the device is suspen= ded. >> > >> > Link: https://bugzilla.kernel.org/show_bug.cgi?id=3D106031 >> > Signed-off-by: Gabriele Mazzotta >> > --- >> > drivers/platform/x86/dell-rbtn.c | 41 +++++++++++++++++++++++++++= +++++++++++++ >> > 1 file changed, 41 insertions(+) >> > >> > diff --git a/drivers/platform/x86/dell-rbtn.c b/drivers/platform/x= 86/dell-rbtn.c >> > index cd410e3..56b0da7 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,44 @@ static const struct acpi_device_id rbtn_ids[]= =3D { >> > { "", 0 }, >> > }; >> > >> > +#ifdef CONFIG_PM_SLEEP >> > +static void ACPI_SYSTEM_XFACE rbtn_acpi_clear_flag(void *context) >> > +{ >> > + struct rbtn_data *rbtn_data =3D context; >> > + >> > + rbtn_data->suspended =3D false; >> > +} >> > + >> > +static int rbtn_suspend(struct device *dev) >> > +{ >> > + struct acpi_device *device =3D to_acpi_device(dev); >> > + struct rbtn_data *rbtn_data =3D acpi_driver_data(device); >> > + >> > + rbtn_data->suspended =3D true; >> > + >> > + return 0; >> > +} >> > + >> > +static int rbtn_resume(struct device *dev) >> > +{ >> > + struct acpi_device *device =3D to_acpi_device(dev); >> > + struct rbtn_data *rbtn_data =3D acpi_driver_data(device); >> > + acpi_status status; >> > + >> > + status =3D acpi_os_execute(OSL_NOTIFY_HANDLER, >> > + rbtn_acpi_clear_flag, rbtn_data); >> > + if (ACPI_FAILURE(status)) >> > + rbtn_data->suspended =3D false; >> > + >> > + return 0; >> > +} >> > +#endif >> > +static SIMPLE_DEV_PM_OPS(rbtn_pm_ops, rbtn_suspend, rbtn_resume); >> > + >> > static struct acpi_driver rbtn_driver =3D { >> > .name =3D "dell-rbtn", >> > .ids =3D rbtn_ids, >> > + .drv.pm =3D &rbtn_pm_ops, >> > .ops =3D { >> > .add =3D rbtn_add, >> > .remove =3D rbtn_remove, >> > @@ -384,6 +420,11 @@ static void rbtn_notify(struct acpi_device *d= evice, u32 event) >> > { >> > struct rbtn_data *rbtn_data =3D device->driver_data; >> > >> > + if (rbtn_data->suspended) { >> > + dev_dbg(&device->dev, "ACPI notification ignored\n= "); >> > + return; >> > + } >> > + >> > if (event !=3D 0x80) { >> > dev_info(&device->dev, "Received unknown event (0x= %x)\n", >> > event); >> > -- >> > 2.7.0 >> > >> >> I'm sorry, Pali, I must have missed your email address while sending >> this updated version. > > For me patch looks OK. I would suggest to add some comment about BIOS > into code too. > > Rafael, can you review that ACPI suspended/OSL_NOTIFY_HANDLER part? > > Andrei, can you test if it now really fix it on your machine? > Yes, but will take some time, later this week.