From patchwork Mon Nov 27 11:22:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 119671 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp1559849edl; Mon, 27 Nov 2017 03:23:36 -0800 (PST) X-Google-Smtp-Source: AGs4zMbG/V841fz5XBLoXsOU8tHsZxmNVbvYRhn4EmeDQ8ZPwdcoD6Tqogj8doN+sCPcpAsAB6Cn X-Received: by 10.98.204.198 with SMTP id j67mr20038509pfk.41.1511781816776; Mon, 27 Nov 2017 03:23:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511781816; cv=none; d=google.com; s=arc-20160816; b=W7MuiUwPtpIlZ668NUwFHvY0hzR401EcBQBYCXIkGTG80MSx1DDpR3Kvue4Y/5yp3c 6c3O/hdGQJU7Yx4kDPBLF+/Tw9jB0gFahhjsSV99olACo9y9/vXSyKwIeaYOCbeIE1Ks pf1vDaJ1y4Bk1Aleh6cC0/hfVqiZpizdTW5L6HBIuEteVTUovc90EwMuIzA7Fxeb8t3L WbXMSVnAOSZCrBfZYKQzzNYyh00JVt0FFKh4k5KPJyojsS0nyjOellx8fINexhT2NVnR XAWyKfkQMOdyOZ9soudFbFqmJ0ogBsKihiJi4v0Cdt34BsMLP5IbgcCAnWuPE4jHKcYS d/DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=YIfy4uk1/cMxjTi73ZWrjPZOgYdWzzasulHMpUvssNs=; b=g6gOjJhYr/GbV5K7ela233m7OpEpPanL5VF6x31dJybsw3DyvQ0DSAkNdVfBJU5Eg0 YABZm4IgwuZm5DbxysxywvEwtudG3z7yUxkHSlJYVXjFPTsxuhNQC9B7z9uBLTk7/z4Y M55x9lv5W0WBYxVoCAk2XbkvyuYh3fKeg9yS9ZY+YZYRKuCOU4+p6ZTElfNUD5wiU/YF +OzHT9MQ8yBcIeuA4qRLS5F4hOoXYSSsdHg0F0is5Zue0/lE9oO2P/H0nnkkaDnfHy3E 9TUe+UO4qm45BuUyLtXrsc99s6gSs6+Px+YiWYWjWkbLsCbthNsck0KZP5p0uTXxt3YC M2dg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q4si1754424plb.527.2017.11.27.03.23.36; Mon, 27 Nov 2017 03:23:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751872AbdK0LXe (ORCPT + 28 others); Mon, 27 Nov 2017 06:23:34 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:61553 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751770AbdK0LXc (ORCPT ); Mon, 27 Nov 2017 06:23:32 -0500 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.145]) with ESMTPA (Nemesis) id 0MXWgY-1efhvq1MsI-00WWWl; Mon, 27 Nov 2017 12:23:28 +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 1/3] Input: hil_mlc: convert timeval to time64_t Date: Mon, 27 Nov 2017 12:22:57 +0100 Message-Id: <20171127112324.1917698-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:cTWyhUrbfa4lfsRHdIRTlmvvGU0GnhsVk/S9gQiENx4DTUnfw2S 3+9Gwyrgx2J9nXOLGp7Qd37hOKttrvSg6reOr8MxwE/uTVmJ7X8Lf9j5Qbk3qatFVvP+7i8 r9JOWrKZ3G1lZdubwjs3gEKmAj/qpXbULBe6LIA8gp3ApMW6OgDUjjwMyuDAoiGIZP06c1e 9pTySiZS3JbgMX7eRv6gg== X-UI-Out-Filterresults: notjunk:1; V01:K0:FCtk+oI5CYs=:PHFRakD9+ZhEvi8YuMJ+BN hr+lOl/Mkd0ThebKYN7ivIxyokktXg2SArd0iwzrr25Q4uV52NVfpFRrpNChxsFYT6QhFpRE9 63+zhPEDYuC6d9Ai49f21kxfL6TOsLcK7cqr5yH+mMoiPr7/U07SzeRuqZEqmx+Ohl007W7c0 S7u9Vhf7cJYk5lo3tsS95buZZpyY1SNsSN+PPt1MIPcpXBfsrzY/fCxiJj/4KGW0QgnrGZTq5 3mb2P0YDXP2w4bPIywIeKs94XaLVGGoKuMHnegZI6kljvKR9Ye2fzwuvVP/LIcYKhmBXBiRtW RjppTkjqETwgfHMAGRXusEcv4p5D9AQItF/m5BZf4lfHuUxNafVwwYiqkRZ9PAwmiIazSalvG KzBdgdlblMbsgaQYntfaD1ruI0wOD7htofnuN0lRcXQI9WQ8uJk4ko/x4JWpYrDUNMzTyptaQ fxGjbopqW9HHCwTZ4y6vKDptvjVWCe1NxFW2QSKPzZ6ovJaUsuAD284RnxSMjz5Lr/T0HNahD BKTQ2OEBaxZKy/Dnd7wSAdZjcqUX7Oh0b5Z+LNk6enRPcnzBy6KL6t9kMkP1cNpxQW6uapxKc 6AVToAhW+R2/ui3Z1yNHHx4NGEGkSFOru30R3uheliopUS9YTQyASoGu7F/1XpefJ4giyByO0 4Gn4KCnWSvSYQjbZ6iGHdXC4Lg7ag5j8aX7MBbKMsg9qtvof+GzEY3ufgKFf1FG2vtdvBHuf+ SazNoTL3yYJh6v6olMAvDMWhDcLXxGq9/L+QPA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: WEN Pingbo Since mlc->lcv_t is only interested in seconds, directly using time64_t here. This gets rid of the deprecated do_gettimeofday() and avoids problems with time going backwards since we now use the monotonic clocksource. Signed-off-by: WEN Pingbo Signed-off-by: Arnd Bergmann --- drivers/input/serio/hil_mlc.c | 8 +++----- include/linux/hil_mlc.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) -- 2.9.0 diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c index d66d01c5373b..581e47119363 100644 --- a/drivers/input/serio/hil_mlc.c +++ b/drivers/input/serio/hil_mlc.c @@ -274,14 +274,12 @@ static int hilse_match(hil_mlc *mlc, int unused) /* An LCV used to prevent runaway loops, forces 5 second sleep when reset. */ static int hilse_init_lcv(hil_mlc *mlc, int unused) { - struct timeval tv; + time64_t now = ktime_get_seconds(); - do_gettimeofday(&tv); - - if (mlc->lcv && (tv.tv_sec - mlc->lcv_tv.tv_sec) < 5) + if (mlc->lcv && (now - mlc->lcv_time) < 5) return -1; - mlc->lcv_tv = tv; + mlc->lcv_time = now; mlc->lcv = 0; return 0; diff --git a/include/linux/hil_mlc.h b/include/linux/hil_mlc.h index 394a8405dd74..d6fc839bdf46 100644 --- a/include/linux/hil_mlc.h +++ b/include/linux/hil_mlc.h @@ -149,7 +149,7 @@ struct hil_mlc { int ddi; /* Last operational device id */ int lcv; /* LCV to throttle loops */ - struct timeval lcv_tv; /* Time loop was started */ + time64_t lcv_time; /* Time loop was started */ int di_map[7]; /* Maps below items to live devs */ struct hil_mlc_devinfo di[HIL_MLC_DEVMEM]; 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: 119672 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp1560359edl; Mon, 27 Nov 2017 03:24:04 -0800 (PST) X-Google-Smtp-Source: AGs4zMawqfyFUm7ub1+86Fl15GnUNazKZyVQnIIjWtC0kEB4uzgIU/GNPlOu+xLYxaKnheKouxl9 X-Received: by 10.159.214.139 with SMTP id n11mr36508106plp.289.1511781844318; Mon, 27 Nov 2017 03:24:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511781844; cv=none; d=google.com; s=arc-20160816; b=D+oSmj5ozBa5emE4uqIeRhI1LBA7iURCGaWtXxalb12NBB3knDznCwTBPLpqK1arvD w5SOtopKEiqva+FSDxzDx1kRXxIA816zpJWc8DtuprgCuCiRQInGG8jfnFJti569l1p7 1DSjruDW5fIb/8qhZM9x5oei/faV6JqLyiYXx7qPIIel0yB0S/R7oANchOBKO8GcrEk1 +SVcYU8rVrhAMH4ACdER2Vg9ln+MOzX2a9LH37Y0oHfISzy0mMNBa7Paou+lOPBsJFY/ Tg19OwlOAW5oEP7bgibJbEpXojdo2WcbzTtgV5UHB1h2rubhPfP90Wqnv9rQvBxVTTLf tuIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=XLglfGBZfSlbKyu1CR3HULpnqW7RGMXKXk6+GLJTTPo=; b=B8RMYhWVagcVcZLFkrzTkDIsRVr+brPjWF0aU+7OXMtBWH8ILKZPg1bdtfEiWGlqih P3Tv3Y6CF1x9uR9IHvfqzPHKMrE/SaP2lyINySdRgJnQ3jpxJVenxoVYnxRRw+vw5ywD TiOgCO9kCTkxFIejxh/0airsTKtjALBl0MOAcvDB9gOhtO7skZUC4/qAvB0mzcrLarMn QDt/h1OhHhI/MUywkIM0Rbx/jj1iRFpUstYLr0Cle3g08seMq+DDXt/VLPhaoMtjkpcg tiJpFxcVw/Gpjxmh9zh+tgoMMD/lknSpzE8hGJ1RKvufI2cN94+dlunMejqX5R90cSsi CR0A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x5si23128095plo.24.2017.11.27.03.24.02; Mon, 27 Nov 2017 03:24:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751943AbdK0LYB (ORCPT + 28 others); Mon, 27 Nov 2017 06:24:01 -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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- 2.9.0 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 */