4 files changed, 113 insertions, 48 deletions

diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c
index a0aa5c1b6b41..a89456932f7c 100644
--- a/drivers/media/IR/ir-keytable.c
+++ b/drivers/media/IR/ir-keytable.c
@@ -21,6 +21,9 @@
 #define IR_TAB_MIN_SIZE 256
 #define IR_TAB_MAX_SIZE 8192
 
+/* FIXME: IR_KEYPRESS_TIMEOUT should be protocol specific */
+#define IR_KEYPRESS_TIMEOUT 250
+
 /**
  * ir_resize_table() - resizes a scancode table if necessary
  * @rc_tab:     the ir_scancode_table to resize
@@ -263,56 +266,124 @@ EXPORT_SYMBOL_GPL(ir_g_keycode_from_table);
 
 /**
  * ir_keyup() - generates input event to cleanup a key press
- * @input_dev:  the struct input_dev descriptor of the device
+ * @ir:         the struct ir_input_dev descriptor of the device
  *
- * This routine is used by the input routines when a key is pressed at the
- * IR. It reports a keyup input event via input_report_key().
+ * This routine is used to signal that a key has been released on the
+ * remote control. It reports a keyup input event via input_report_key().
+ */
+static void ir_keyup(struct ir_input_dev *ir)
+{
+        if (!ir->keypressed)
+                return;
+
+        IR_dprintk(1, "keyup key 0x%04x\n", ir->last_keycode);
+        input_report_key(ir->input_dev, ir->last_keycode, 0);
+        input_sync(ir->input_dev);
+        ir->keypressed = false;
+}
+
+/**
+ * ir_timer_keyup() - generates a keyup event after a timeout
+ * @cookie:     a pointer to struct ir_input_dev passed to setup_timer()
+ *
+ * This routine will generate a keyup event some time after a keydown event
+ * is generated when no further activity has been detected.
  */
-void ir_keyup(struct input_dev *dev)
+static void ir_timer_keyup(unsigned long cookie)
 {
+        struct ir_input_dev *ir = (struct ir_input_dev *)cookie;
+        unsigned long flags;
+
+        /*
+         * ir->keyup_jiffies is used to prevent a race condition if a
+         * hardware interrupt occurs at this point and the keyup timer
+         * event is moved further into the future as a result.
+         *
+         * The timer will then be reactivated and this function called
+         * again in the future. We need to exit gracefully in that case
+         * to allow the input subsystem to do its auto-repeat magic or
+         * a keyup event might follow immediately after the keydown.
+         */
+        spin_lock_irqsave(&ir->keylock, flags);
+        if (time_is_after_eq_jiffies(ir->keyup_jiffies))
+                ir_keyup(ir);
+        spin_unlock_irqrestore(&ir->keylock, flags);
+}
+
+/**
+ * ir_repeat() - notifies the IR core that a key is still pressed
+ * @dev:        the struct input_dev descriptor of the device
+ *
+ * This routine is used by IR decoders when a repeat message which does
+ * not include the necessary bits to reproduce the scancode has been
+ * received.
+ */
+void ir_repeat(struct input_dev *dev)
+{
+        unsigned long flags;
         struct ir_input_dev *ir = input_get_drvdata(dev);
 
+        spin_lock_irqsave(&ir->keylock, flags);
+
         if (!ir->keypressed)
-                return;
+                goto out;
 
-        IR_dprintk(1, "keyup key 0x%04x\n", ir->keycode);
-        input_report_key(dev, ir->keycode, 0);
-        input_sync(dev);
-        ir->keypressed = 0;
+        ir->keyup_jiffies = jiffies + msecs_to_jiffies(IR_KEYPRESS_TIMEOUT);
+        mod_timer(&ir->timer_keyup, ir->keyup_jiffies);
+
+out:
+        spin_unlock_irqrestore(&ir->keylock, flags);
 }
-EXPORT_SYMBOL_GPL(ir_keyup);
+EXPORT_SYMBOL_GPL(ir_repeat);
 
 /**
  * ir_keydown() - generates input event for a key press
- * @input_dev:  the struct input_dev descriptor of the device
- * @scancode:   the scancode that we're seeking
+ * @dev:        the struct input_dev descriptor of the device
+ * @scancode:   the scancode that we're seeking
+ * @toggle:     the toggle value (protocol dependent, if the protocol doesn't
+ *              support toggle values, this should be set to zero)
  *
  * This routine is used by the input routines when a key is pressed at the
  * IR. It gets the keycode for a scancode and reports an input event via
  * input_report_key().
  */
