Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd10c981 authored by Arve Hjønnevåg's avatar Arve Hjønnevåg Committed by Ruchi Kandoi
Browse files

Input: evdev - Add ioctl to block suspend while event queue is not empty. 



Add an ioctl, EVIOCSSUSPENDBLOCK, to enable a wakelock 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.

The current code holds the wakelock for up 5 seconds for every input
device and client. This can prevent suspend if sensor with a high data
rate is active, even when that sensor is not capable of waking the
device once it is suspended.

Change-Id: I624d66ef30a0b3abb543685c343382b8419b42b9
Signed-off-by: default avatarArve Hjønnevåg <arve@android.com>
parent 311d4b02

drivers/input/evdev.c

+55 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/major.h>

#include <linux/device.h>

#include <linux/cdev.h>

#include <linux/wakelock.h>

#include "input-compat.h"



struct evdev {
@@ -46,6 +47,9 @@ struct evdev_client { 
	unsigned int tail;

	unsigned int packet_head; /* [future] position of the first element of next packet */

	spinlock_t buffer_lock; /* protects access to buffer, head and tail */

	struct wake_lock wake_lock;

	bool use_wake_lock;

	char name[28];

	struct fasync_struct *fasync;

	struct evdev *evdev;

	struct list_head node;
@@ -149,10 +153,14 @@ static void __pass_event(struct evdev_client *client, 
		client->buffer[client->tail].value = 0;



		client->packet_head = client->tail;

		if (client->use_wake_lock)

			wake_unlock(&client->wake_lock);

	}



	if (event->type == EV_SYN && event->code == SYN_REPORT) {

		client->packet_head = client->head;

		if (client->use_wake_lock)

			wake_lock(&client->wake_lock);

		kill_fasync(&client->fasync, SIGIO, POLL_IN);

	}

}
@@ -371,10 +379,14 @@ static int evdev_release(struct inode *inode, struct file *file) 


	evdev_detach_client(evdev, client);



	if (client->use_wake_lock)

		wake_lock_destroy(&client->wake_lock);



	if (is_vmalloc_addr(client))

		vfree(client);

	else

		kfree(client);

	kfree(client);



	evdev_close_device(evdev);
@@ -407,6 +419,8 @@ static int evdev_open(struct inode *inode, struct file *file) 


	client->bufsize = bufsize;

	spin_lock_init(&client->buffer_lock);

	snprintf(client->name, sizeof(client->name), "%s-%d",

			dev_name(&evdev->dev), task_tgid_vnr(current));

	client->evdev = evdev;

	evdev_attach_client(evdev, client);
@@ -473,6 +487,9 @@ static int evdev_fetch_next_event(struct evdev_client *client, 
	if (have_event) {

		*event = client->buffer[client->tail++];

		client->tail &= client->bufsize - 1;

		if (client->use_wake_lock &&

		    client->packet_head == client->tail)

			wake_unlock(&client->wake_lock);

	}



	spin_unlock_irq(&client->buffer_lock);
@@ -812,6 +829,35 @@ static int evdev_revoke(struct evdev *evdev, struct evdev_client *client, 
}

*/



static int evdev_enable_suspend_block(struct evdev *evdev,

				      struct evdev_client *client)

{

	if (client->use_wake_lock)

		return 0;



	spin_lock_irq(&client->buffer_lock);

	wake_lock_init(&client->wake_lock, WAKE_LOCK_SUSPEND, client->name);

	client->use_wake_lock = true;

	if (client->packet_head != client->tail)

		wake_lock(&client->wake_lock);

	spin_unlock_irq(&client->buffer_lock);

	return 0;

}



static int evdev_disable_suspend_block(struct evdev *evdev,

				       struct evdev_client *client)

{

	if (!client->use_wake_lock)

		return 0;



	spin_lock_irq(&client->buffer_lock);

	client->use_wake_lock = false;

	wake_lock_destroy(&client->wake_lock);

	spin_unlock_irq(&client->buffer_lock);



	return 0;

}



static long evdev_do_ioctl(struct file *file, unsigned int cmd,

			   void __user *p, int compat_mode)

{
@@ -904,6 +950,15 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, 


	case EVIOCSKEYCODE_V2:

		return evdev_handle_set_keycode_v2(dev, p);



	case EVIOCGSUSPENDBLOCK:

		return put_user(client->use_wake_lock, ip);



	case EVIOCSSUSPENDBLOCK:

		if (p)

			return evdev_enable_suspend_block(evdev, client);

		else

			return evdev_disable_suspend_block(evdev, client);

	}



	size = _IOC_SIZE(cmd);

include/uapi/linux/input.h

+3 −0
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ struct input_keymap_entry { 
/* HACK: disable conflicting EVIOCREVOKE until Android userspace stops using EVIOCSSUSPENDBLOCK */

/*#define EVIOCREVOKE		_IOW('E', 0x91, int)*/			/* Revoke device access */



#define EVIOCGSUSPENDBLOCK	_IOR('E', 0x91, int)			/* get suspend block enable */

#define EVIOCSSUSPENDBLOCK	_IOW('E', 0x91, int)			/* set suspend block enable */



#define EVIOCSCLOCKID		_IOW('E', 0xa0, int)			/* Set clockid to be used for timestamps */



/*