From patchwork Tue Dec 16 08:23:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aniroop@vger.kernel.org, Mathur@vger.kernel.org X-Patchwork-Id: 5499651 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BE1E39F1CD for ; Tue, 16 Dec 2014 08:24:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E397620A1E for ; Tue, 16 Dec 2014 08:24:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DE27D209D5 for ; Tue, 16 Dec 2014 08:24:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751084AbaLPIY3 (ORCPT ); Tue, 16 Dec 2014 03:24:29 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:46213 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750914AbaLPIY2 (ORCPT ); Tue, 16 Dec 2014 03:24:28 -0500 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NGO00IG620LVC50@mailout4.samsung.com> for linux-input@vger.kernel.org; Tue, 16 Dec 2014 17:24:21 +0900 (KST) X-AuditID: cbfee61b-f79d76d0000024d6-b7-548fec35cb74 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id E7.13.09430.53CEF845; Tue, 16 Dec 2014 17:24:21 +0900 (KST) Received: from srin.p4 ([107.108.168.37]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NGO0021D1ZYV220@mmp1.samsung.com>; Tue, 16 Dec 2014 17:24:21 +0900 (KST) From: Aniroop@vger.kernel.org, Mathur@vger.kernel.org To: dmitry.torokhov@gmail.com, dtor@mail.ru, linux-input@vger.kernel.org Cc: aniroop.mathur@gmail.com, a.mathur@samsung.com Subject: [PATCH] Input: Add support for CLOCK_BOOTTIME Date: Tue, 16 Dec 2014 13:53:55 +0530 Message-id: <1418718235-2277-1-git-send-email-a.mathur@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBJMWRmVeSWpSXmKPExsVy+t9jAV3TN/0hBrfWclpc/HGOxeLn7hks FocXvWC0eLj9BavFzU/fWB1YPXbOusvuMWXuEVaPvi2rGD0+b5ILYInisklJzcksSy3St0vg yji5yLTgnGTF2T/LGBsYP4p0MXJwSAiYSKy+4tjFyAlkiklcuLeeDcQWEljEKLG6WbqLkQvI /skosffYaXaQBJuAiMSMmR3MILaIgIfE7Nm7wGxmASOJ+bfPgtnCAmYS777PZweZzyKgKrHz iz5ImFfAWWJJ9wcWiLUKEnMm2Uxg5F7AyLCKUTS1ILmgOCk910ivODG3uDQvXS85P3cTI9j/ z6R3MK5qsDjEKMDBqMTDG1jYHyLEmlhWXJl7iFGCg1lJhHfLfaAQb0piZVVqUX58UWlOavEh RmkOFiVxXiX7thAhgfTEktTs1NSC1CKYLBMHp1QD49S+OYbiXp4/foT+Xh+RtnbjCcMzNcKT axday9zvULELWs/FXxE633Y5X5DnA69dGe/MfvEteP9YPnWJ7D/ZfM4/CxduvfDWazrbp5iY L0eTlsSlXt78esWlshvJsl/Kl0+TWX9CKCs7tuGDy6y2tneVN6ybz85trNgQVvbF/a9JKM+E Ipe7q5RYijMSDbWYi4oTAfsi9ZL7AQAA Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Aniroop Mathur This patch adds support for CLOCK_BOOTTIME for input event timestamp. CLOCK_BOOTTIME includes suspend time, so it would allow applications to get correct time difference between two events even when system resumes from suspend state. Signed-off-by: Aniroop Mathur --- drivers/input/evdev.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index de05545..7825794 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -28,6 +28,13 @@ #include #include "input-compat.h" +enum clock_type { + REAL = 0, + MONO, + BOOT, + CLK_MAX +}; + struct evdev { int open; struct input_handle handle; @@ -108,8 +115,9 @@ static void evdev_queue_syn_dropped(struct evdev_client *client) struct input_event ev; ktime_t time; - time = (client->clkid == CLOCK_MONOTONIC) ? - ktime_get() : ktime_get_real(); + time = (client->clkid == CLOCK_REALTIME) ? + ktime_get_real() : (client->clkid == CLOCK_MONOTONIC) ? + ktime_get() : ktime_get_boottime(); ev.time = ktime_to_timeval(time); ev.type = EV_SYN; @@ -159,7 +167,7 @@ static void __pass_event(struct evdev_client *client, static void evdev_pass_values(struct evdev_client *client, const struct input_value *vals, unsigned int count, - ktime_t mono, ktime_t real) + ktime_t *ev_time) { struct evdev *evdev = client->evdev; const struct input_value *v; @@ -169,8 +177,9 @@ static void evdev_pass_values(struct evdev_client *client, if (client->revoked) return; - event.time = ktime_to_timeval(client->clkid == CLOCK_MONOTONIC ? - mono : real); + event.time = ktime_to_timeval(client->clkid == CLOCK_REALTIME ? + ev_time[REAL] : client->clkid == CLOCK_MONOTONIC ? + ev_time[MONO] : ev_time[BOOT]); /* Interrupts are disabled, just acquire the lock. */ spin_lock(&client->buffer_lock); @@ -198,21 +207,21 @@ static void evdev_events(struct input_handle *handle, { struct evdev *evdev = handle->private; struct evdev_client *client; - ktime_t time_mono, time_real; + ktime_t ev_time[CLK_MAX]; - time_mono = ktime_get(); - time_real = ktime_mono_to_real(time_mono); + ev_time[MONO] = ktime_get(); + ev_time[REAL] = ktime_mono_to_real(ev_time[MONO]); + ev_time[BOOT] = ktime_get_boottime(); rcu_read_lock(); client = rcu_dereference(evdev->grab); if (client) - evdev_pass_values(client, vals, count, time_mono, time_real); + evdev_pass_values(client, vals, count, ev_time); else list_for_each_entry_rcu(client, &evdev->client_list, node) - evdev_pass_values(client, vals, count, - time_mono, time_real); + evdev_pass_values(client, vals, count, ev_time); rcu_read_unlock(); } @@ -874,7 +883,7 @@ static long evdev_do_ioctl(struct file *file, unsigned int cmd, case EVIOCSCLOCKID: if (copy_from_user(&i, p, sizeof(unsigned int))) return -EFAULT; - if (i != CLOCK_MONOTONIC && i != CLOCK_REALTIME) + if (i != CLOCK_MONOTONIC && i != CLOCK_REALTIME && i != CLOCK_BOOTTIME) return -EINVAL; client->clkid = i; return 0;