-void ir_keydown(struct input_dev *dev, int scancode)
+void ir_keydown(struct input_dev *dev, int scancode, u8 toggle)
 {
+        unsigned long flags;
         struct ir_input_dev *ir = input_get_drvdata(dev);
 
         u32 keycode = ir_g_keycode_from_table(dev, scancode);
 
-        /* If already sent a keydown, do a keyup */
-        if (ir->keypressed)
-                ir_keyup(dev);
+        spin_lock_irqsave(&ir->keylock, flags);
 
-        if (KEY_RESERVED == keycode)
-                return;
+        /* Repeat event? */
+        if (ir->keypressed &&
+            ir->last_scancode == scancode &&
+            ir->last_toggle == toggle)
+                goto set_timer;
 
-        ir->keycode = keycode;
-        ir->keypressed = 1;
+        /* Release old keypress */
+        ir_keyup(ir);
 
-        IR_dprintk(1, "%s: key down event, key 0x%04x, scancode 0x%04x\n",
-                dev->name, keycode, scancode);
+        ir->last_scancode = scancode;
+        ir->last_toggle = toggle;
+        ir->last_keycode = keycode;
+
+        if (keycode == KEY_RESERVED)
+                goto out;
 
-        input_report_key(dev, ir->keycode, 1);
+        /* Register a keypress */
+        ir->keypressed = true;
+        IR_dprintk(1, "%s: key down event, key 0x%04x, scancode 0x%04x\n",
+                   dev->name, keycode, scancode);
+        input_report_key(dev, ir->last_keycode, 1);
         input_sync(dev);
 
+set_timer:
+        ir->keyup_jiffies = jiffies + msecs_to_jiffies(IR_KEYPRESS_TIMEOUT);
+        mod_timer(&ir->timer_keyup, ir->keyup_jiffies);
+out:
+        spin_unlock_irqrestore(&ir->keylock, flags);
 }
 EXPORT_SYMBOL_GPL(ir_keydown);
 
