From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Subject: [PATCH 7/8] Input: Block suspend while event queue is not empty. Date: Thu, 13 May 2010 21:11:12 -0700 Message-ID: <1273810273-3039-8-git-send-email-arve@android.com> References: <1273810273-3039-1-git-send-email-arve@android.com> <1273810273-3039-2-git-send-email-arve@android.com> <1273810273-3039-3-git-send-email-arve@android.com> <1273810273-3039-4-git-send-email-arve@android.com> <1273810273-3039-5-git-send-email-arve@android.com> <1273810273-3039-6-git-send-email-arve@android.com> <1273810273-3039-7-git-send-email-arve@android.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1273810273-3039-7-git-send-email-arve@android.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org To: linux-pm@lists.linux-foundation.org, linux-kernel@vger.kernel.org Cc: =?UTF-8?q?M=C3=A1rton=20N=C3=A9meth?= , Jiri Kosina , Dmitry Torokhov , Sven Neumann , Henrik Rydberg , linux-input@vger.kernel.org, Alexey Dobriyan , Tero Saarni , Matthew Garrett List-Id: linux-input@vger.kernel.org QWRkIGFuIGlvY3RsLCBFVklPQ1NTVVNQRU5EQkxPQ0ssIHRvIGVuYWJsZSBhIHN1c3BlbmRfYmxv Y2tlciB0aGF0IHdpbGwgYmxvY2sKc3VzcGVuZCB3aGlsZSB0aGUgZXZlbnQgcXVldWUgaXMgbm90 IGVtcHR5LiBUaGlzIGFsbG93cyB1c2Vyc3BhY2UgY29kZSB0bwpwcm9jZXNzIGlucHV0IGV2ZW50 cyB3aGlsZSB0aGUgZGV2aWNlIGFwcGVhcnMgdG8gYmUgYXNsZWVwLgoKU2lnbmVkLW9mZi1ieTog QXJ2ZSBIasO4bm5ldsOlZyA8YXJ2ZUBhbmRyb2lkLmNvbT4KLS0tCiBkcml2ZXJzL2lucHV0L2V2 ZGV2LmMgfCAgIDIyICsrKysrKysrKysrKysrKysrKysrKysKIGluY2x1ZGUvbGludXgvaW5wdXQu aCB8ICAgIDMgKysrCiAyIGZpbGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDAgZGVsZXRp b25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9pbnB1dC9ldmRldi5jIGIvZHJpdmVycy9pbnB1 dC9ldmRldi5jCmluZGV4IDJlZTZjN2EuLmJmZjIyNDcgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvaW5w dXQvZXZkZXYuYworKysgYi9kcml2ZXJzL2lucHV0L2V2ZGV2LmMKQEAgLTIwLDYgKzIwLDcgQEAK ICNpbmNsdWRlIDxsaW51eC9pbnB1dC5oPgogI2luY2x1ZGUgPGxpbnV4L21ham9yLmg+CiAjaW5j bHVkZSA8bGludXgvZGV2aWNlLmg+CisjaW5jbHVkZSA8bGludXgvc3VzcGVuZC5oPgogI2luY2x1 ZGUgImlucHV0LWNvbXBhdC5oIgogCiBzdHJ1Y3QgZXZkZXYgewpAQCAtNDMsNiArNDQsOCBAQCBz dHJ1Y3QgZXZkZXZfY2xpZW50IHsKIAlzdHJ1Y3QgZmFzeW5jX3N0cnVjdCAqZmFzeW5jOwogCXN0 cnVjdCBldmRldiAqZXZkZXY7CiAJc3RydWN0IGxpc3RfaGVhZCBub2RlOworCXN0cnVjdCBzdXNw ZW5kX2Jsb2NrZXIgc3VzcGVuZF9ibG9ja2VyOworCWJvb2wgdXNlX3N1c3BlbmRfYmxvY2tlcjsK IH07CiAKIHN0YXRpYyBzdHJ1Y3QgZXZkZXYgKmV2ZGV2X3RhYmxlW0VWREVWX01JTk9SU107CkBA IC01NSw2ICs1OCw4IEBAIHN0YXRpYyB2b2lkIGV2ZGV2X3Bhc3NfZXZlbnQoc3RydWN0IGV2ZGV2 X2NsaWVudCAqY2xpZW50LAogCSAqIEludGVycnVwdHMgYXJlIGRpc2FibGVkLCBqdXN0IGFjcXVp cmUgdGhlIGxvY2sKIAkgKi8KIAlzcGluX2xvY2soJmNsaWVudC0+YnVmZmVyX2xvY2spOworCWlm IChjbGllbnQtPnVzZV9zdXNwZW5kX2Jsb2NrZXIpCisJCXN1c3BlbmRfYmxvY2soJmNsaWVudC0+ c3VzcGVuZF9ibG9ja2VyKTsKIAljbGllbnQtPmJ1ZmZlcltjbGllbnQtPmhlYWQrK10gPSAqZXZl bnQ7CiAJY2xpZW50LT5oZWFkICY9IEVWREVWX0JVRkZFUl9TSVpFIC0gMTsKIAlzcGluX3VubG9j aygmY2xpZW50LT5idWZmZXJfbG9jayk7CkBAIC0yMzQsNiArMjM5LDggQEAgc3RhdGljIGludCBl dmRldl9yZWxlYXNlKHN0cnVjdCBpbm9kZSAqaW5vZGUsIHN0cnVjdCBmaWxlICpmaWxlKQogCW11 dGV4X3VubG9jaygmZXZkZXYtPm11dGV4KTsKIAogCWV2ZGV2X2RldGFjaF9jbGllbnQoZXZkZXYs IGNsaWVudCk7CisJaWYgKGNsaWVudC0+dXNlX3N1c3BlbmRfYmxvY2tlcikKKwkJc3VzcGVuZF9i bG9ja2VyX3VucmVnaXN0ZXIoJmNsaWVudC0+c3VzcGVuZF9ibG9ja2VyKTsKIAlrZnJlZShjbGll bnQpOwogCiAJZXZkZXZfY2xvc2VfZGV2aWNlKGV2ZGV2KTsKQEAgLTMzNSw2ICszNDIsOCBAQCBz dGF0aWMgaW50IGV2ZGV2X2ZldGNoX25leHRfZXZlbnQoc3RydWN0IGV2ZGV2X2NsaWVudCAqY2xp ZW50LAogCWlmIChoYXZlX2V2ZW50KSB7CiAJCSpldmVudCA9IGNsaWVudC0+YnVmZmVyW2NsaWVu dC0+dGFpbCsrXTsKIAkJY2xpZW50LT50YWlsICY9IEVWREVWX0JVRkZFUl9TSVpFIC0gMTsKKwkJ aWYgKGNsaWVudC0+dXNlX3N1c3BlbmRfYmxvY2tlciAmJiBjbGllbnQtPmhlYWQgPT0gY2xpZW50 LT50YWlsKQorCQkJc3VzcGVuZF91bmJsb2NrKCZjbGllbnQtPnN1c3BlbmRfYmxvY2tlcik7CiAJ fQogCiAJc3Bpbl91bmxvY2tfaXJxKCZjbGllbnQtPmJ1ZmZlcl9sb2NrKTsKQEAgLTU4NSw2ICs1 OTQsMTkgQEAgc3RhdGljIGxvbmcgZXZkZXZfZG9faW9jdGwoc3RydWN0IGZpbGUgKmZpbGUsIHVu c2lnbmVkIGludCBjbWQsCiAJCWVsc2UKIAkJCXJldHVybiBldmRldl91bmdyYWIoZXZkZXYsIGNs aWVudCk7CiAKKwljYXNlIEVWSU9DR1NVU1BFTkRCTE9DSzoKKwkJcmV0dXJuIHB1dF91c2VyKGNs aWVudC0+dXNlX3N1c3BlbmRfYmxvY2tlciwgaXApOworCisJY2FzZSBFVklPQ1NTVVNQRU5EQkxP Q0s6CisJCXNwaW5fbG9ja19pcnEoJmNsaWVudC0+YnVmZmVyX2xvY2spOworCQlpZiAoIWNsaWVu dC0+dXNlX3N1c3BlbmRfYmxvY2tlciAmJiBwKQorCQkJc3VzcGVuZF9ibG9ja2VyX2luaXQoJmNs aWVudC0+c3VzcGVuZF9ibG9ja2VyLCAiZXZkZXYiKTsKKwkJZWxzZSBpZiAoY2xpZW50LT51c2Vf c3VzcGVuZF9ibG9ja2VyICYmICFwKQorCQkJc3VzcGVuZF9ibG9ja2VyX3VucmVnaXN0ZXIoJmNs aWVudC0+c3VzcGVuZF9ibG9ja2VyKTsKKwkJY2xpZW50LT51c2Vfc3VzcGVuZF9ibG9ja2VyID0g ISFwOworCQlzcGluX3VubG9ja19pcnEoJmNsaWVudC0+YnVmZmVyX2xvY2spOworCQlyZXR1cm4g MDsKKwogCWRlZmF1bHQ6CiAKIAkJaWYgKF9JT0NfVFlQRShjbWQpICE9ICdFJykKZGlmZiAtLWdp dCBhL2luY2x1ZGUvbGludXgvaW5wdXQuaCBiL2luY2x1ZGUvbGludXgvaW5wdXQuaAppbmRleCA3 ZWQyMjUxLi5iMmQ5M2I0IDEwMDY0NAotLS0gYS9pbmNsdWRlL2xpbnV4L2lucHV0LmgKKysrIGIv aW5jbHVkZS9saW51eC9pbnB1dC5oCkBAIC04Miw2ICs4Miw5IEBAIHN0cnVjdCBpbnB1dF9hYnNp bmZvIHsKIAogI2RlZmluZSBFVklPQ0dSQUIJCV9JT1coJ0UnLCAweDkwLCBpbnQpCQkJLyogR3Jh Yi9SZWxlYXNlIGRldmljZSAqLwogCisjZGVmaW5lIEVWSU9DR1NVU1BFTkRCTE9DSwlfSU9SKCdF JywgMHg5MSwgaW50KQkJCS8qIGdldCBzdXNwZW5kIGJsb2NrIGVuYWJsZSAqLworI2RlZmluZSBF VklPQ1NTVVNQRU5EQkxPQ0sJX0lPVygnRScsIDB4OTEsIGludCkJCQkvKiBzZXQgc3VzcGVuZCBi bG9jayBlbmFibGUgKi8KKwogLyoKICAqIEV2ZW50IHR5cGVzCiAgKi8KLS0gCjEuNi41LjEKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LXBtIG1h aWxpbmcgbGlzdApsaW51eC1wbUBsaXN0cy5saW51eC1mb3VuZGF0aW9uLm9yZwpodHRwczovL2xp c3RzLmxpbnV4LWZvdW5kYXRpb24ub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgtcG0= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752275Ab0ENELs (ORCPT ); Fri, 14 May 2010 00:11:48 -0400 Received: from mail-px0-f174.google.com ([209.85.212.174]:52482 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751947Ab0ENELm (ORCPT ); Fri, 14 May 2010 00:11:42 -0400 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= To: linux-pm@lists.linux-foundation.org, linux-kernel@vger.kernel.org Cc: "Rafael J. Wysocki" , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Dmitry Torokhov , =?UTF-8?q?M=C3=A1rton=20N=C3=A9meth?= , Sven Neumann , Tero Saarni , Alexey Dobriyan , Matthew Garrett , Jiri Kosina , Henrik Rydberg , linux-input@vger.kernel.org Subject: [PATCH 7/8] Input: Block suspend while event queue is not empty. Date: Thu, 13 May 2010 21:11:12 -0700 Message-Id: <1273810273-3039-8-git-send-email-arve@android.com> X-Mailer: git-send-email 1.6.5.1 In-Reply-To: <1273810273-3039-7-git-send-email-arve@android.com> References: <1273810273-3039-1-git-send-email-arve@android.com> <1273810273-3039-2-git-send-email-arve@android.com> <1273810273-3039-3-git-send-email-arve@android.com> <1273810273-3039-4-git-send-email-arve@android.com> <1273810273-3039-5-git-send-email-arve@android.com> <1273810273-3039-6-git-send-email-arve@android.com> <1273810273-3039-7-git-send-email-arve@android.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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..bff2247 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -20,6 +20,7 @@ #include #include #include +#include #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_unregister(&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_unregister(&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