From: "Arve Hjønnevåg" <arve@android.com>
To: linux-pm@lists.linux-foundation.org, linux-kernel@vger.kernel.org
Cc: "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>,
"Henrik Rydberg" <rydberg@euromail.se>,
"Matthew Garrett" <mjg@redhat.com>,
"Jiri Kosina" <jkosina@suse.cz>,
linux-input@vger.kernel.org
Subject: [PATCH 8/9] Input: Block suspend while event queue is not empty.
Date: Thu, 22 Apr 2010 18:08:57 -0700 [thread overview]
Message-ID: <1271984938-13920-9-git-send-email-arve@android.com> (raw)
In-Reply-To: <1271984938-13920-8-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 prev parent reply other threads:[~2010-04-23 1:08 UTC|newest]
Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-23 1:08 [PATCH 0/9] Suspend block api (version 4) Arve Hjønnevåg
2010-04-23 1:08 ` [PATCH 1/9] PM: Add suspend block api Arve Hjønnevåg
2010-04-23 1:08 ` Arve Hjønnevåg
2010-04-23 1:08 ` [PATCH 2/9] PM: suspend_block: Add driver to access suspend blockers from user-space Arve Hjønnevåg
2010-04-23 1:08 ` Arve Hjønnevåg
2010-04-23 1:08 ` [PATCH 3/9] PM: suspend_block: Abort task freezing if a suspend_blocker is active Arve Hjønnevåg
2010-04-23 1:08 ` Arve Hjønnevåg
2010-04-23 1:08 ` [PATCH 4/9] PM: suspend_block: Switch to list of active and inactive suspend blockers Arve Hjønnevåg
2010-04-23 1:08 ` [PATCH 5/9] PM: suspend_block: Add debugfs file Arve Hjønnevåg
2010-04-23 1:08 ` Arve Hjønnevåg
2010-04-23 1:08 ` [PATCH 6/9] PM: suspend_block: Add suspend_blocker stats Arve Hjønnevåg
2010-04-23 1:08 ` Arve Hjønnevåg
2010-04-23 1:08 ` [PATCH 7/9] PM: Add suspend blocking work Arve Hjønnevåg
2010-04-23 1:08 ` Arve Hjønnevåg
2010-04-23 1:08 ` [PATCH 8/9] Input: Block suspend while event queue is not empty Arve Hjønnevåg
2010-04-23 1:08 ` Arve Hjønnevåg [this message]
2010-04-23 1:08 ` [PATCH 9/9] power_supply: Block suspend while power supply change notifications are pending Arve Hjønnevåg
2010-04-23 1:08 ` Arve Hjønnevåg
2010-04-23 20:56 ` [PATCH 8/9] Input: Block suspend while event queue is not empty Randy Dunlap
2010-04-23 20:56 ` Randy Dunlap
2010-04-23 21:08 ` Dmitry Torokhov
2010-04-23 21:08 ` Dmitry Torokhov
2010-04-23 21:08 ` Dmitry Torokhov
2010-04-24 5:02 ` Arve Hjønnevåg
2010-04-24 5:02 ` Arve Hjønnevåg
2010-04-24 5:02 ` Arve Hjønnevåg
2010-04-24 14:36 ` [linux-pm] " Alan Stern
2010-04-24 14:36 ` Alan Stern
2010-04-25 2:30 ` Rafael J. Wysocki
2010-04-25 2:30 ` Rafael J. Wysocki
2010-04-25 15:29 ` Alan Stern
2010-04-25 15:29 ` Alan Stern
2010-04-25 22:41 ` Arve Hjønnevåg
2010-04-25 22:41 ` Arve Hjønnevåg
2010-04-25 22:41 ` Arve Hjønnevåg
2010-04-25 15:29 ` Alan Stern
2010-04-25 2:30 ` Rafael J. Wysocki
2010-04-24 14:36 ` Alan Stern
2010-04-24 4:58 ` Arve Hjønnevåg
2010-04-24 4:58 ` Arve Hjønnevåg
2010-04-24 4:58 ` Arve Hjønnevåg
2010-04-23 8:16 ` [PATCH 7/9] PM: Add suspend blocking work Tejun Heo
2010-04-23 8:16 ` Tejun Heo
2010-04-23 12:20 ` Oleg Nesterov
2010-04-23 12:20 ` Oleg Nesterov
2010-04-23 22:49 ` Arve Hjønnevåg
2010-04-23 22:49 ` Arve Hjønnevåg
2010-04-24 5:21 ` Arve Hjønnevåg
2010-04-24 5:21 ` Arve Hjønnevåg
2010-04-24 6:33 ` Tejun Heo
2010-04-24 6:33 ` Tejun Heo
2010-04-24 7:21 ` Arve Hjønnevåg
2010-04-24 7:21 ` Arve Hjønnevåg
2010-04-24 7:43 ` Tejun Heo
2010-04-24 7:43 ` Tejun Heo
2010-04-26 14:06 ` Oleg Nesterov
2010-04-26 14:06 ` Oleg Nesterov
2010-04-23 20:58 ` [PATCH 5/9] PM: suspend_block: Add debugfs file Randy Dunlap
2010-04-24 3:23 ` Arve Hjønnevåg
2010-04-24 4:24 ` Randy Dunlap
2010-04-24 4:24 ` Randy Dunlap
2010-04-24 4:54 ` Arve Hjønnevåg
2010-04-24 4:54 ` Arve Hjønnevåg
2010-04-24 3:23 ` Arve Hjønnevåg
2010-04-25 18:15 ` Greg KH
2010-04-25 18:15 ` Greg KH
2010-04-25 19:53 ` Randy Dunlap
2010-04-26 0:00 ` tytso
2010-04-26 0:00 ` tytso
2010-04-26 0:23 ` Randy Dunlap
2010-04-26 0:45 ` tytso
2010-04-26 0:45 ` tytso
2010-04-26 0:50 ` Randy Dunlap
2010-04-26 0:50 ` Randy Dunlap
2010-04-26 1:39 ` Alan Stern
2010-04-26 1:39 ` [linux-pm] " Alan Stern
2010-04-26 0:23 ` Randy Dunlap
2010-04-26 6:24 ` Brian Swetland
2010-04-26 13:28 ` Randy Dunlap
2010-04-26 13:28 ` Randy Dunlap
2010-04-26 6:24 ` Brian Swetland
2010-04-25 19:53 ` Randy Dunlap
2010-04-23 20:58 ` Randy Dunlap
2010-04-23 1:08 ` [PATCH 4/9] PM: suspend_block: Switch to list of active and inactive suspend blockers Arve Hjønnevåg
2010-04-23 2:25 ` [PATCH 2/9] PM: suspend_block: Add driver to access suspend blockers from user-space Matt Helsley
2010-04-23 2:25 ` [linux-pm] " Matt Helsley
2010-04-23 3:54 ` Arve Hjønnevåg
2010-04-23 3:54 ` Arve Hjønnevåg
2010-04-23 4:38 ` Greg KH
2010-04-23 4:38 ` [linux-pm] " Greg KH
2010-04-23 8:43 ` Pavel Machek
2010-04-23 16:43 ` Alan Stern
2010-04-23 16:43 ` [linux-pm] " Alan Stern
2010-04-24 3:20 ` Arve Hjønnevåg
2010-04-24 3:20 ` [linux-pm] " Arve Hjønnevåg
2010-04-24 5:55 ` Pavel Machek
2010-04-24 5:55 ` [linux-pm] " Pavel Machek
2010-04-24 14:44 ` Alan Stern
2010-04-25 22:34 ` Arve Hjønnevåg
2010-04-25 22:34 ` [linux-pm] " Arve Hjønnevåg
2010-04-26 19:25 ` Alan Stern
2010-04-27 4:04 ` Arve Hjønnevåg
2010-04-27 18:33 ` Alan Stern
2010-04-27 22:03 ` Rafael J. Wysocki
2010-04-27 22:03 ` [linux-pm] " Rafael J. Wysocki
2010-04-27 23:22 ` Arve Hjønnevåg
2010-04-27 23:22 ` [linux-pm] " Arve Hjønnevåg
2010-04-27 18:33 ` Alan Stern
2010-04-27 4:04 ` Arve Hjønnevåg
2010-04-26 19:25 ` Alan Stern
2010-04-24 14:44 ` Alan Stern
2010-04-24 1:53 ` tytso
2010-04-24 1:53 ` tytso
2010-04-24 5:39 ` Pavel Machek
2010-04-24 5:39 ` Pavel Machek
2010-04-23 8:43 ` Pavel Machek
2010-04-23 16:33 ` [PATCH 1/9] PM: Add suspend block api Alan Stern
2010-04-23 16:33 ` Alan Stern
2010-04-23 16:45 ` Alan Stern
2010-04-23 16:45 ` [linux-pm] " Alan Stern
2010-04-24 2:15 ` Arve Hjønnevåg
2010-04-24 2:30 ` Alan Stern
2010-04-24 2:30 ` Alan Stern
2010-04-24 3:14 ` Arve Hjønnevåg
2010-04-24 3:14 ` Arve Hjønnevåg
2010-04-24 2:15 ` Arve Hjønnevåg
2010-04-23 4:39 ` [PATCH 0/9] Suspend block api (version 4) Greg KH
2010-04-23 4:39 ` [linux-pm] " Greg KH
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=1271984938-13920-9-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=rydberg@euromail.se \
--cc=s.neumann@raumfeld.com \
--cc=tero.saarni@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.