From: "Arve Hjønnevåg" <arve@android.com>
To: linux-pm@lists.linux-foundation.org, linux-kernel@vger.kernel.org
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>,
"Alan Stern" <stern@rowland.harvard.edu>,
"Tejun Heo" <tj@kernel.org>, "Oleg Nesterov" <oleg@redhat.com>,
"Arve Hjønnevåg" <arve@android.com>,
"Dmitry Torokhov" <dmitry.torokhov@gmail.com>,
"Thadeu Lima de Souza Cascardo" <cascardo@holoscopio.com>,
"Márton Németh" <nm127@freemail.hu>,
"Sven Neumann" <s.neumann@raumfeld.com>,
"Tero Saarni" <tero.saarni@gmail.com>,
"Matthew Garrett" <mjg@redhat.com>,
"Jiri Kosina" <jkosina@suse.cz>,
"Henrik Rydberg" <rydberg@euromail.se>,
linux-input@vger.kernel.org
Subject: [PATCH 7/8] Input: Block suspend while event queue is not empty.
Date: Fri, 30 Apr 2010 15:37:00 -0700 [thread overview]
Message-ID: <1272667021-21312-8-git-send-email-arve@android.com> (raw)
In-Reply-To: <1272667021-21312-7-git-send-email-arve@android.com>
Add an ioctl, EVIOCSSUSPENDBLOCK, to enable a suspend_blocker that will block
suspend while the event queue is not empty. This allows userspace code to
process input events while the device appears to be asleep.
Signed-off-by: Arve Hjønnevåg <arve@android.com>
---
drivers/input/evdev.c | 22 ++++++++++++++++++++++
include/linux/input.h | 3 +++
2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 2ee6c7a..66e0d16 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -20,6 +20,7 @@
#include <linux/input.h>
#include <linux/major.h>
#include <linux/device.h>
+#include <linux/suspend_blocker.h>
#include "input-compat.h"
struct evdev {
@@ -43,6 +44,8 @@ struct evdev_client {
struct fasync_struct *fasync;
struct evdev *evdev;
struct list_head node;
+ struct suspend_blocker suspend_blocker;
+ bool use_suspend_blocker;
};
static struct evdev *evdev_table[EVDEV_MINORS];
@@ -55,6 +58,8 @@ static void evdev_pass_event(struct evdev_client *client,
* Interrupts are disabled, just acquire the lock
*/
spin_lock(&client->buffer_lock);
+ if (client->use_suspend_blocker)
+ suspend_block(&client->suspend_blocker);
client->buffer[client->head++] = *event;
client->head &= EVDEV_BUFFER_SIZE - 1;
spin_unlock(&client->buffer_lock);
@@ -234,6 +239,8 @@ static int evdev_release(struct inode *inode, struct file *file)
mutex_unlock(&evdev->mutex);
evdev_detach_client(evdev, client);
+ if (client->use_suspend_blocker)
+ suspend_blocker_destroy(&client->suspend_blocker);
kfree(client);
evdev_close_device(evdev);
@@ -335,6 +342,8 @@ static int evdev_fetch_next_event(struct evdev_client *client,
if (have_event) {
*event = client->buffer[client->tail++];
client->tail &= EVDEV_BUFFER_SIZE - 1;
+ if (client->use_suspend_blocker && client->head == client->tail)
+ suspend_unblock(&client->suspend_blocker);
}
spin_unlock_irq(&client->buffer_lock);
@@ -585,6 +594,19 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd,
else
return evdev_ungrab(evdev, client);
+ case EVIOCGSUSPENDBLOCK:
+ return put_user(client->use_suspend_blocker, ip);
+
+ case EVIOCSSUSPENDBLOCK:
+ spin_lock_irq(&client->buffer_lock);
+ if (!client->use_suspend_blocker && p)
+ suspend_blocker_init(&client->suspend_blocker, "evdev");
+ else if (client->use_suspend_blocker && !p)
+ suspend_blocker_destroy(&client->suspend_blocker);
+ client->use_suspend_blocker = !!p;
+ spin_unlock_irq(&client->buffer_lock);
+ return 0;
+
default:
if (_IOC_TYPE(cmd) != 'E')
diff --git a/include/linux/input.h b/include/linux/input.h
index 7ed2251..b2d93b4 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -82,6 +82,9 @@ struct input_absinfo {
#define EVIOCGRAB _IOW('E', 0x90, int) /* Grab/Release device */
+#define EVIOCGSUSPENDBLOCK _IOR('E', 0x91, int) /* get suspend block enable */
+#define EVIOCSSUSPENDBLOCK _IOW('E', 0x91, int) /* set suspend block enable */
+
/*
* Event types
*/
--
1.6.5.1
next parent reply other threads:[~2010-04-30 22:37 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1272667021-21312-1-git-send-email-arve@android.com>
[not found] ` <1272667021-21312-2-git-send-email-arve@android.com>
[not found] ` <1272667021-21312-3-git-send-email-arve@android.com>
[not found] ` <1272667021-21312-4-git-send-email-arve@android.com>
[not found] ` <1272667021-21312-5-git-send-email-arve@android.com>
[not found] ` <1272667021-21312-6-git-send-email-arve@android.com>
[not found] ` <1272667021-21312-7-git-send-email-arve@android.com>
2010-04-30 22:37 ` Arve Hjønnevåg [this message]
[not found] ` <87wrvl5479.fsf@deeprootsystems.com>
[not found] ` <20100503180741.GB2098@rakim.wolfsonmicro.main>
[not found] ` <201005032318.35383.rjw@sisk.pl>
[not found] ` <87sk68r1zh.fsf@deeprootsystems.com>
[not found] ` <s2qd6200be21005031709r28420f0ezf3cf286517ee9114@mail.gmail.com>
2010-05-14 20:27 ` [PATCH 0/8] Suspend block api (version 6) Paul Walmsley
2010-05-14 22:18 ` Arve Hjønnevåg
2010-05-15 2:25 ` Alan Stern
2010-05-15 4:02 ` Arve Hjønnevåg
2010-05-15 21:25 ` Alan Stern
2010-05-17 4:54 ` Arve Hjønnevåg
2010-05-18 2:26 ` Paul Walmsley
2010-05-18 3:21 ` Arve Hjønnevåg
2010-05-18 7:03 ` Henrik Rydberg
2010-05-18 19:39 ` Rafael J. Wysocki
2010-05-25 9:41 ` Paul Walmsley
2010-05-25 23:08 ` Arve Hjønnevåg
2010-05-26 7:23 ` Linus WALLEIJ
2010-05-26 16:01 ` Alan Stern
2010-05-27 7:46 ` Linus WALLEIJ
2010-05-27 8:04 ` Florian Mickler
2010-05-27 8:40 ` Arve Hjønnevåg
2010-05-27 15:33 ` Alan Stern
2010-05-28 11:54 ` Linus WALLEIJ
2010-05-20 23:37 ` David Brownell
2010-05-25 16:51 ` Dmitry Torokhov
2010-05-25 18:25 ` Alan Stern
2010-05-25 18:33 ` Dmitry Torokhov
2010-05-25 22:05 ` Arve Hjønnevåg
2010-05-25 22:28 ` Dmitry Torokhov
[not found] <1274482015-30899-1-git-send-email-arve@android.com>
[not found] ` <1274482015-30899-2-git-send-email-arve@android.com>
[not found] ` <1274482015-30899-3-git-send-email-arve@android.com>
[not found] ` <1274482015-30899-4-git-send-email-arve@android.com>
[not found] ` <1274482015-30899-5-git-send-email-arve@android.com>
[not found] ` <1274482015-30899-6-git-send-email-arve@android.com>
[not found] ` <1274482015-30899-7-git-send-email-arve@android.com>
2010-05-21 22:46 ` [PATCH 7/8] Input: Block suspend while event queue is not empty Arve Hjønnevåg
[not found] <1273810273-3039-1-git-send-email-arve@android.com>
[not found] ` <1273810273-3039-2-git-send-email-arve@android.com>
[not found] ` <1273810273-3039-3-git-send-email-arve@android.com>
[not found] ` <1273810273-3039-4-git-send-email-arve@android.com>
[not found] ` <1273810273-3039-5-git-send-email-arve@android.com>
[not found] ` <1273810273-3039-6-git-send-email-arve@android.com>
[not found] ` <1273810273-3039-7-git-send-email-arve@android.com>
2010-05-14 4:11 ` Arve Hjønnevåg
[not found] <1272429119-12103-1-git-send-email-arve@android.com>
[not found] ` <1272429119-12103-2-git-send-email-arve@android.com>
[not found] ` <1272429119-12103-3-git-send-email-arve@android.com>
[not found] ` <1272429119-12103-4-git-send-email-arve@android.com>
[not found] ` <1272429119-12103-5-git-send-email-arve@android.com>
[not found] ` <1272429119-12103-6-git-send-email-arve@android.com>
[not found] ` <1272429119-12103-7-git-send-email-arve@android.com>
2010-04-28 4:31 ` Arve Hjønnevåg
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=1272667021-21312-8-git-send-email-arve@android.com \
--to=arve@android.com \
--cc=cascardo@holoscopio.com \
--cc=dmitry.torokhov@gmail.com \
--cc=jkosina@suse.cz \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=mjg@redhat.com \
--cc=nm127@freemail.hu \
--cc=oleg@redhat.com \
--cc=rjw@sisk.pl \
--cc=rydberg@euromail.se \
--cc=s.neumann@raumfeld.com \
--cc=stern@rowland.harvard.edu \
--cc=tero.saarni@gmail.com \
--cc=tj@kernel.org \
/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).