@@ -365,8 +436,12 @@ int __ir_input_register(struct input_dev *input_dev,
         input_dev->getkeycode = ir_getkeycode;
         input_dev->setkeycode = ir_setkeycode;
         input_set_drvdata(input_dev, ir_dev);
+        ir_dev->input_dev = input_dev;
 
         spin_lock_init(&ir_dev->rc_tab.lock);
+        spin_lock_init(&ir_dev->keylock);
+        setup_timer(&ir_dev->timer_keyup, ir_timer_keyup, (unsigned long)ir_dev);
+
         ir_dev->rc_tab.name = rc_tab->name;
         ir_dev->rc_tab.ir_type = rc_tab->ir_type;
         ir_dev->rc_tab.alloc = roundup_pow_of_two(rc_tab->size *
@@ -383,6 +458,8 @@ int __ir_input_register(struct input_dev *input_dev,
                    ir_dev->rc_tab.size, ir_dev->rc_tab.alloc);
 
         set_bit(EV_KEY, input_dev->evbit);
+        set_bit(EV_REP, input_dev->evbit);
+
         if (ir_setkeytable(input_dev, &ir_dev->rc_tab, rc_tab)) {
                 rc = -ENOMEM;
                 goto out_table;
@@ -428,7 +505,7 @@ void ir_input_unregister(struct input_dev *dev)
                 return;
 
         IR_dprintk(1, "Freed keycode table\n");
-
+        del_timer_sync(&ir_dev->timer_keyup);
         rc_tab = &ir_dev->rc_tab;
         rc_tab->size = 0;
         kfree(rc_tab->scan);
diff --git a/drivers/media/IR/ir-nec-decoder.c b/drivers/media/IR/ir-nec-decoder.c
index 83a9912722f4..0b50060ffbaf 100644
--- a/drivers/media/IR/ir-nec-decoder.c
+++ b/drivers/media/IR/ir-nec-decoder.c
@@ -180,8 +180,7 @@ static int __ir_nec_decode(struct input_dev *input_dev,
         if (is_repeat(evs, len, *pos)) {
                 *pos += 2;
                 if (ir->keypressed) {
-                        mod_timer(&ir->raw->timer_keyup,
-                                jiffies + msecs_to_jiffies(REPEAT_TIME));
+                        ir_repeat(input_dev);
                         IR_dprintk(1, "NEC repeat event\n");
                         return 1;
                 } else {
@@ -238,9 +237,7 @@ static int __ir_nec_decode(struct input_dev *input_dev,
         }
 
         IR_dprintk(1, "NEC scancode 0x%04x\n", ircode);
-        ir_keydown(input_dev, ircode);
-        mod_timer(&ir->raw->timer_keyup,
-                  jiffies + msecs_to_jiffies(REPEAT_TIME));
+        ir_keydown(input_dev, ircode, 0);
 
         return 1;
 err:
diff --git a/drivers/media/IR/ir-raw-event.c b/drivers/media/IR/ir-raw-event.c
index 371d88e5a586..59f20541b03e 100644
--- a/drivers/media/IR/ir-raw-event.c
+++ b/drivers/media/IR/ir-raw-event.c
@@ -53,13 +53,6 @@ static spinlock_t ir_raw_handler_lock;
 /* Used to load the decoders */
 static struct work_struct wq_load;
 
-static void ir_keyup_timer(unsigned long data)
-{
-        struct input_dev *input_dev = (struct input_dev *)data;
-
-        ir_keyup(input_dev);
-}
-
 int ir_raw_event_register(struct input_dev *input_dev)
 {
         struct ir_input_dev *ir = input_get_drvdata(input_dev);
@@ -72,11 +65,6 @@ int ir_raw_event_register(struct input_dev *input_dev)
         size = sizeof(struct ir_raw_event) * MAX_IR_EVENT_SIZE * 2;
         size = roundup_pow_of_two(size);
 
-        init_timer(&ir->raw->timer_keyup);
-        ir->raw->timer_keyup.function = ir_keyup_timer;
-        ir->raw->timer_keyup.data = (unsigned long)input_dev;
-        set_bit(EV_REP, input_dev->evbit);
-
         rc = kfifo_alloc(&ir->raw->kfifo, size, GFP_KERNEL);
         if (rc < 0) {
                 kfree(ir->raw);
@@ -103,8 +91,6 @@ void ir_raw_event_unregister(struct input_dev *input_dev)
         if (!ir->raw)
                 return;
 
-        del_timer_sync(&ir->raw->timer_keyup);
-
         RUN_DECODER(raw_unregister, input_dev);
 
         kfifo_free(&ir->raw->kfifo);
diff --git a/include/media/ir-core.h b/include/media/ir-core.h
index 7a0be8d4999d..b452a478c12c 100644
--- a/include/media/ir-core.h
+++ b/include/media/ir-core.h
@@ -76,7 +76,6 @@ struct ir_raw_event {
 struct ir_raw_event_ctrl {
         struct kfifo                    kfifo;          /* fifo for the pulse/space events */
         struct timespec                 last_event;     /* when last event occurred */
-        struct timer_list               timer_keyup;    /* timer for key release */
 };
 
 struct ir_input_dev {
@@ -86,10 +85,16 @@ struct ir_input_dev {
         unsigned long                   devno;          /* device number */
         const struct ir_dev_props       *props;         /* Device properties */
         struct ir_raw_event_ctrl        *raw;           /* for raw pulse/space events */
+        struct input_dev                *input_dev;     /* the input device associated with this device */
 
         /* key info - needed by IR keycode handlers */
-        u32                             keycode;        /* linux key code */
-        int                             keypressed;     /* current state */
+        spinlock_t                      keylock;        /* protects the below members */
+        bool                            keypressed;     /* current state */
+        unsigned long                   keyup_jiffies;  /* when should the current keypress be released? */
+        struct timer_list               timer_keyup;    /* timer for releasing a keypress */
+        u32                             last_keycode;   /* keycode of last command */
+        u32                             last_scancode;  /* scancode of last command */
+        u8                              last_toggle;    /* toggle of last command */
 };
 
 struct ir_raw_handler {
@@ -115,8 +120,8 @@ void rc_map_init(void);
 
 u32 ir_g_keycode_from_table(struct input_dev *input_dev,
                             u32 scancode);
-void ir_keyup(struct input_dev *dev);
-void ir_keydown(struct input_dev *dev, int scancode);
+void ir_repeat(struct input_dev *dev);
+void ir_keydown(struct input_dev *dev, int scancode, u8 toggle);
 int __ir_input_register(struct input_dev *dev,
                       const struct ir_scancode_table *ir_codes,
                       const struct ir_dev_props *props,