From: "Arve Hjønnevåg" <arve@android.com>
To: linux-pm@lists.linux-foundation.org
Cc: ncunningham@crca.org.au, u.luckas@road.de, swetland@google.com
Subject: [PATCH 4/9] Input: Block suspend while event queue is not empty.
Date: Tue, 5 May 2009 21:18:44 -0700 [thread overview]
Message-ID: <1241583529-5092-5-git-send-email-arve@android.com> (raw)
In-Reply-To: <1241583529-5092-4-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 7a7a026..0bb670f 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -19,6 +19,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);
@@ -233,6 +238,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);
@@ -332,6 +339,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);
@@ -582,6 +591,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 6b28048..e091ea8 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -81,6 +81,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.1
_______________________________________________
linux-pm mailing list
linux-pm@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/linux-pm
next prev parent reply other threads:[~2009-05-06 4:18 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-06 4:18 [RFC][PATCH 0/9] Suspend block api (version 3) Arve Hjønnevåg
2009-05-06 4:18 ` [PATCH 1/9] PM: Add suspend block api Arve Hjønnevåg
2009-05-06 4:18 ` [PATCH 2/9] PM: suspend_block: Add driver to access suspend blockers from user-space Arve Hjønnevåg
2009-05-05 20:12 ` Pavel Machek
2009-05-07 1:42 ` Arve Hjønnevåg
2009-05-07 10:32 ` Pavel Machek
2009-05-08 0:43 ` Arve Hjønnevåg
2009-05-08 14:22 ` Rafael J. Wysocki
2009-05-09 0:38 ` Arve Hjønnevåg
2009-05-05 20:16 ` Pavel Machek
2009-05-07 1:31 ` Arve Hjønnevåg
2009-05-07 10:43 ` Pavel Machek
2009-05-06 4:18 ` [PATCH 3/9] PM: suspend_block: Abort task freezing if a suspend_blocker is active Arve Hjønnevåg
2009-05-05 19:57 ` Pavel Machek
2009-05-07 1:51 ` Arve Hjønnevåg
2009-05-07 10:41 ` Pavel Machek
2009-05-07 23:49 ` Arve Hjønnevåg
2009-05-08 1:06 ` Nigel Cunningham
2009-05-08 1:22 ` Arve Hjønnevåg
2009-05-08 1:35 ` Nigel Cunningham
2009-05-08 14:40 ` Rafael J. Wysocki
2009-05-08 22:27 ` Nigel Cunningham
2009-05-08 23:01 ` Rafael J. Wysocki
2009-05-09 0:12 ` Nigel Cunningham
2009-05-12 10:05 ` Pavel Machek
2009-05-12 16:55 ` Rafael J. Wysocki
2009-05-12 19:33 ` Pavel Machek
2009-05-12 10:04 ` Pavel Machek
2009-05-08 0:22 ` Rafael J. Wysocki
2009-05-06 4:18 ` Arve Hjønnevåg [this message]
2009-05-05 20:02 ` [PATCH 4/9] Input: Block suspend while event queue is not empty Pavel Machek
2009-05-07 1:57 ` Arve Hjønnevåg
2009-05-06 4:18 ` [PATCH 5/9] PM: suspend_block: Switch to list of active and inactive suspend blockers Arve Hjønnevåg
2009-05-06 4:18 ` [PATCH 6/9] PM: suspend_block: Add debugfs file Arve Hjønnevåg
2009-05-06 4:18 ` [PATCH 7/9] PM: suspend_block: Add suspend_blocker stats Arve Hjønnevåg
2009-05-06 4:18 ` [PATCH 8/9] PM: suspend_block: Add timeout support Arve Hjønnevåg
2009-05-06 4:18 ` [PATCH 9/9] PM: suspend_block: Add timeout support to user-space suspend_blockers Arve Hjønnevåg
2009-05-06 17:17 ` [RFC][PATCH 0/9] Suspend block api (version 3) Kevin Hilman
2009-05-07 22:42 ` Arve Hjønnevåg
2009-05-08 16:01 ` mark gross
2009-05-08 23:36 ` Kevin Hilman
2009-05-15 19:58 ` Pavel Machek
-- strict thread matches above, loose matches on Subject: below --
2009-04-30 3:09 [RFC][PATCH 0/9] Suspend block api (version 2) Arve Hjønnevåg
2009-04-30 3:10 ` [PATCH 1/9] PM: Add suspend block api Arve Hjønnevåg
2009-04-30 3:10 ` [PATCH 2/9] PM: suspend_block: Add driver to access suspend blockers from user-space Arve Hjønnevåg
2009-04-30 3:10 ` [PATCH 3/9] PM: suspend_block: Abort task freezing if a suspend_blocker is active Arve Hjønnevåg
2009-04-30 3:10 ` [PATCH 4/9] Input: Block suspend while event queue is not empty 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=1241583529-5092-5-git-send-email-arve@android.com \
--to=arve@android.com \
--cc=linux-pm@lists.linux-foundation.org \
--cc=ncunningham@crca.org.au \
--cc=swetland@google.com \
--cc=u.luckas@road.de \
/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