From patchwork Mon Jan 31 13:54:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 538612 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 49DD4C433EF for ; Mon, 31 Jan 2022 13:54:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377275AbiAaNyq (ORCPT ); Mon, 31 Jan 2022 08:54:46 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:49956 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243076AbiAaNyq (ORCPT ); Mon, 31 Jan 2022 08:54:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643637285; 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; bh=/7eLXGeEcbnzwvP0Ge/eOhaNZyrffnA2V6159pVPOTY=; b=Yt2c+FgsG28ZKGF30zxCdMUOsQyxQO6evymnlin/eHitLo3xw5Z/jgEfb/N+BMEZax4vmL AmXClooglxw72Y3wdnymfhcq2XYgTpo5jrKgijcoMGTGZmAVZUh04av/p2tQEy8bFUKaJF NAv1A9bgIqllavW622rHgSdnDho+EP4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-553-PruI2ypoPOay5GzPufsb4g-1; Mon, 31 Jan 2022 08:54:41 -0500 X-MC-Unique: PruI2ypoPOay5GzPufsb4g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 90C221932488; Mon, 31 Jan 2022 13:54:40 +0000 (UTC) Received: from x1.localdomain.com (unknown [10.39.194.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 346CB78AA2; Mon, 31 Jan 2022 13:54:38 +0000 (UTC) From: Hans de Goede To: Dmitry Torokhov , "Jingle . Wu" Cc: Hans de Goede , linux-input@vger.kernel.org Subject: [PATCH v2 1/2] Input: elan_i2c - Move regulator_[en|dis]able() out of elan_[en|dis]able_power() Date: Mon, 31 Jan 2022 14:54:35 +0100 Message-Id: <20220131135436.29638-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org elan_disable_power() is called conditionally on suspend, where as elan_enable_power() is always called on resume. This leads to an imbalance in the regulator's enable count. Move the regulator_[en|dis]able() calls out of elan_[en|dis]able_power() in preparation of fixing this. No functional changes intended. Signed-off-by: Hans de Goede --- Changes in v2: - New patch in v2 of this patch-set --- drivers/input/mouse/elan_i2c_core.c | 36 ++++++++++++++--------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index 47af62c12267..d8965f3c6bf5 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -191,13 +191,6 @@ static int elan_enable_power(struct elan_tp_data *data) int repeat = ETP_RETRY_COUNT; int error; - error = regulator_enable(data->vcc); - if (error) { - dev_err(&data->client->dev, - "failed to enable regulator: %d\n", error); - return error; - } - do { error = data->ops->power_control(data->client, true); if (error >= 0) @@ -217,19 +210,8 @@ static int elan_disable_power(struct elan_tp_data *data) do { error = data->ops->power_control(data->client, false); - if (!error) { - error = regulator_disable(data->vcc); - if (error) { - dev_err(&data->client->dev, - "failed to disable regulator: %d\n", - error); - /* Attempt to power the chip back up */ - data->ops->power_control(data->client, true); - break; - } - + if (!error) return 0; - } msleep(30); } while (--repeat > 0); @@ -1400,8 +1382,18 @@ static int __maybe_unused elan_suspend(struct device *dev) data->irq_wake = (enable_irq_wake(client->irq) == 0); } else { ret = elan_disable_power(data); + if (ret) + goto err; + + ret = regulator_disable(data->vcc); + if (ret) { + dev_err(dev, "error %d disabling regulator\n", ret); + /* Attempt to power the chip back up */ + elan_enable_power(data); + } } +err: mutex_unlock(&data->sysfs_mutex); return ret; } @@ -1417,6 +1409,12 @@ static int __maybe_unused elan_resume(struct device *dev) data->irq_wake = false; } + error = regulator_enable(data->vcc); + if (error) { + dev_err(dev, "error %d enabling regulator\n", error); + goto err; + } + error = elan_enable_power(data); if (error) { dev_err(dev, "power up when resuming failed: %d\n", error); From patchwork Mon Jan 31 13:54:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 540220 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CFED5C433F5 for ; Mon, 31 Jan 2022 13:54:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346094AbiAaNys (ORCPT ); Mon, 31 Jan 2022 08:54:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:53247 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243076AbiAaNyr (ORCPT ); Mon, 31 Jan 2022 08:54:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643637287; 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=Yu0VwXvkL6XBmt3SfSCF2I/Qu1oSvMyxpf3tK8PmpNA=; b=WXsQ8/VC1Cw9gMpCvOs+NWNCOJjXS+KGyzseMvC/Y/HTo782I3LohuY+tPXM9366htrI5Y mGhYn710ibLuEbunpzmXfqHR3Wh6xJt9I0VUgUaZpH3BOHQMAjwYS5TpGBa+DCfU2/Fmtt h5EzExby5Zui0RIKjQph0ph7U8QOGZU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-314-BqrVJsSyMyyXdI1tq_AywA-1; Mon, 31 Jan 2022 08:54:44 -0500 X-MC-Unique: BqrVJsSyMyyXdI1tq_AywA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3C83284BA44; Mon, 31 Jan 2022 13:54:43 +0000 (UTC) Received: from x1.localdomain.com (unknown [10.39.194.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id E3C9678AA2; Mon, 31 Jan 2022 13:54:40 +0000 (UTC) From: Hans de Goede To: Dmitry Torokhov , "Jingle . Wu" Cc: Hans de Goede , linux-input@vger.kernel.org Subject: [PATCH v2 2/2] Input: elan_i2c - Fix regulator enable count imbalance after suspend/resume Date: Mon, 31 Jan 2022 14:54:36 +0100 Message-Id: <20220131135436.29638-2-hdegoede@redhat.com> In-Reply-To: <20220131135436.29638-1-hdegoede@redhat.com> References: <20220131135436.29638-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Before these changes elan_suspend() would only disable the regulator when device_may_wakeup() returns false; whereas elan_resume() would unconditionally enable it, leading to an enable count imbalance when device_may_wakeup() returns true. This triggers the "WARN_ON(regulator->enable_count)" in regulator_put() when the elan_i2c driver gets unbound, this happens e.g. with the hot-plugable dock with Elan I2C touchpad for the Asus TF103C 2-in-1. Fix this by making the regulator_enable() call also be conditional on device_may_wakeup() returning false. Signed-off-by: Hans de Goede --- Changes in v2: -Only make the regulator_enable() conditional, leaving the behavior of always calling elan_enable_power() on resume intact --- drivers/input/mouse/elan_i2c_core.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index d8965f3c6bf5..4dbf4dc78aa4 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1404,17 +1404,17 @@ static int __maybe_unused elan_resume(struct device *dev) struct elan_tp_data *data = i2c_get_clientdata(client); int error; - if (device_may_wakeup(dev) && data->irq_wake) { + if (!device_may_wakeup(dev)) { + error = regulator_enable(data->vcc); + if (error) { + dev_err(dev, "error %d enabling regulator\n", error); + goto err; + } + } else if (data->irq_wake) { disable_irq_wake(client->irq); data->irq_wake = false; } - error = regulator_enable(data->vcc); - if (error) { - dev_err(dev, "error %d enabling regulator\n", error); - goto err; - } - error = elan_enable_power(data); if (error) { dev_err(dev, "power up when resuming failed: %d\n", error);