From: Hans de Goede <hdegoede@redhat.com>
To: Andrzej Pietrasiewicz <andrzej.p@collabora.com>,
linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, linux-input@vger.kernel.org,
linux-tegra@vger.kernel.org, patches@opensource.cirrus.com,
ibm-acpi-devel@lists.sourceforge.net,
platform-driver-x86@vger.kernel.org
Cc: "Rafael J . Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>, Jonathan Cameron <jic23@kernel.org>,
Hartmut Knaack <knaack.h@gmx.de>,
Lars-Peter Clausen <lars@metafoo.de>,
Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
Kukjin Kim <kgene@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>,
NXP Linux Team <linux-imx@nxp.com>,
Vladimir Zapolskiy <vz@mleia.com>,
Sylvain Lemieux <slemieux.tyco@gmail.com>,
Laxman Dewangan <ldewangan@nvidia.com>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Barry Song <baohua@kernel.org>,
Michael Hennerich <michael.hennerich@analog.com>,
Nick Dyer <nick@shmanahar.org>, Ferruh Yigit <fery@cypress.com>,
Sangwon Jee <jeesw@melfas.com>,
Peter Hutterer <peter.hutterer@redhat.com>,
Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>,
kernel@collabora.com, Patrik Fimml <patrikf@chromium.org>
Subject: Re: [PATCH v3 7/7] Input: Add "inhibited" property
Date: Fri, 5 Jun 2020 19:41:33 +0200 [thread overview]
Message-ID: <2336e15d-ff4b-bbb6-c701-dbf3aa110fcd@redhat.com> (raw)
In-Reply-To: <20200605173335.13753-8-andrzej.p@collabora.com>
Hi,
On 6/5/20 7:33 PM, Andrzej Pietrasiewicz wrote:
> From: Patrik Fimml <patrikf@chromium.org>
>
> Userspace might want to implement a policy to temporarily disregard input
> from certain devices, including not treating them as wakeup sources.
>
> An example use case is a laptop, whose keyboard can be folded under the
> screen to create tablet-like experience. The user then must hold the laptop
> in such a way that it is difficult to avoid pressing the keyboard keys. It
> is therefore desirable to temporarily disregard input from the keyboard,
> until it is folded back. This obviously is a policy which should be kept
> out of the kernel, but the kernel must provide suitable means to implement
> such a policy.
>
> This patch adds a sysfs interface for exactly this purpose.
>
> To implement the said interface it adds an "inhibited" property to struct
> input_dev, and effectively creates four states a device can be in: closed
> uninhibited, closed inhibited, open uninhibited, open inhibited. It also
> defers calling driver's ->open() and ->close() to until they are actually
> needed, e.g. it makes no sense to prepare the underlying device for
> generating events (->open()) if the device is inhibited.
>
> uninhibit
> closed <------------ closed
> uninhibited ------------> inhibited
> | ^ inhibit | ^
> 1st | | 1st | |
> open | | open | |
> | | | |
> | | last | | last
> | | close | | close
> v | uninhibit v |
> open <------------ open
> uninhibited ------------> inhibited
>
> The top inhibit/uninhibit transition happens when users == 0.
> The bottom inhibit/uninhibit transition happens when users > 0.
> The left open/close transition happens when !inhibited.
> The right open/close transition happens when inhibited.
> Due to all transitions being serialized with dev->mutex, it is impossible
> to have "diagonal" transitions between closed uninhibited and open
> inhibited or between open uninhibited and closed inhibited.
>
> No new callbacks are added to drivers, because their open() and close()
> serve exactly the purpose to tell the driver to start/stop providing
> events to the input core. Consequently, open() and close() - if provided
> - are called in both inhibit and uninhibit paths.
>
> Signed-off-by: Patrik Fimml <patrikf@chromium.org>
> Co-developed-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
> ---
> drivers/input/input.c | 115 +++++++++++++++++++++++++++++++++++++++---
> include/linux/input.h | 12 ++++-
> 2 files changed, 118 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/input/input.c b/drivers/input/input.c
> index 41377bfa142d..4110b5797219 100644
> --- a/drivers/input/input.c
> +++ b/drivers/input/input.c
> @@ -284,8 +284,11 @@ static int input_get_disposition(struct input_dev *dev,
> case EV_KEY:
> if (is_event_supported(code, dev->keybit, KEY_MAX)) {
>
> - /* auto-repeat bypasses state updates */
> - if (value == 2) {
> + /*
> + * auto-repeat bypasses state updates but repeat
> + * events are ignored if the key is not pressed
> + */
> + if (value == 2 && test_bit(code, dev->key)) {
> disposition = INPUT_PASS_TO_HANDLERS;
> break;
> }
> @@ -367,8 +370,13 @@ static int input_get_disposition(struct input_dev *dev,
> static void input_handle_event(struct input_dev *dev,
> unsigned int type, unsigned int code, int value)
> {
> - int disposition = input_get_disposition(dev, type, code, &value);
> + int disposition;
> +
> + /* filter-out events from inhibited devices */
> + if (dev->inhibited)
> + return;
>
> + disposition = input_get_disposition(dev, type, code, &value);
> if (disposition != INPUT_IGNORE_EVENT && type != EV_SYN)
> add_input_randomness(type, code, value);
>
> @@ -612,7 +620,7 @@ int input_open_device(struct input_handle *handle)
>
> handle->open++;
>
> - if (dev->users++) {
> + if (dev->users++ || dev->inhibited) {
> /*
> * Device is already opened, so we can exit immediately and
> * report success.
It seems the comment which is part of the context here may need some
updating because of the inhibit changes ?
Otherwise this patch and the rest of the series looks good to me
now. Thank you very much for your work on this.
Regards,
Hans
> @@ -675,10 +683,9 @@ void input_close_device(struct input_handle *handle)
>
> __input_release_device(handle);
>
> - if (!--dev->users) {
> + if (!dev->inhibited && !--dev->users) {
> if (dev->poller)
> input_dev_poller_stop(dev->poller);
> -
> if (dev->close)
> dev->close(dev);
> }
> @@ -1416,12 +1423,49 @@ static ssize_t input_dev_show_properties(struct device *dev,
> }
> static DEVICE_ATTR(properties, S_IRUGO, input_dev_show_properties, NULL);
>
> +static int input_inhibit_device(struct input_dev *dev);
> +static int input_uninhibit_device(struct input_dev *dev);
> +
> +static ssize_t inhibited_show(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> +{
> + struct input_dev *input_dev = to_input_dev(dev);
> +
> + return scnprintf(buf, PAGE_SIZE, "%d\n", input_dev->inhibited);
> +}
> +
> +static ssize_t inhibited_store(struct device *dev,
> + struct device_attribute *attr, const char *buf,
> + size_t len)
> +{
> + struct input_dev *input_dev = to_input_dev(dev);
> + ssize_t rv;
> + bool inhibited;
> +
> + if (strtobool(buf, &inhibited))
> + return -EINVAL;
> +
> + if (inhibited)
> + rv = input_inhibit_device(input_dev);
> + else
> + rv = input_uninhibit_device(input_dev);
> +
> + if (rv != 0)
> + return rv;
> +
> + return len;
> +}
> +
> +static DEVICE_ATTR_RW(inhibited);
> +
> static struct attribute *input_dev_attrs[] = {
> &dev_attr_name.attr,
> &dev_attr_phys.attr,
> &dev_attr_uniq.attr,
> &dev_attr_modalias.attr,
> &dev_attr_properties.attr,
> + &dev_attr_inhibited.attr,
> NULL
> };
>
> @@ -1703,6 +1747,63 @@ void input_reset_device(struct input_dev *dev)
> }
> EXPORT_SYMBOL(input_reset_device);
>
> +static int input_inhibit_device(struct input_dev *dev)
> +{
> + int ret = 0;
> +
> + mutex_lock(&dev->mutex);
> +
> + if (dev->inhibited)
> + goto out;
> +
> + if (dev->users) {
> + if (dev->close)
> + dev->close(dev);
> + if (dev->poller)
> + input_dev_poller_stop(dev->poller);
> + }
> +
> + spin_lock_irq(&dev->event_lock);
> + input_dev_release_keys(dev);
> + input_dev_toggle(dev, false);
> + spin_unlock_irq(&dev->event_lock);
> +
> + dev->inhibited = true;
> +
> +out:
> + mutex_unlock(&dev->mutex);
> + return ret;
> +}
> +
> +static int input_uninhibit_device(struct input_dev *dev)
> +{
> + int ret = 0;
> +
> + mutex_lock(&dev->mutex);
> +
> + if (!dev->inhibited)
> + goto out;
> +
> + if (dev->users) {
> + if (dev->open) {
> + ret = dev->open(dev);
> + if (ret)
> + goto out;
> + }
> + if (dev->poller)
> + input_dev_poller_start(dev->poller);
> + }
> +
> + dev->inhibited = false;
> + spin_lock_irq(&dev->event_lock);
> + input_dev_toggle(dev, true);
> + spin_unlock_irq(&dev->event_lock);
> +
> +out:
> + mutex_unlock(&dev->mutex);
> + return ret;
> +}
> +
> #ifdef CONFIG_PM_SLEEP
> static int input_dev_suspend(struct device *dev)
> {
> @@ -2131,7 +2232,7 @@ bool input_device_enabled(struct input_dev *dev)
> {
> lockdep_assert_held(&dev->mutex);
>
> - return dev->users > 0;
> + return !dev->inhibited && dev->users > 0;
> }
> EXPORT_SYMBOL_GPL(input_device_enabled);
>
> diff --git a/include/linux/input.h b/include/linux/input.h
> index eda4587dba67..0354b298d874 100644
> --- a/include/linux/input.h
> +++ b/include/linux/input.h
> @@ -90,9 +90,11 @@ enum input_clock_type {
> * @open: this method is called when the very first user calls
> * input_open_device(). The driver must prepare the device
> * to start generating events (start polling thread,
> - * request an IRQ, submit URB, etc.)
> + * request an IRQ, submit URB, etc.). The meaning of open() is
> + * to start providing events to the input core.
> * @close: this method is called when the very last user calls
> - * input_close_device().
> + * input_close_device(). The meaning of close() is to stop
> + * providing events to the input core.
> * @flush: purges the device. Most commonly used to get rid of force
> * feedback effects loaded into the device when disconnecting
> * from it
> @@ -127,6 +129,10 @@ enum input_clock_type {
> * and needs not be explicitly unregistered or freed.
> * @timestamp: storage for a timestamp set by input_set_timestamp called
> * by a driver
> + * @inhibited: indicates that the input device is inhibited. If that is
> + * the case then input core ignores any events generated by the device.
> + * Device's close() is called when it is being inhibited and its open()
> + * is called when it is being uninhibited.
> */
> struct input_dev {
> const char *name;
> @@ -201,6 +207,8 @@ struct input_dev {
> bool devres_managed;
>
> ktime_t timestamp[INPUT_CLK_MAX];
> +
> + bool inhibited;
> };
> #define to_input_dev(d) container_of(d, struct input_dev, dev)
>
>
next prev parent reply other threads:[~2020-06-05 17:41 UTC|newest]
Thread overview: 90+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200506002746.GB89269@dtor-ws>
2020-05-15 16:49 ` [PATCHv2 0/7] Support inhibiting input devices Andrzej Pietrasiewicz
2020-05-15 16:51 ` [PATCHv2 1/7] Input: add input_device_enabled() Andrzej Pietrasiewicz
2020-05-15 16:52 ` [PATCHv2 4/7] iio: adc: exynos: Use input_device_enabled() Andrzej Pietrasiewicz
2020-05-15 16:52 ` [PATCHv2 6/7] Input: Add "inhibited" property Andrzej Pietrasiewicz
2020-05-15 18:19 ` [PATCHv2 0/7] Support inhibiting input devices Hans de Goede
2020-05-17 22:55 ` Peter Hutterer
2020-05-18 2:40 ` Dmitry Torokhov
2020-05-18 7:36 ` Hans de Goede
2020-05-22 15:35 ` Andrzej Pietrasiewicz
2020-05-27 6:13 ` Peter Hutterer
2020-05-18 10:48 ` Andrzej Pietrasiewicz
2020-05-18 12:24 ` Hans de Goede
2020-05-18 13:49 ` Andrzej Pietrasiewicz
2020-05-18 14:23 ` Hans de Goede
2020-05-19 9:02 ` Andrzej Pietrasiewicz
2020-05-19 9:36 ` Hans de Goede
2020-05-27 6:34 ` Dmitry Torokhov
2020-06-02 16:56 ` Andrzej Pietrasiewicz
2020-06-02 17:52 ` Dmitry Torokhov
2020-06-02 18:50 ` Andrzej Pietrasiewicz
2020-06-02 20:19 ` Hans de Goede
2020-06-03 13:07 ` Andrzej Pietrasiewicz
2020-06-03 17:38 ` Hans de Goede
2020-06-03 17:54 ` Andrzej Pietrasiewicz
2020-06-03 19:37 ` Hans de Goede
2020-06-04 7:28 ` Dmitry Torokhov
2020-06-05 17:33 ` [PATCH v3 " Andrzej Pietrasiewicz
2020-06-05 17:33 ` [PATCH v3 1/7] Input: add input_device_enabled() Andrzej Pietrasiewicz
2020-06-05 17:33 ` [PATCH v3 2/7] Input: use input_device_enabled() Andrzej Pietrasiewicz
2020-06-05 17:33 ` [PATCH v3 3/7] ACPI: button: Access input device's users under appropriate mutex Andrzej Pietrasiewicz
2020-06-05 17:33 ` [PATCH v3 4/7] ACPI: button: Use input_device_enabled() helper Andrzej Pietrasiewicz
2020-06-05 17:33 ` [PATCH v3 5/7] iio: adc: exynos: Use input_device_enabled() Andrzej Pietrasiewicz
2020-06-05 19:49 ` Michał Mirosław
2020-06-05 17:33 ` [PATCH v3 6/7] platform/x86: thinkpad_acpi: " Andrzej Pietrasiewicz
2020-06-05 17:33 ` [PATCH v3 7/7] Input: Add "inhibited" property Andrzej Pietrasiewicz
2020-06-05 17:41 ` Hans de Goede [this message]
2020-06-08 11:22 ` [PATCH v4 0/7] Support inhibiting input devices Andrzej Pietrasiewicz
2020-06-08 11:22 ` [PATCH v4 1/7] Input: add input_device_enabled() Andrzej Pietrasiewicz
2020-12-03 6:25 ` Dmitry Torokhov
2020-06-08 11:22 ` [PATCH v4 2/7] Input: use input_device_enabled() Andrzej Pietrasiewicz
2020-12-03 6:26 ` Dmitry Torokhov
[not found] ` <CGME20201207133237eucas1p26f8484944760a14e51dc7353ed33cd28@eucas1p2.samsung.com>
2020-12-07 13:32 ` Marek Szyprowski
2020-12-07 15:50 ` Andrzej Pietrasiewicz
2020-12-08 10:05 ` Marek Szyprowski
2020-12-09 6:37 ` Dmitry Torokhov
2020-12-11 7:09 ` [PATCH] Input: cyapa - do not call input_device_enabled from power mode handler Dmitry Torokhov
2020-12-11 8:22 ` Marek Szyprowski
2020-12-11 8:31 ` Dmitry Torokhov
2020-06-08 11:22 ` [PATCH v4 3/7] ACPI: button: Access input device's users under appropriate mutex Andrzej Pietrasiewicz
2020-06-24 15:00 ` Rafael J. Wysocki
2020-06-25 5:23 ` Dmitry Torokhov
2020-06-25 10:55 ` Rafael J. Wysocki
2020-10-05 5:08 ` Dmitry Torokhov
2020-06-08 11:22 ` [PATCH v4 4/7] ACPI: button: Use input_device_enabled() helper Andrzej Pietrasiewicz
2020-06-25 5:24 ` Dmitry Torokhov
2020-10-05 5:06 ` Dmitry Torokhov
2020-06-08 11:22 ` [PATCH v4 5/7] iio: adc: exynos: Use input_device_enabled() Andrzej Pietrasiewicz
2020-06-10 1:28 ` Michał Mirosław
2020-06-10 7:52 ` [FIXED PATCH " Andrzej Pietrasiewicz
2020-06-08 11:22 ` [PATCH v4 6/7] platform/x86: thinkpad_acpi: " Andrzej Pietrasiewicz
2020-06-08 11:22 ` [PATCH v4 7/7] Input: Add "inhibited" property Andrzej Pietrasiewicz
2020-10-05 18:10 ` Dmitry Torokhov
2020-10-06 13:04 ` Andrzej Pietrasiewicz
2020-10-07 1:11 ` Dmitry Torokhov
2020-10-07 1:12 ` Dmitry Torokhov
2020-12-03 6:26 ` Dmitry Torokhov
2020-06-10 9:49 ` [PATCH v4 0/7] Support inhibiting input devices Hans de Goede
2020-06-10 10:38 ` Rafael J. Wysocki
2020-06-10 13:12 ` Andrzej Pietrasiewicz
2020-06-10 13:21 ` Hans de Goede
2020-06-10 13:41 ` Andrzej Pietrasiewicz
2020-06-12 8:30 ` Hans de Goede
2020-06-12 8:47 ` Andrzej Pietrasiewicz
2020-06-16 17:29 ` [PATCH] Input: document inhibiting Andrzej Pietrasiewicz
2020-06-16 17:38 ` Randy Dunlap
2020-06-17 7:44 ` Hans de Goede
2020-06-17 10:18 ` [PATCH v2] " Andrzej Pietrasiewicz
2020-06-17 10:21 ` Hans de Goede
2020-06-17 16:52 ` Randy Dunlap
2020-06-23 13:35 ` Pavel Machek
2020-12-03 6:27 ` Dmitry Torokhov
2020-06-10 14:01 ` [PATCH v4 0/7] Support inhibiting input devices Rafael J. Wysocki
2020-06-10 13:52 ` Hans de Goede
2020-06-10 18:28 ` Dmitry Torokhov
2020-06-12 8:14 ` Hans de Goede
2020-06-12 8:17 ` Hans de Goede
2020-08-03 14:40 ` Andrzej Pietrasiewicz
2020-06-07 20:24 ` [PATCH v3 " Pavel Machek
2020-06-08 5:37 ` Dmitry Torokhov
2020-06-08 9:28 ` Andrzej Pietrasiewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2336e15d-ff4b-bbb6-c701-dbf3aa110fcd@redhat.com \
--to=hdegoede@redhat.com \
--cc=andrzej.p@collabora.com \
--cc=baohua@kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=fery@cypress.com \
--cc=festevam@gmail.com \
--cc=ibm-acpi-devel@lists.sourceforge.net \
--cc=ibm-acpi@hmh.eng.br \
--cc=jeesw@melfas.com \
--cc=jic23@kernel.org \
--cc=jonathanh@nvidia.com \
--cc=kernel@collabora.com \
--cc=kernel@pengutronix.de \
--cc=kgene@kernel.org \
--cc=knaack.h@gmx.de \
--cc=krzk@kernel.org \
--cc=lars@metafoo.de \
--cc=ldewangan@nvidia.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=michael.hennerich@analog.com \
--cc=nick@shmanahar.org \
--cc=patches@opensource.cirrus.com \
--cc=patrikf@chromium.org \
--cc=peter.hutterer@redhat.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
--cc=rjw@rjwysocki.net \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
--cc=slemieux.tyco@gmail.com \
--cc=thierry.reding@gmail.com \
--cc=vz@mleia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).