redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[media] staging: media: lirc: Replace timeval with ktime_t in lirc_serial.c 

'struct timeval tv' is used to get current time.
'static struct timeval lasttv' is used to get last interrupt time.

32-bit systems using 'struct timeval' will break in the year 2038,
so we have to replace that code with more appropriate types.
This patch changes the lirc_serial.c file of media: lirc to use
ktime_t.

ktime_get() is  better than using do_gettimeofday(),
because it uses the monotonic clock. ktime_sub is used
to subtract two ktime variables. The check to test time
going backwards is also removed. Intialization to static
variable is also removed. ktime_to_us() is used to convert
ktime_t to microsecond value. deltv is changed to delkt, a
ktime_t type varibale from long to assign the ktime_sub value
directly. ktime_compare is used to compare delkt with 15
seconds, which is changed to a nanosecond value by using
ktime_set().

Build tested it.

Signed-off-by: Tapasweni Pathak <tapaswenipathak@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
hifive-unleashed-5.1
Arnd Bergmann 2015-11-25 13:11:55 -02:00 committed by Mauro Carvalho Chehab
parent 21312f6ddb
commit 8459503295
1 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/staging/media/lirc/lirc_serial.c
View File

@ -59,7 +59,7 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>
#include <linux/time.h> #include <linux/ktime.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/wait.h> #include <linux/wait.h>
@ -204,7 +204,7 @@ static struct lirc_serial hardware[] = {
#define RBUF_LEN 256 #define RBUF_LEN 256
static struct timeval lasttv = {0, 0}; static ktime_t lastkt;
static struct lirc_buffer rbuf; static struct lirc_buffer rbuf;
@ -542,10 +542,10 @@ static void frbwrite(int l)
static irqreturn_t lirc_irq_handler(int i, void *blah) static irqreturn_t lirc_irq_handler(int i, void *blah)
{ {
struct timeval tv; ktime_t kt;
int counter, dcd; int counter, dcd;
u8 status; u8 status;
long deltv; ktime_t delkt;
int data; int data;
static int last_dcd = -1; static int last_dcd = -1;
@ -565,7 +565,7 @@ static irqreturn_t lirc_irq_handler(int i, void *blah)
if ((status & hardware[type].signal_pin_change) if ((status & hardware[type].signal_pin_change)
&& sense != -1) { && sense != -1) {
/* get current time */ /* get current time */
do_gettimeofday(&tv); kt = ktime_get();
/* New mode, written by Trent Piepho /* New mode, written by Trent Piepho
<xyzzy@u.washington.edu>. */ <xyzzy@u.washington.edu>. */
@ -594,34 +594,20 @@ static irqreturn_t lirc_irq_handler(int i, void *blah)
dcd = (status & hardware[type].signal_pin) ? 1 : 0; dcd = (status & hardware[type].signal_pin) ? 1 : 0;
if (dcd == last_dcd) { if (dcd == last_dcd) {
pr_warn("ignoring spike: %d %d %lx %lx %lx %lx\n", pr_warn("ignoring spike: %d %d %llx %llx\n",
dcd, sense, dcd, sense, ktime_to_us(kt),
tv.tv_sec, lasttv.tv_sec, ktime_to_us(lastkt));
(unsigned long)tv.tv_usec,
(unsigned long)lasttv.tv_usec);
continue; continue;
} }
deltv = tv.tv_sec-lasttv.tv_sec; delkt = ktime_sub(kt, lastkt);
if (tv.tv_sec < lasttv.tv_sec || if (ktime_compare(delkt, ktime_set(15, 0)) > 0) {
(tv.tv_sec == lasttv.tv_sec &&
tv.tv_usec < lasttv.tv_usec)) {
pr_warn("AIEEEE: your clock just jumped backwards\n");
pr_warn("%d %d %lx %lx %lx %lx\n",
dcd, sense,
tv.tv_sec, lasttv.tv_sec,
(unsigned long)tv.tv_usec,
(unsigned long)lasttv.tv_usec);
data = PULSE_MASK;
} else if (deltv > 15) {
data = PULSE_MASK; /* really long time */ data = PULSE_MASK; /* really long time */
if (!(dcd^sense)) { if (!(dcd^sense)) {
/* sanity check */ /* sanity check */
pr_warn("AIEEEE: %d %d %lx %lx %lx %lx\n", pr_warn("AIEEEE: %d %d %llx %llx\n",
dcd, sense, dcd, sense, ktime_to_us(kt),
tv.tv_sec, lasttv.tv_sec, ktime_to_us(lastkt));
(unsigned long)tv.tv_usec,
(unsigned long)lasttv.tv_usec);
/* /*
* detecting pulse while this * detecting pulse while this
* MUST be a space! * MUST be a space!
@ -629,11 +615,9 @@ static irqreturn_t lirc_irq_handler(int i, void *blah)
sense = sense ? 0 : 1; sense = sense ? 0 : 1;
} }
} else } else
data = (int) (deltv*1000000 + data = (int) ktime_to_us(delkt);
tv.tv_usec -
lasttv.tv_usec);
frbwrite(dcd^sense ? data : (data|PULSE_BIT)); frbwrite(dcd^sense ? data : (data|PULSE_BIT));
lasttv = tv; lastkt = kt;
last_dcd = dcd; last_dcd = dcd;
wake_up_interruptible(&rbuf.wait_poll); wake_up_interruptible(&rbuf.wait_poll);
} }
@ -790,7 +774,7 @@ static int set_use_inc(void *data)
unsigned long flags; unsigned long flags;
/* initialize timestamp */ /* initialize timestamp */
do_gettimeofday(&lasttv); lastkt = ktime_get();
spin_lock_irqsave(&hardware[type].lock, flags); spin_lock_irqsave(&hardware[type].lock, flags);
@ -979,7 +963,7 @@ static int lirc_serial_resume(struct platform_device *dev)
spin_lock_irqsave(&hardware[type].lock, flags); spin_lock_irqsave(&hardware[type].lock, flags);
/* Enable Interrupt */ /* Enable Interrupt */
do_gettimeofday(&lasttv); lastkt = ktime_get();
soutp(UART_IER, sinp(UART_IER)|UART_IER_MSI); soutp(UART_IER, sinp(UART_IER)|UART_IER_MSI);
off(); off();