From patchwork Thu Dec 7 18:13:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 10100763 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E15A5602BF for ; Thu, 7 Dec 2017 18:14:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D95DB285A7 for ; Thu, 7 Dec 2017 18:14:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CDF24285B9; Thu, 7 Dec 2017 18:14:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75C52285A7 for ; Thu, 7 Dec 2017 18:14:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754555AbdLGSOH (ORCPT ); Thu, 7 Dec 2017 13:14:07 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:43405 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754077AbdLGSNU (ORCPT ); Thu, 7 Dec 2017 13:13:20 -0500 Received: by mail-pf0-f193.google.com with SMTP id e3so5252315pfi.10; Thu, 07 Dec 2017 10:13:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=O17v3ZPKA+QxfoyJbxKKfHoY9u4QukZ5yTvm/ZjQxGQ=; b=fDMSus2eWHoCkOeGOxhQIKG70ohzQ/va5RRhENO6l2kut9te+WouEQhrSufZNHTybG QmNWLTUCQYkrajAHIpR2C8+ynQTTx882JC/gz8mDJMe9V45O1l9y1MPLRt3GaWt6T+Ug 0xvygJFpwzRRTc5+YGv2K38nFmr7LOaCMdyyqzAEAVAX4zrGwhqFoDrQwMpJW2M6c2FY WRFWQyGVHfnJYNzG7zcs2d2zyvdB455DQ2UUqMdMoHEbaz/IaFKnK2j5iH34XdxbAkdW 2wqs574FDoDoKT3UXt/P21FBmo1StVxciHqZ0kHkTAZm13l7PaGJCZsFn7pv7NoKHHFW Z5lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=O17v3ZPKA+QxfoyJbxKKfHoY9u4QukZ5yTvm/ZjQxGQ=; b=E+SLBE2ZYcvOtGzyz3vYR7aUQoKzyjiISFYlP+FI3znjzKYxwXjuqC9vm52LwK1q1E YG9RHyNeW2xoNUAyT71ERo9zmKUW/9CpmMWv3rahGOYgfVcLxgra7VpDX5EQrcKgt5iA RWPLPxVJ+x25WJDn5tUcBmbpNVizwhzqPSnYsWbclCDmFceKj/B3NmoF8+l6/5tlHSEk T9GmBsw3L0OxheFfAwkqH7/4czuYlJ9IiATzE/jEpla4FCHOUfCQaLeoXLiKNDa49txS w+DQ+nsaXtA6sKfXMiCC1+D8KqWrnFaMFlqEKKQCy/bQXMdpcJF3L4sE3jaXVrihkjVv YyrA== X-Gm-Message-State: AJaThX5hWtIe+aEjvpdEbBl5+143+ZCVPpxH9dEHwLhnCF4TdM3SkgEl m6UjNm2SEZIX6XruwWlJH6qy/g== X-Google-Smtp-Source: AGs4zMaxBKPrPIZtjvBvufPEGF6s52yWh91mJILhJfnBeWlw7Bh6h6WGB7Mr9tLz1OzlPeeL8tz8Lg== X-Received: by 10.101.88.201 with SMTP id e9mr26376896pgu.216.1512670399930; Thu, 07 Dec 2017 10:13:19 -0800 (PST) Received: from deepa-ubuntu.hsd1.ca.comcast.net ([2601:647:5000:6620:8c9c:e0f7:c7ba:c1de]) by smtp.gmail.com with ESMTPSA id t202sm8634299pgb.75.2017.12.07.10.13.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Dec 2017 10:13:19 -0800 (PST) From: Deepa Dinamani To: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Cc: peter.hutterer@who-t.net, arnd@arndb.de, y2038@lists.linaro.org Subject: [PATCH v4 2/4] input: evdev: Replace timeval with timespec64 Date: Thu, 7 Dec 2017 10:13:04 -0800 Message-Id: <20171207181306.5623-3-deepa.kernel@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171207181306.5623-1-deepa.kernel@gmail.com> References: <20171207181306.5623-1-deepa.kernel@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP struct timeval is not y2038 safe. All references to timeval in the kernel will be replaced by y2038 safe structures. Replace all references to timeval with y2038 safe struct timespec64 here. struct input_event will be changed in a different patch. Signed-off-by: Deepa Dinamani Reviewed-by: Arnd Bergmann --- drivers/input/evdev.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c index 925571475005..e5dbfc5ff1b0 100644 --- a/drivers/input/evdev.c +++ b/drivers/input/evdev.c @@ -156,15 +156,22 @@ static void __evdev_flush_queue(struct evdev_client *client, unsigned int type) static void __evdev_queue_syn_dropped(struct evdev_client *client) { struct input_event ev; - ktime_t time; + struct timespec64 ts; - time = client->clk_type == EV_CLK_REAL ? - ktime_get_real() : - client->clk_type == EV_CLK_MONO ? - ktime_get() : - ktime_get_boottime(); + switch (client->clk_type) { + case EV_CLK_REAL: + ktime_get_real_ts64(&ts); + break; + case EV_CLK_MONO: + ktime_get_ts64(&ts); + break; + case EV_CLK_BOOT: + get_monotonic_boottime64(&ts); + break; + } - ev.time = ktime_to_timeval(time); + ev.time.tv_sec = ts.tv_sec; + ev.time.tv_usec = ts.tv_nsec / NSEC_PER_USEC; ev.type = EV_SYN; ev.code = SYN_DROPPED; ev.value = 0; @@ -257,17 +264,20 @@ 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 *ev_time) + struct timespec64 *ev_time) { struct evdev *evdev = client->evdev; const struct input_value *v; struct input_event event; + struct timespec64 ts; bool wakeup = false; if (client->revoked) return; - event.time = ktime_to_timeval(ev_time[client->clk_type]); + ts = ev_time[client->clk_type]; + event.time.tv_sec = ts.tv_sec; + event.time.tv_usec = ts.tv_nsec / NSEC_PER_USEC; /* Interrupts are disabled, just acquire the lock. */ spin_lock(&client->buffer_lock); @@ -304,12 +314,11 @@ static void evdev_events(struct input_handle *handle, { struct evdev *evdev = handle->private; struct evdev_client *client; - ktime_t ev_time[EV_CLK_MAX]; + struct timespec64 ev_time[EV_CLK_MAX]; - ev_time[EV_CLK_MONO] = ktime_get(); - ev_time[EV_CLK_REAL] = ktime_mono_to_real(ev_time[EV_CLK_MONO]); - ev_time[EV_CLK_BOOT] = ktime_mono_to_any(ev_time[EV_CLK_MONO], - TK_OFFS_BOOT); + ktime_get_ts64(&ev_time[EV_CLK_MONO]); + ktime_get_real_ts64(&ev_time[EV_CLK_REAL]); + get_monotonic_boottime64(&ev_time[EV_CLK_BOOT]); rcu_read_lock();