All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] hp_sdc: fixed y2038 problem
@ 2015-10-18  9:44 ` WEN Pingbo
  0 siblings, 0 replies; 16+ messages in thread
From: WEN Pingbo @ 2015-10-18  9:44 UTC (permalink / raw)
  To: dmitry.torokhov, arnd; +Cc: linux-kernel, linux-input, y2038, WEN Pingbo

Two replacements happened in this patch:
    1. using timespec64 to prevent time overflow in 2038
    2. using ktime_get_ts64 to avoid wall time issues(leap second, etc)

Signed-off-by: WEN Pingbo <pingbo.wen@linaro.org>
---
 drivers/input/serio/hp_sdc.c | 18 +++++++++---------
 include/linux/hp_sdc.h       |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c
index 852858e..76fb7fa 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);
+	ktime_get_ts64(&hp_sdc.rtv);
 
 	if (hp_sdc.rqty <= 0) {
 		/* All data has been gathered. */
@@ -306,13 +306,13 @@ static void hp_sdc_tasklet(unsigned long foo)
 	write_lock_irq(&hp_sdc.rtq_lock);
 
 	if (hp_sdc.rcurr >= 0) {
-		struct timeval tv;
+		struct timespec64 ts64;
 
-		do_gettimeofday(&tv);
-		if (tv.tv_sec > hp_sdc.rtv.tv_sec)
-			tv.tv_usec += USEC_PER_SEC;
+		ktime_get_ts64(&ts64);
+		if (ts64.tv_sec > hp_sdc.rtv.tv_sec)
+			ts64.tv_nsec += NSEC_PER_SEC;
 
-		if (tv.tv_usec - hp_sdc.rtv.tv_usec > HP_SDC_MAX_REG_DELAY) {
+		if (ts64.tv_nsec - hp_sdc.rtv.tv_nsec > HP_SDC_MAX_REG_DELAY) {
 			hp_sdc_transaction *curr;
 			uint8_t tmp;
 
@@ -321,8 +321,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",
+			       (s64)(ts64.tv_nsec - hp_sdc.rtv.tv_nsec));
 			curr->idx += hp_sdc.rqty;
 			hp_sdc.rqty = 0;
 			tmp = curr->seq[curr->actidx];
@@ -551,7 +551,7 @@ unsigned long hp_sdc_put(void)
 
 			/* Start a new read */
 			hp_sdc.rqty = curr->seq[curr->idx];
-			do_gettimeofday(&hp_sdc.rtv);
+			ktime_get_ts64(&hp_sdc.rtv);
 			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..1535640 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 */
+	struct timespec64	rtv;		/* Time when current read started */
 	int		wcurr;		/* Current write transact in process */
 
 	int		dev_err;	/* carries status from registration */
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2015-10-24  4:07 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-18  9:44 [PATCH] hp_sdc: fixed y2038 problem WEN Pingbo
2015-10-18  9:44 ` WEN Pingbo
2015-10-19  9:01 ` [Y2038] " Arnd Bergmann
2015-10-21  8:52   ` Pingbo Wen
2015-10-23  8:53   ` [PATCH V2] " WEN Pingbo
2015-10-23  9:25     ` [Y2038] " Arnd Bergmann
2015-10-23  9:31       ` Pingbo Wen
2015-10-23  9:31         ` Pingbo Wen
2015-10-23 11:29       ` [PATCH V3] hp_sdc: convert struct timeval to ktime_t WEN Pingbo
2015-10-23 11:45         ` Arnd Bergmann
2015-10-23 11:45           ` Arnd Bergmann
2015-10-23 12:19           ` Pingbo Wen
2015-10-23 12:19             ` Pingbo Wen
2015-10-23 12:34             ` Arnd Bergmann
2015-10-24  4:07               ` [PATCH V4] " WEN Pingbo
2015-10-24  4:07                 ` WEN Pingbo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.