From patchwork Fri Oct 23 08:53:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pingbo Wen X-Patchwork-Id: 55463 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id BA86820581 for ; Fri, 23 Oct 2015 08:54:22 +0000 (UTC) Received: by wiyb4 with SMTP id b4sf7973735wiy.2 for ; Fri, 23 Oct 2015 01:54:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=yB2JsT0O81pcEls4kF50FMqWCq09Le1rAuGvb6dcc8I=; b=aEfkV6GWG3XEB3tk2Rc6j6JqyA1RFeb8jkm0c655mqvE/w1Ifz2IElMQytr/qSikYm 5JR8q86Cu+WQxfZJxVOdWk6ZQzOjYB68q1b6oz/O1DkdLb4KC8IF7Slr0KVl9Ne5vDqi eV8ErsVTQOK0k9m8KJ7we1og8lzQErh5Y/JrB82/cG5NQaG+fMT+OlCWvTNYQ3aQZQ/q UTkMeNAHk30sbsvWmG6LUFjN2gi+f2O5sE0xa/NRwR4n4u44zmz+Xv3+vOmS947A6Gc3 RWf4PtXmRS3sQuioYdnAOr0bGvwt8nQOAbZkq79AzzBv4zPeOJlbXRZfmjwiw5dqitJE 1eKw== X-Gm-Message-State: ALoCoQl2cUmOCnSIoIrOFcizHByIlCxl07ixU+4TEL3g7NF11xVEQ6qZsmL12NDct8OCVh6HrSBx X-Received: by 10.112.169.34 with SMTP id ab2mr4645221lbc.23.1445590462063; Fri, 23 Oct 2015 01:54:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.19.197 with SMTP id 66ls414301lft.73.gmail; Fri, 23 Oct 2015 01:54:21 -0700 (PDT) X-Received: by 10.25.17.208 with SMTP id 77mr6880446lfr.38.1445590461922; Fri, 23 Oct 2015 01:54:21 -0700 (PDT) Received: from mail-lf0-f49.google.com (mail-lf0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id r71si12071056lfe.161.2015.10.23.01.54.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Oct 2015 01:54:21 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by lffv3 with SMTP id v3so75855401lff.0 for ; Fri, 23 Oct 2015 01:54:21 -0700 (PDT) X-Received: by 10.25.28.73 with SMTP id c70mr5809817lfc.76.1445590461755; Fri, 23 Oct 2015 01:54:21 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1078515lbq; Fri, 23 Oct 2015 01:54:20 -0700 (PDT) X-Received: by 10.107.164.89 with SMTP id n86mr22935514ioe.182.1445590460548; Fri, 23 Oct 2015 01:54:20 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x4si2318088igr.34.2015.10.23.01.54.20 for ; Fri, 23 Oct 2015 01:54:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-input-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751711AbbJWIyS (ORCPT ); Fri, 23 Oct 2015 04:54:18 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:34093 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751541AbbJWIyP (ORCPT ); Fri, 23 Oct 2015 04:54:15 -0400 Received: by padhk11 with SMTP id hk11so113084443pad.1 for ; Fri, 23 Oct 2015 01:54:14 -0700 (PDT) X-Received: by 10.68.174.1 with SMTP id bo1mr3837623pbc.110.1445590454502; Fri, 23 Oct 2015 01:54:14 -0700 (PDT) Received: from localhost.localdomain (edge04.meizu.com. [103.26.122.10]) by smtp.gmail.com with ESMTPSA id ea5sm4481922pbc.92.2015.10.23.01.54.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 23 Oct 2015 01:54:13 -0700 (PDT) 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 V2] hp_sdc: fixed y2038 problem Date: Fri, 23 Oct 2015 16:53:26 +0800 Message-Id: <1445590406-30448-1-git-send-email-pingbo.wen@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <5041745.xAgMz1TQSE@wuerfel> References: <5041745.xAgMz1TQSE@wuerfel> Sender: linux-input-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: pingbo.wen@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 1. Converting timeval to ktime_t, and there is no need to handle sec and usec separately 2. hp_sdc.rtv is only used for time diff, monotonic time is better here Signed-off-by: WEN Pingbo --- drivers/input/serio/hp_sdc.c | 16 ++++++---------- include/linux/hp_sdc.h | 6 +++--- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c index 852858e..8ef82ee 100644 --- a/drivers/input/serio/hp_sdc.c +++ b/drivers/input/serio/hp_sdc.c @@ -193,7 +193,7 @@ static void hp_sdc_take(int irq, void *dev_id, uint8_t status, uint8_t data) curr->seq[curr->idx++] = status; curr->seq[curr->idx++] = data; hp_sdc.rqty -= 2; - do_gettimeofday(&hp_sdc.rtv); + hp_sdc.rtv = ktime_get(); if (hp_sdc.rqty <= 0) { /* All data has been gathered. */ @@ -306,13 +306,9 @@ static void hp_sdc_tasklet(unsigned long foo) write_lock_irq(&hp_sdc.rtq_lock); if (hp_sdc.rcurr >= 0) { - struct timeval tv; + ktime_t time_diff = ktime_sub(ktime_get(), hp_sdc.rtv); - do_gettimeofday(&tv); - if (tv.tv_sec > hp_sdc.rtv.tv_sec) - tv.tv_usec += USEC_PER_SEC; - - if (tv.tv_usec - hp_sdc.rtv.tv_usec > HP_SDC_MAX_REG_DELAY) { + if (time_diff.tv64 > HP_SDC_MAX_REG_DELAY) { hp_sdc_transaction *curr; uint8_t tmp; @@ -321,8 +317,8 @@ static void hp_sdc_tasklet(unsigned long foo) * we'll need to figure out a way to communicate * it back to the application. and be less verbose. */ - printk(KERN_WARNING PREFIX "read timeout (%ius)!\n", - (int)(tv.tv_usec - hp_sdc.rtv.tv_usec)); + printk(KERN_WARNING PREFIX "read timeout (%llins)!\n", + time_diff.tv64); curr->idx += hp_sdc.rqty; hp_sdc.rqty = 0; tmp = curr->seq[curr->actidx]; @@ -551,7 +547,7 @@ unsigned long hp_sdc_put(void) /* Start a new read */ hp_sdc.rqty = curr->seq[curr->idx]; - do_gettimeofday(&hp_sdc.rtv); + hp_sdc.rtv = ktime_get(); curr->idx++; /* Still need to lock here in case of spurious irq. */ write_lock_irq(&hp_sdc.rtq_lock); diff --git a/include/linux/hp_sdc.h b/include/linux/hp_sdc.h index d392975..348a9b5 100644 --- a/include/linux/hp_sdc.h +++ b/include/linux/hp_sdc.h @@ -47,9 +47,9 @@ #endif -/* No 4X status reads take longer than this (in usec). +/* No 4X status reads take longer than this (in nsec). */ -#define HP_SDC_MAX_REG_DELAY 20000 +#define HP_SDC_MAX_REG_DELAY 20000000 typedef void (hp_sdc_irqhook) (int irq, void *dev_id, uint8_t status, uint8_t data); @@ -281,7 +281,7 @@ typedef struct { hp_sdc_transaction *tq[HP_SDC_QUEUE_LEN]; /* All pending read/writes */ int rcurr, rqty; /* Current read transact in process */ - struct timeval rtv; /* Time when current read started */ + ktime_t rtv; /* Time when current read started */ int wcurr; /* Current write transact in process */ int dev_err; /* carries status from registration */