From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751563AbbJXEB3 (ORCPT ); Sat, 24 Oct 2015 00:01:29 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:33128 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751253AbbJXEA4 (ORCPT ); Sat, 24 Oct 2015 00:00:56 -0400 From: WEN Pingbo To: arnd@arndb.de Cc: y2038@lists.linaro.org, dmitry.torokhov@gmail.com, linux-kernel@vger.kernel.org, linux-input@vger.kernel.org, WEN Pingbo Subject: [PATCH V3 2/2] hil_mlc: convert timeval to jiffies Date: Sat, 24 Oct 2015 12:00:19 +0800 Message-Id: <1445659219-23135-2-git-send-email-pingbo.wen@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445659219-23135-1-git-send-email-pingbo.wen@linaro.org> References: <5201254.PnVcGHTDmH@wuerfel> <1445659219-23135-1-git-send-email-pingbo.wen@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Signed-off-by: WEN Pingbo --- Version 2: Using ktime_t to fix y2038 problem Version 3: Convert it to jiffies drivers/input/serio/hil_mlc.c | 17 +++++++---------- drivers/input/serio/hp_sdc_mlc.c | 7 +++---- include/linux/hil_mlc.h | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c index fb297aa..5428098 100644 --- a/drivers/input/serio/hil_mlc.c +++ b/drivers/input/serio/hil_mlc.c @@ -603,7 +603,7 @@ static inline void hilse_setup_input(hil_mlc *mlc, const struct hilse_node *node } mlc->istarted = 1; mlc->intimeout = node->arg; - do_gettimeofday(&(mlc->instart)); + 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,15 @@ static int hilse_donode(hil_mlc *mlc) #endif while (nextidx & HILSEN_SCHED) { - struct timeval tv; + unsigned long expires = mlc->instart + + usecs_to_jiffies(mlc->intimeout); 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_eq(jiffies, expires)) + goto sched; + mod_timer(&hil_mlcs_kicker, expires); 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 d50f067..b91d5bb 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,9 @@ 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 + usecs_to_jiffies(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 29bb5e3..feb167d 100644 --- a/include/linux/hil_mlc.h +++ b/include/linux/hil_mlc.h @@ -144,7 +144,7 @@ struct hil_mlc { hil_packet ipacket[16]; hil_packet imatch; int icount; - struct timeval instart; + unsigned long instart; /* in jiffies */ suseconds_t intimeout; int ddi; /* Last operational device id */ -- 1.9.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: WEN Pingbo Subject: [PATCH V3 2/2] hil_mlc: convert timeval to jiffies Date: Sat, 24 Oct 2015 12:00:19 +0800 Message-ID: <1445659219-23135-2-git-send-email-pingbo.wen@linaro.org> References: <5201254.PnVcGHTDmH@wuerfel> <1445659219-23135-1-git-send-email-pingbo.wen@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1445659219-23135-1-git-send-email-pingbo.wen@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: y2038-bounces@lists.linaro.org Sender: "Y2038" To: arnd@arndb.de Cc: y2038@lists.linaro.org, dmitry.torokhov@gmail.com, WEN Pingbo , linux-kernel@vger.kernel.org, linux-input@vger.kernel.org List-Id: linux-input@vger.kernel.org c3RydWN0IHRpbWV2YWwgaXMgbm90IHkyMDM4IHNhZmUsIGFuZCB3aGF0IG1sYy0+aW5zdGFydCBk byBpcwpzY2hlZHVsaW5nIGEgdGFzayBpbiBhIGZpeGVkIHRpbWVvdXQsIHNvIGppZmZpZXMgaXMg dGhlCnNpbXBsZXN0IGNob2ljZSBoZXJlLgoKSW4gaGlsc2VfZG9ub2RlKCksIHRoZSBleHBpcmVz IGluIG1vZF90aW1lciBlcXVhbHMKCglqaWZmaWVzICsgaW50aW1lb3V0IC0gKG5vdyAtIGluc3Rh cnQpCgpJZiB3ZSB1c2UgamlmZmllcyBpbiAnbm93JywgdGhlIGV4cGlyZXMgZXF1YWxzCgoJaW5z dGFydCArIGludGltZW91dAoKU28sIGFsbCB3ZSBuZWVkIHRvIGRvIGlzIHRoYXQgbWFraW5nIHN1 cmUgZXhwaXJlcyBpcyBhIGZ1dHVyZQp0aW1lc3RhbXAgYmVmb3JlIHBhc3NlZCBpdCB0byBtb2Rf dGltZXIKClNpZ25lZC1vZmYtYnk6IFdFTiBQaW5nYm8gPHBpbmdiby53ZW5AbGluYXJvLm9yZz4K LS0tCgpWZXJzaW9uIDI6CglVc2luZyBrdGltZV90IHRvIGZpeCB5MjAzOCBwcm9ibGVtClZlcnNp b24gMzoKCUNvbnZlcnQgaXQgdG8gamlmZmllcwoKIGRyaXZlcnMvaW5wdXQvc2VyaW8vaGlsX21s Yy5jICAgIHwgMTcgKysrKysrKy0tLS0tLS0tLS0KIGRyaXZlcnMvaW5wdXQvc2VyaW8vaHBfc2Rj X21sYy5jIHwgIDcgKysrLS0tLQogaW5jbHVkZS9saW51eC9oaWxfbWxjLmggICAgICAgICAgfCAg MiArLQogMyBmaWxlcyBjaGFuZ2VkLCAxMSBpbnNlcnRpb25zKCspLCAxNSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9kcml2ZXJzL2lucHV0L3NlcmlvL2hpbF9tbGMuYyBiL2RyaXZlcnMvaW5w dXQvc2VyaW8vaGlsX21sYy5jCmluZGV4IGZiMjk3YWEuLjU0MjgwOTggMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvaW5wdXQvc2VyaW8vaGlsX21sYy5jCisrKyBiL2RyaXZlcnMvaW5wdXQvc2VyaW8vaGls X21sYy5jCkBAIC02MDMsNyArNjAzLDcgQEAgc3RhdGljIGlubGluZSB2b2lkIGhpbHNlX3NldHVw X2lucHV0KGhpbF9tbGMgKm1sYywgY29uc3Qgc3RydWN0IGhpbHNlX25vZGUgKm5vZGUKIAl9CiAJ bWxjLT5pc3RhcnRlZCA9IDE7CiAJbWxjLT5pbnRpbWVvdXQgPSBub2RlLT5hcmc7Ci0JZG9fZ2V0 dGltZW9mZGF5KCYobWxjLT5pbnN0YXJ0KSk7CisJbWxjLT5pbnN0YXJ0ID0gamlmZmllczsKIAlt bGMtPmljb3VudCA9IDE1OwogCW1lbXNldChtbGMtPmlwYWNrZXQsIDAsIDE2ICogc2l6ZW9mKGhp bF9wYWNrZXQpKTsKIAlCVUdfT04oZG93bl90cnlsb2NrKCZtbGMtPmlzZW0pKTsKQEAgLTcwOCw3 ICs3MDgsNyBAQCBzdGF0aWMgaW50IGhpbHNlX2Rvbm9kZShoaWxfbWxjICptbGMpCiAJCQlicmVh azsKIAkJfQogCQltbGMtPm9zdGFydGVkID0gMDsKLQkJZG9fZ2V0dGltZW9mZGF5KCYobWxjLT5p bnN0YXJ0KSk7CisJCW1sYy0+aW5zdGFydCA9IGppZmZpZXM7CiAJCXdyaXRlX3VubG9ja19pcnFy ZXN0b3JlKCZtbGMtPmxvY2ssIGZsYWdzKTsKIAkJbmV4dGlkeCA9IEhJTFNFTl9ORVhUOwogCQli cmVhazsKQEAgLTcyOSwxOCArNzI5LDE1IEBAIHN0YXRpYyBpbnQgaGlsc2VfZG9ub2RlKGhpbF9t bGMgKm1sYykKICNlbmRpZgogCiAJd2hpbGUgKG5leHRpZHggJiBISUxTRU5fU0NIRUQpIHsKLQkJ c3RydWN0IHRpbWV2YWwgdHY7CisJCXVuc2lnbmVkIGxvbmcgZXhwaXJlcyA9IG1sYy0+aW5zdGFy dCArCisJCQl1c2Vjc190b19qaWZmaWVzKG1sYy0+aW50aW1lb3V0KTsKIAogCQlpZiAoIXNjaGVk X2xvbmcpCiAJCQlnb3RvIHNjaGVkOwogCi0JCWRvX2dldHRpbWVvZmRheSgmdHYpOwotCQl0di50 dl91c2VjICs9IFVTRUNfUEVSX1NFQyAqICh0di50dl9zZWMgLSBtbGMtPmluc3RhcnQudHZfc2Vj KTsKLQkJdHYudHZfdXNlYyAtPSBtbGMtPmluc3RhcnQudHZfdXNlYzsKLQkJaWYgKHR2LnR2X3Vz ZWMgPj0gbWxjLT5pbnRpbWVvdXQpIGdvdG8gc2NoZWQ7Ci0JCXR2LnR2X3VzZWMgPSAobWxjLT5p bnRpbWVvdXQgLSB0di50dl91c2VjKSAqIEhaIC8gVVNFQ19QRVJfU0VDOwotCQlpZiAoIXR2LnR2 X3VzZWMpIGdvdG8gc2NoZWQ7Ci0JCW1vZF90aW1lcigmaGlsX21sY3Nfa2lja2VyLCBqaWZmaWVz ICsgdHYudHZfdXNlYyk7CisJCWlmICh0aW1lX2FmdGVyX2VxKGppZmZpZXMsIGV4cGlyZXMpKQor CQkJZ290byBzY2hlZDsKKwkJbW9kX3RpbWVyKCZoaWxfbWxjc19raWNrZXIsIGV4cGlyZXMpOwog CQlicmVhazsKIAlzY2hlZDoKIAkJdGFza2xldF9zY2hlZHVsZSgmaGlsX21sY3NfdGFza2xldCk7 CmRpZmYgLS1naXQgYS9kcml2ZXJzL2lucHV0L3NlcmlvL2hwX3NkY19tbGMuYyBiL2RyaXZlcnMv aW5wdXQvc2VyaW8vaHBfc2RjX21sYy5jCmluZGV4IGQ1MGYwNjcuLmI5MWQ1YmIgMTAwNjQ0Ci0t LSBhL2RyaXZlcnMvaW5wdXQvc2VyaW8vaHBfc2RjX21sYy5jCisrKyBiL2RyaXZlcnMvaW5wdXQv c2VyaW8vaHBfc2RjX21sYy5jCkBAIC0xNDksNyArMTQ5LDYgQEAgc3RhdGljIGludCBocF9zZGNf bWxjX2luKGhpbF9tbGMgKm1sYywgc3VzZWNvbmRzX3QgdGltZW91dCkKIAogCS8qIFRyeSB0byBk b3duIHRoZSBzZW1hcGhvcmUgKi8KIAlpZiAoZG93bl90cnlsb2NrKCZtbGMtPmlzZW0pKSB7Ci0J CXN0cnVjdCB0aW1ldmFsIHR2OwogCQlpZiAocHJpdi0+ZW10ZXN0bW9kZSkgewogCQkJbWxjLT5p cGFja2V0WzBdID0KIAkJCQlISUxfRVJSX0lOVCB8IChtbGMtPm9wYWNrZXQgJgpAQCAtMTYwLDkg KzE1OSw5IEBAIHN0YXRpYyBpbnQgaHBfc2RjX21sY19pbihoaWxfbWxjICptbGMsIHN1c2Vjb25k c190IHRpbWVvdXQpCiAJCQkvKiBwcmludGsoS0VSTl9ERUJVRyBQUkVGSVggIj5bJXhdXG4iLCBt bGMtPmlwYWNrZXRbMF0pOyAqLwogCQkJZ290byB3YXN1cDsKIAkJfQotCQlkb19nZXR0aW1lb2Zk YXkoJnR2KTsKLQkJdHYudHZfdXNlYyArPSBVU0VDX1BFUl9TRUMgKiAodHYudHZfc2VjIC0gbWxj LT5pbnN0YXJ0LnR2X3NlYyk7Ci0JCWlmICh0di50dl91c2VjIC0gbWxjLT5pbnN0YXJ0LnR2X3Vz ZWMgPiBtbGMtPmludGltZW91dCkgeworCisJCWlmICh0aW1lX2FmdGVyKGppZmZpZXMsCisJCQlt bGMtPmluc3RhcnQgKyB1c2Vjc190b19qaWZmaWVzKG1sYy0+aW50aW1lb3V0KSkpIHsKIAkJCS8q CXByaW50aygiISVpICVpIiwKIAkJCQl0di50dl91c2VjIC0gbWxjLT5pbnN0YXJ0LnR2X3VzZWMs CiAJCQkJbWxjLT5pbnRpbWVvdXQpOwpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9saW51eC9oaWxfbWxj LmggYi9pbmNsdWRlL2xpbnV4L2hpbF9tbGMuaAppbmRleCAyOWJiNWUzLi5mZWIxNjdkIDEwMDY0 NAotLS0gYS9pbmNsdWRlL2xpbnV4L2hpbF9tbGMuaAorKysgYi9pbmNsdWRlL2xpbnV4L2hpbF9t bGMuaApAQCAtMTQ0LDcgKzE0NCw3IEBAIHN0cnVjdCBoaWxfbWxjIHsKIAloaWxfcGFja2V0CQlp cGFja2V0WzE2XTsKIAloaWxfcGFja2V0CQlpbWF0Y2g7CiAJaW50CQkJaWNvdW50OwotCXN0cnVj dCB0aW1ldmFsCQlpbnN0YXJ0OworCXVuc2lnbmVkIGxvbmcJCWluc3RhcnQ7IC8qIGluIGppZmZp ZXMgKi8KIAlzdXNlY29uZHNfdAkJaW50aW1lb3V0OwogCiAJaW50CQkJZGRpOwkvKiBMYXN0IG9w ZXJhdGlvbmFsIGRldmljZSBpZCAqLwotLSAKMS45LjEKCl9fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fClkyMDM4IG1haWxpbmcgbGlzdApZMjAzOEBsaXN0cy5s aW5hcm8ub3JnCmh0dHBzOi8vbGlzdHMubGluYXJvLm9yZy9tYWlsbWFuL2xpc3RpbmZvL3kyMDM4 Cg==