From patchwork Fri Mar 18 22:44:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriele Mazzotta X-Patchwork-Id: 8624191 Return-Path: X-Original-To: patchwork-platform-driver-x86@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C0492C0553 for ; Fri, 18 Mar 2016 22:44:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C985120383 for ; Fri, 18 Mar 2016 22:44:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E07742021B for ; Fri, 18 Mar 2016 22:44:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753279AbcCRWoe (ORCPT ); Fri, 18 Mar 2016 18:44:34 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33314 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753184AbcCRWod (ORCPT ); Fri, 18 Mar 2016 18:44:33 -0400 Received: by mail-wm0-f67.google.com with SMTP id x188so9061653wmg.0; Fri, 18 Mar 2016 15:44:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ECm9dTpE72Nno8XSdre2qojHRLE5vuUwD71zqilsxOs=; b=hFl7segQQj7TAJbGIdBHc6/a5DoXymH376RzcQJ+FMdnMIAvJEKkK+0RNdw6gz6Gg5 yiS5rFjkpE99OGPC2HyHu7edhZL3NKHJ6EoPhKbWo3I5BqTQ3ceRo6DWeU/8bDWNM8j0 S0upfZuYb423x/ZWdEwdPnAcTVwswO2h9tVTyvk++orsEaZ5GLmQhW2T3QVSnFRhweJq jFvROFojovN+IaKUcZtWp+Y+vWYSo9K/MX0G+HpIDzjh7YiI5luo1LVuMy3+sHwXDge1 hsEOwoNcTtXxqIfP5IrhY8R96lHRFmsKtGwYtk2ka3CRkLFQnoF3e+35xvj0XzsoDWKQ i+gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ECm9dTpE72Nno8XSdre2qojHRLE5vuUwD71zqilsxOs=; b=XxtRULiIzVZWDjtgQypEXDOhL5B4BytKBOmDmXH3G0etQcC2IKooeu+rea4aCdmc2u eA9h+GLqyW1VvFfgr77uHUrFZb4HufoBA62CKhYqVTY03gdf1dOB11CjtVM/cGLVGJor nwCi9AZC+k0ZCyr13YUSaS7HOygZ2etW6xNtZ8Edz1nXivAfUKvdPeHOL+PcNKaRR9Db b0aX8WmoRXZ7X66jzQEeTEsNdM6Y0SNToikgbyxskEARZtvhtJzzrcSS5wVPcXfxHVoe Qs85OW6EsPm0/bC6TwvkSzj/EZmDyoYj4PXYutzCiDS/PSgWlphkwvVVgPuSMcKWWREK YUrA== X-Gm-Message-State: AD7BkJLg4Zp45tktFWe+dtOO7ixHhsyWHZ7tVThAfttCuAEbvpM/12uJvtfv40hPkDIn3Q== X-Received: by 10.194.92.68 with SMTP id ck4mr17920432wjb.144.1458341071676; Fri, 18 Mar 2016 15:44:31 -0700 (PDT) Received: from xps13.homenet (2-235-140-64.ip228.fastwebnet.it. [2.235.140.64]) by smtp.gmail.com with ESMTPSA id c128sm1174325wma.11.2016.03.18.15.44.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Mar 2016 15:44:31 -0700 (PDT) From: Gabriele Mazzotta To: dvhart@infradead.org Cc: pali.rohar@gmail.com, Jared_Dominguez@dell.com, platform-driver-x86@vger.kernel.org, rjw@rjwysocki.net, alex.hung@canonical.com, arvidjaar@gmail.com, linux-kernel@vger.kernel.org, Gabriele Mazzotta Subject: [PATCH v3] dell-rbtn: Ignore ACPI notifications if device is suspended Date: Fri, 18 Mar 2016 23:44:23 +0100 Message-Id: <1458341063-8753-1-git-send-email-gabriele.mzt@gmail.com> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1457740175-8327-1-git-send-email-gabriele.mzt@gmail.com> References: <1457740175-8327-1-git-send-email-gabriele.mzt@gmail.com> Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Same as v2 with some comments drivers/platform/x86/dell-rbtn.c | 50 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/drivers/platform/x86/dell-rbtn.c b/drivers/platform/x86/dell-rbtn.c index 5155278..b144b8c 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,49 @@ 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; + + /* + * Clear the flag only after we received the extra + * ACPI notification. + */ + 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 +425,15 @@ static void rbtn_notify(struct acpi_device *device, u32 event) { struct rbtn_data *rbtn_data = device->driver_data; + /* + * Some BIOSes send autonomously a notification at resume. + * Ignore it to prevent unwanted input events. + */ + 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);