From patchwork Tue Feb 25 10:27:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 194401 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5564C35DFB for ; Tue, 25 Feb 2020 10:28:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BD8BF218AC for ; Tue, 25 Feb 2020 10:28:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JpWNV9SL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730238AbgBYK2G (ORCPT ); Tue, 25 Feb 2020 05:28:06 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:33854 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730251AbgBYK2F (ORCPT ); Tue, 25 Feb 2020 05:28:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582626484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1+176jSPRXbnwscrhWa+EjnBARcoj+azxUULJIshoqo=; b=JpWNV9SLsX+oqXvAK4fhHqmSwlCw0Bry07nNpIAZU0YME3ptthGKJmud3YXuMQJP7oJqfW fJvn5Tm9cVUS+FJkYNmytfTWTgNt1RjYj+mC9daau9TXOxp0Xs06mAvo3Cy7kg40CelLLY YQT7IOYbLTq4u/FQ8SbXsUK8k8ED3Rg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-5-NfLwfEaeP2O-qbs6gn4xdQ-1; Tue, 25 Feb 2020 05:28:02 -0500 X-MC-Unique: NfLwfEaeP2O-qbs6gn4xdQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0B46D18FE863; Tue, 25 Feb 2020 10:28:01 +0000 (UTC) Received: from x1.localdomain.com (unknown [10.36.118.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C7731001902; Tue, 25 Feb 2020 10:27:59 +0000 (UTC) From: Hans de Goede To: Mika Westerberg , Andy Shevchenko , Bartosz Golaszewski , Linus Walleij Cc: Hans de Goede , Marc Lehmann , linux-gpio@vger.kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH resend 2/3] gpiolib: acpi: Rename honor_wakeup option to ignore_wake, add extra quirk Date: Tue, 25 Feb 2020 11:27:52 +0100 Message-Id: <20200225102753.8351-3-hdegoede@redhat.com> In-Reply-To: <20200225102753.8351-1-hdegoede@redhat.com> References: <20200225102753.8351-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Commit aa23ca3d98f7 ("gpiolib: acpi: Add honor_wakeup module-option + quirk mechanism") was added to deal with spurious wakeups on one specific model of the HP x2 10 series. In the mean time I have learned that there are at least 3 variants of the HP x2 10 models: Bay Trail SoC + AXP288 PMIC Cherry Trail SoC + AXP288 PMIC Cherry Trail SoC + TI PMIC It turns out that the need to ignore wakeup on *all* ACPI GPIO event handlers is unique to the Cherry Trail SoC + TI PMIC variant for which the first quirk was added. The 2 variants with the AXP288 PMIC only need to have wakeup disabled on the embedded-controller event handler. We want to e.g. keep wakeup on the event handler connected to the GPIO for the lid open/closed sensor. Since the honor_wakeup option was added to be able to ignore wake events, the name was perhaps not the best, this commit renames it to ignore_wake, this version of the option has te following possible values: values >= 0: a pin number on which to ignore wakeups, the ACPI wake flag will still be honored on all other pins value -1: auto: check for DMI quirk, otherwise honor the flag on all pins value -2: all: ignore the flag on all pins value -3: none: honor wakeups on all pins Note that it is possible for an ACPI table to request events on the same pin-number on multiple GPIO controllers, in that case if such a pin-number is used as ignore_wake value then wakeups will be ignored for that pin on all GPIO controllers. The existing quirk for the Cherry Trail + TI PMIC models is changed to IGNORE_WAKE_ALL, keeping the current behavior; and a new quirk is added for the Bay Trail + AXP288 model, ignoring wakeups on the EC GPIO pin only. Fixes: aa23ca3d98f7 ("gpiolib: acpi: Add honor_wakeup module-option + quirk mechanism") Signed-off-by: Hans de Goede --- drivers/gpio/gpiolib-acpi.c | 59 +++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index bc96f28d4807..83103efa5862 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -21,19 +21,27 @@ #include "gpiolib.h" #include "gpiolib-acpi.h" -#define QUIRK_NO_EDGE_EVENTS_ON_BOOT 0x01l -#define QUIRK_NO_WAKEUP 0x02l +#define QUIRK_IGNORE_WAKE_MASK GENMASK(15, 0) +#define QUIRK_IGNORE_WAKE_SET BIT(16) +#define QUIRK_NO_EDGE_EVENTS_ON_BOOT BIT(17) + +#define QUIRK_IGNORE_WAKE(x) \ + (((x) & QUIRK_IGNORE_WAKE_MASK) | QUIRK_IGNORE_WAKE_SET) + +#define IGNORE_WAKE_AUTO -1 +#define IGNORE_WAKE_ALL -2 +#define IGNORE_WAKE_NONE -3 + +static int ignore_wake = IGNORE_WAKE_AUTO; +module_param(ignore_wake, int, 0444); +MODULE_PARM_DESC(ignore_wake, + "Ignore ACPI wake flag: x=ignore-for-pin-x, -1=auto, -2=all, -3=none"); static int run_edge_events_on_boot = -1; module_param(run_edge_events_on_boot, int, 0444); MODULE_PARM_DESC(run_edge_events_on_boot, "Run edge _AEI event-handlers at boot: 0=no, 1=yes, -1=auto"); -static int honor_wakeup = -1; -module_param(honor_wakeup, int, 0444); -MODULE_PARM_DESC(honor_wakeup, - "Honor the ACPI wake-capable flag: 0=no, 1=yes, -1=auto"); - /** * struct acpi_gpio_event - ACPI GPIO event handler data * @@ -214,6 +222,7 @@ static acpi_status acpi_gpiochip_alloc_event(struct acpi_resource *ares, irq_handler_t handler = NULL; struct gpio_desc *desc; int ret, pin, irq; + bool honor_wakeup; if (!acpi_gpio_get_irq_resource(ares, &agpio)) return AE_OK; @@ -286,6 +295,17 @@ static acpi_status acpi_gpiochip_alloc_event(struct acpi_resource *ares, } } + switch (ignore_wake) { + case IGNORE_WAKE_ALL: + honor_wakeup = false; + break; + case IGNORE_WAKE_NONE: + honor_wakeup = true; + break; + default: + honor_wakeup = ignore_wake != pin; + } + event->handle = evt_handle; event->handler = handler; event->irq = irq; @@ -1363,7 +1383,22 @@ static const struct dmi_system_id gpiolib_acpi_quirks[] = { DMI_MATCH(DMI_SYS_VENDOR, "HP"), DMI_MATCH(DMI_PRODUCT_NAME, "HP x2 Detachable 10-p0XX"), }, - .driver_data = (void *)QUIRK_NO_WAKEUP, + .driver_data = (void *)QUIRK_IGNORE_WAKE(IGNORE_WAKE_ALL), + }, + { + /* + * HP X2 10 models with Bay Trail SoC + AXP288 PMIC use an + * external embedded-controller connected via I2C + an ACPI + * GPIO event handler for pin 0x1c, causing spurious wakeups. + * Unlike the Cherry Trail + TI PMIC models, we do want to + * honor the ACPI wake flag on the other GPIOs. + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion x2 Detachable"), + DMI_MATCH(DMI_BOARD_NAME, "815D"), + }, + .driver_data = (void *)QUIRK_IGNORE_WAKE(0x1c), }, {} /* Terminating entry */ }; @@ -1384,11 +1419,11 @@ static int acpi_gpio_setup_params(void) run_edge_events_on_boot = 1; } - if (honor_wakeup < 0) { - if (quirks & QUIRK_NO_WAKEUP) - honor_wakeup = 0; + if (ignore_wake == IGNORE_WAKE_AUTO) { + if (quirks & QUIRK_IGNORE_WAKE_SET) + ignore_wake = (s16)(quirks & QUIRK_IGNORE_WAKE_MASK); else - honor_wakeup = 1; + ignore_wake = IGNORE_WAKE_NONE; } return 0;