From patchwork Mon Nov 27 11:22:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10076615 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 F1AE36028E for ; Mon, 27 Nov 2017 11:24:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D9D5A28DDE for ; Mon, 27 Nov 2017 11:24:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CEB8428DF5; Mon, 27 Nov 2017 11:24:13 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable 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 6C07428DDE for ; Mon, 27 Nov 2017 11:24:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751873AbdK0LYA (ORCPT ); Mon, 27 Nov 2017 06:24:00 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:60404 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751402AbdK0LX7 (ORCPT ); Mon, 27 Nov 2017 06:23:59 -0500 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0M0bdu-1f8EAn07iA-00uv71; Mon, 27 Nov 2017 12:23:55 +0100 From: Arnd Bergmann To: linux-input@vger.kernel.org, Dmitry Torokhov Cc: linux-m68k@lists.linux-m68k.org, Geert Uytterhoeven , linux-parisc@vger.kernel.org, Helge Deller , "James E . J . Bottomley" , WEN Pingbo , Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] input: hil_mlc: convert timeval to jiffies Date: Mon, 27 Nov 2017 12:22:58 +0100 Message-Id: <20171127112324.1917698-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20171127112324.1917698-1-arnd@arndb.de> References: <20171127112324.1917698-1-arnd@arndb.de> X-Provags-ID: V03:K0:yL7hDJvtcAS9YuS5M35TqDfB15DIe1aQ81bM5dpgFPpIEXsOpVU J2fsB9+KXq6QT1ziqWhDyH3wUk6ywXr81Xc/S59nj6cDYVRx6mrZJq7HIxhp+lB0mEtyDbs rrCt0sl2Aapj7oFqa0sELmnXwE3Tv0pLyHluu2kMkNDrwiBAEX9GvgBpl3s4OEMCFysZLmb ujXtxbCIQUq8mUio1v12w== X-UI-Out-Filterresults: notjunk:1; V01:K0:cHvcvAJmt04=:0ZNHpLvKN+ib05KpPUOZGU YX7jOqW1Qwe4Mx9GDxFTjHfOHOQGFoaFPvc6FmwqHlDsIoK/zd2uUy4xigpH8AzK/LzMNCJ1e ADnvYpIPQaChZeyKQWtMnXRZZV+UG3kmI+QnS/qHa9ZJFKehy5XqVWVi4fZTTDBjCVmni3Elf xRY5zmVXL8JnlEejw7aH51wuTrgyGmDxNwWAboeSN5M8lyEZK2dzZAsucuyNJdHOLtxVXZPSd 8zXZ2C0zBYiaIVLnstgDlPlDXBiW9xK2GnBN0CakgrmL6OvHLikwQz9xK9Ql3WIUfWot/rYgo OcnQ76FayoYhsoYghz3Ubn0VFxVfXDReaHMSlWpt/pyKFdgZdGHx/bLKbyGk88n+yDwEeJnRr oQ1HzzvgNaz6PY19cKvH4u6hc8/iMZ/2QlsUhsSLbXlCoR3QisZdBl2CIYblni45LQo3fWXSk UJZ/IQH5ujSTwoOIaOFkQXwkE9409gHdrlu9MX4/9ra9otzGafEu8eOv4ij0d5MGlyL7eP/hf tushdM7VelYCWi2+Kj3qxwLKyHm4f5FHMVHXOUG4G9e4w1YMmMrjEG+wKLSMxUtFeNv/5pu6v hn0D1v9Ey8asu3qwAZKtrnYUOA4lpKNvmp5XMbL7tmVgCSKZxBg3+t9IizD38kG6R6mYAQxWV OijvCXCxJ2jS6yPf/jTwL6OecNe0JwingWFOn5wrrAU0Ty4UtRtX1EQOKUcOPXlwUmd41rUXi e4fZzpaJclAvjQpnttalwLzC00mbTi3Qcuzw+g== 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 From: WEN Pingbo struct timeval is not y2038 safe, and what mlc->instart do is scheduling a task in a fixed timeout, so jiffies is the simplest choice here. In hilse_donode(), the expires in mod_timer equals jiffies + intimeout - (now - instart) If we use jiffies in 'now', the expires equals instart + intimeout So, all we need to do is that making sure expires is a future timestamp before passed it to mod_timer. [arnd: slightly simplified patch further] Link: https://lists.linaro.org/pipermail/y2038/2015-October/000937.html Signed-off-by: WEN Pingbo Signed-off-by: Arnd Bergmann --- drivers/input/serio/hil_mlc.c | 18 +++++++----------- drivers/input/serio/hp_sdc_mlc.c | 5 +---- include/linux/hil_mlc.h | 4 ++-- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c index 581e47119363..e1423f7648d6 100644 --- a/drivers/input/serio/hil_mlc.c +++ b/drivers/input/serio/hil_mlc.c @@ -602,8 +602,8 @@ static inline void hilse_setup_input(hil_mlc *mlc, const struct hilse_node *node BUG(); } mlc->istarted = 1; - mlc->intimeout = node->arg; - do_gettimeofday(&(mlc->instart)); + mlc->intimeout = usecs_to_jiffies(node->arg); + mlc->instart = jiffies; mlc->icount = 15; memset(mlc->ipacket, 0, 16 * sizeof(hil_packet)); BUG_ON(down_trylock(&mlc->isem)); @@ -708,7 +708,7 @@ static int hilse_donode(hil_mlc *mlc) break; } mlc->ostarted = 0; - do_gettimeofday(&(mlc->instart)); + mlc->instart = jiffies; write_unlock_irqrestore(&mlc->lock, flags); nextidx = HILSEN_NEXT; break; @@ -729,18 +729,14 @@ static int hilse_donode(hil_mlc *mlc) #endif while (nextidx & HILSEN_SCHED) { - struct timeval tv; + unsigned long now = jiffies; if (!sched_long) goto sched; - do_gettimeofday(&tv); - tv.tv_usec += USEC_PER_SEC * (tv.tv_sec - mlc->instart.tv_sec); - tv.tv_usec -= mlc->instart.tv_usec; - if (tv.tv_usec >= mlc->intimeout) goto sched; - tv.tv_usec = (mlc->intimeout - tv.tv_usec) * HZ / USEC_PER_SEC; - if (!tv.tv_usec) goto sched; - mod_timer(&hil_mlcs_kicker, jiffies + tv.tv_usec); + if (time_after(now, mlc->instart + mlc->intimeout)) + goto sched; + mod_timer(&hil_mlcs_kicker, mlc->instart + mlc->intimeout); break; sched: tasklet_schedule(&hil_mlcs_tasklet); diff --git a/drivers/input/serio/hp_sdc_mlc.c b/drivers/input/serio/hp_sdc_mlc.c index d50f0678bf47..232d30c825bd 100644 --- a/drivers/input/serio/hp_sdc_mlc.c +++ b/drivers/input/serio/hp_sdc_mlc.c @@ -149,7 +149,6 @@ static int hp_sdc_mlc_in(hil_mlc *mlc, suseconds_t timeout) /* Try to down the semaphore */ if (down_trylock(&mlc->isem)) { - struct timeval tv; if (priv->emtestmode) { mlc->ipacket[0] = HIL_ERR_INT | (mlc->opacket & @@ -160,9 +159,7 @@ static int hp_sdc_mlc_in(hil_mlc *mlc, suseconds_t timeout) /* printk(KERN_DEBUG PREFIX ">[%x]\n", mlc->ipacket[0]); */ goto wasup; } - do_gettimeofday(&tv); - tv.tv_usec += USEC_PER_SEC * (tv.tv_sec - mlc->instart.tv_sec); - if (tv.tv_usec - mlc->instart.tv_usec > mlc->intimeout) { + if (time_after(jiffies, mlc->instart + mlc->intimeout)) { /* printk("!%i %i", tv.tv_usec - mlc->instart.tv_usec, mlc->intimeout); diff --git a/include/linux/hil_mlc.h b/include/linux/hil_mlc.h index d6fc839bdf46..774f7d3b8f6a 100644 --- a/include/linux/hil_mlc.h +++ b/include/linux/hil_mlc.h @@ -144,8 +144,8 @@ struct hil_mlc { hil_packet ipacket[16]; hil_packet imatch; int icount; - struct timeval instart; - suseconds_t intimeout; + unsigned long instart; + unsigned long intimeout; int ddi; /* Last operational device id */ int lcv; /* LCV to throttle loops */