media: rc: some events are dropped by userspace
Subsystems (7)
Sean Young
maintainerPATCH 1/4 media: rc: some events are dropped by userspace
libevdev (which is used by libinput) gets a list of keycodes from the input device on creation. Any events with keycodes which are not in this list are silently dropped. So, set all keycodes on device creation since we do not know which will be used if the keymap changes.
--- drivers/media/rc/rc-main.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/media/rc/rc-main.c +2 -11
@@ -289,20 +289,9 @@ static unsigned int ir_update_mapping(struct rc_dev *dev, old_keycode ==KEY_RESERVED ?"New" :"Replacing" , rc_map->scan[index].scancode, new_keycode); rc_map->scan[index].keycode = new_keycode; -__set_bit (new_keycode, dev->input_dev->keybit); }if (old_keycode !=KEY_RESERVED ) { -/* A previous mapping was updated... */ -__clear_bit (old_keycode, dev->input_dev->keybit); -/* ... but another scancode might use the same keycode */ -for (i =0 ; i < rc_map->len; i++) { -if (rc_map->scan[i].keycode == old_keycode) { -__set_bit (old_keycode, dev->input_dev->keybit); -break ; - } - } -/* Possibly shrink the keytable, failure is not a problem */ ir_resize_table (dev, rc_map,GFP_ATOMIC ); }
@@ -1759,6 +1748,8 @@ static int rc_prepare_rx_device(struct rc_dev *dev)set_bit (EV_REP , dev->input_dev->evbit);set_bit (EV_MSC , dev->input_dev->evbit);set_bit (MSC_SCAN , dev->input_dev->mscbit); +bitmap_fill (dev->input_dev->keybit,KEY_CNT ); +if (dev->open) dev->input_dev->open = ir_open;if (dev->close)
Signature · 1 line
2.17.1
Sean Young
maintainerPATCH 2/4 media: rc: imon: report mouse events using rc-core's input device
There is no need to create another input device.
--- drivers/media/rc/ir-imon-decoder.c | 62 ++---------------------------- drivers/media/rc/rc-core-priv.h | 2 - drivers/media/rc/rc-main.c | 6 +++ 3 files changed, 10 insertions(+), 60 deletions(-)
drivers/media/rc/ir-imon-decoder.c +4 -58
@@ -70,24 +70,13 @@ static void ir_imon_decode_scancode(struct rc_dev *dev) }if (!imon->stick_keyboard) { -struct lirc_scancode lsc = { - .scancode = imon->bits, - .rc_proto =RC_PROTO_IMON , - }; +input_report_rel (dev->input_dev,REL_X , rel_x); +input_report_rel (dev->input_dev,REL_Y , rel_y); -ir_lirc_scancode_event (dev, &lsc); - -input_event (imon->idev,EV_MSC ,MSC_SCAN , imon->bits); - -input_report_rel (imon->idev,REL_X , rel_x); -input_report_rel (imon->idev,REL_Y , rel_y); - -input_report_key (imon->idev,BTN_LEFT , +input_report_key (dev->input_dev,BTN_LEFT , (imon->bits &0x00010000 ) !=0 ); -input_report_key (imon->idev,BTN_RIGHT , +input_report_key (dev->input_dev,BTN_RIGHT , (imon->bits &0x00040000 ) !=0 ); -input_sync (imon->idev); -return ; } }
@@ -243,62 +232,19 @@ static int ir_imon_encode(enum rc_proto protocol, u32 scancode,static int ir_imon_register (struct rc_dev *dev) { -struct input_dev *idev;struct imon_dec *imon = &dev->raw->imon; -int ret; - - idev =input_allocate_device (); -if (!idev) -return -ENOMEM ; - -snprintf (imon->name,sizeof (imon->name), -"iMON PAD Stick (%s)" , dev->device_name); - idev->name = imon->name; - idev->phys = dev->input_phys; - -/* Mouse bits */ -set_bit (EV_REL , idev->evbit); -set_bit (EV_KEY , idev->evbit); -set_bit (REL_X , idev->relbit); -set_bit (REL_Y , idev->relbit); -set_bit (BTN_LEFT , idev->keybit); -set_bit (BTN_RIGHT , idev->keybit); - -/* Report scancodes too */ -set_bit (EV_MSC , idev->evbit); -set_bit (MSC_SCAN , idev->mscbit); - -input_set_drvdata (idev, imon); - - ret =input_register_device (idev); -if (ret <0 ) { -input_free_device (idev); -return -EIO ; - } - imon->idev = idev; imon->stick_keyboard = false;return 0 ; } -static int ir_imon_unregister (struct rc_dev *dev) -{ -struct imon_dec *imon = &dev->raw->imon; - -input_unregister_device (imon->idev); - imon->idev =NULL ; - -return 0 ; -} -static struct ir_raw_handler imon_handler = { .protocols =RC_PROTO_BIT_IMON , .decode = ir_imon_decode, .encode = ir_imon_encode, .carrier =38000 , .raw_register = ir_imon_register, - .raw_unregister = ir_imon_unregister, .min_timeout =IMON_UNIT *IMON_BITS *2 , };
drivers/media/rc/rc-core-priv.h +0 -2
@@ -133,8 +133,6 @@ struct ir_raw_event_ctrl {int last_chk;unsigned int bits;bool stick_keyboard; -struct input_dev *idev; -char name[64 ]; } imon; };
drivers/media/rc/rc-main.c +6 -0
@@ -1744,12 +1744,18 @@ static int rc_prepare_rx_device(struct rc_dev *dev) dev->enabled_protocols = rc_proto; } +/* Keyboard events */ set_bit (EV_KEY , dev->input_dev->evbit);set_bit (EV_REP , dev->input_dev->evbit);set_bit (EV_MSC , dev->input_dev->evbit);set_bit (MSC_SCAN , dev->input_dev->mscbit);bitmap_fill (dev->input_dev->keybit,KEY_CNT ); +/* Pointer/mouse events */ +set_bit (EV_REL , dev->input_dev->evbit); +set_bit (REL_X , dev->input_dev->relbit); +set_bit (REL_Y , dev->input_dev->relbit); +if (dev->open) dev->input_dev->open = ir_open;if (dev->close)
Signature · 1 line
2.17.1
Sean Young
maintainerPATCH 3/4 media: rc: mce_kbd: input events via rc-core's input device
In reply to Sean YoungThere is no need to create another input device.
--- drivers/media/rc/ir-mce_kbd-decoder.c | 77 +++++---------------------- drivers/media/rc/rc-core-priv.h | 3 -- 2 files changed, 14 insertions(+), 66 deletions(-)
drivers/media/rc/ir-mce_kbd-decoder.c +14 -63
@@ -129,13 +129,14 @@ static void mce_kbd_rx_timeout(struct timer_list *t)if (time_is_before_eq_jiffies (raw->mce_kbd.rx_timeout.expires)) {for (i =0 ; i <7 ; i++) { maskcode = kbd_keycodes[MCIR2_MASK_KEYS_START + i]; -input_report_key (raw->mce_kbd.idev, maskcode,0 ); +input_report_key (raw->dev->input_dev, maskcode,0 ); }for (i =0 ; i <MCIR2_MASK_KEYS_START ; i++) -input_report_key (raw->mce_kbd.idev, kbd_keycodes[i],0 ); +input_report_key (raw->dev->input_dev, kbd_keycodes[i], +0 ); -input_sync (raw->mce_kbd.idev); +input_sync (raw->dev->input_dev); }spin_unlock_irqrestore (&raw->mce_kbd.keylock, flags); }
@@ -154,7 +155,6 @@ static enum mce_kbd_mode mce_kbd_mode(struct mce_kbd_dec *data)static void ir_mce_kbd_process_keyboard_data (struct rc_dev *dev,u32 scancode) { -struct mce_kbd_dec *data = &dev->raw->mce_kbd;u8 keydata1 = (scancode >>8 ) &0xff ;u8 keydata2 = (scancode >>16 ) &0xff ;u8 shiftmask = scancode &0xff ;
@@ -170,23 +170,22 @@ static void ir_mce_kbd_process_keyboard_data(struct rc_dev *dev, u32 scancode) keystate =1 ; else keystate =0 ; -input_report_key (data->idev, maskcode, keystate); +input_report_key (dev->input_dev, maskcode, keystate); }if (keydata1) -input_report_key (data->idev, kbd_keycodes[keydata1],1 ); +input_report_key (dev->input_dev, kbd_keycodes[keydata1],1 );if (keydata2) -input_report_key (data->idev, kbd_keycodes[keydata2],1 ); +input_report_key (dev->input_dev, kbd_keycodes[keydata2],1 );if (!keydata1 && !keydata2) {for (i =0 ; i <MCIR2_MASK_KEYS_START ; i++) -input_report_key (data->idev, kbd_keycodes[i],0 ); +input_report_key (dev->input_dev, kbd_keycodes[i],0 ); } }static void ir_mce_kbd_process_mouse_data (struct rc_dev *dev,u32 scancode) { -struct mce_kbd_dec *data = &dev->raw->mce_kbd;/* raw mouse coordinates */ u8 xdata = (scancode >>7 ) &0x7f ;u8 ydata = (scancode >>14 ) &0x7f ;
@@ -208,11 +207,11 @@ static void ir_mce_kbd_process_mouse_data(struct rc_dev *dev, u32 scancode)dev_dbg (&dev->dev,"mouse: x = %d, y = %d, btns = %s%s\n" , x, y, left ?"L" :"" , right ?"R" :"" ); -input_report_rel (data->idev,REL_X , x); -input_report_rel (data->idev,REL_Y , y); +input_report_rel (dev->input_dev,REL_X , x); +input_report_rel (dev->input_dev,REL_Y , y); -input_report_key (data->idev,BTN_LEFT , left); -input_report_key (data->idev,BTN_RIGHT , right); +input_report_key (dev->input_dev,BTN_LEFT , left); +input_report_key (dev->input_dev,BTN_RIGHT , right); }/**
@@ -355,8 +354,8 @@ static int ir_mce_kbd_decode(struct rc_dev *dev, struct ir_raw_event ev) lsc.scancode = scancode;ir_lirc_scancode_event (dev, &lsc); data->state =STATE_INACTIVE ; -input_event (data->idev,EV_MSC ,MSC_SCAN , scancode); -input_sync (data->idev); +input_event (dev->input_dev,EV_MSC ,MSC_SCAN , scancode); +input_sync (dev->input_dev);return 0 ; }
@@ -370,66 +369,18 @@ static int ir_mce_kbd_decode(struct rc_dev *dev, struct ir_raw_event ev)static int ir_mce_kbd_register (struct rc_dev *dev) {struct mce_kbd_dec *mce_kbd = &dev->raw->mce_kbd; -struct input_dev *idev; -int i, ret; - - idev =input_allocate_device (); -if (!idev) -return -ENOMEM ; - -snprintf (mce_kbd->name,sizeof (mce_kbd->name), -"MCE IR Keyboard/Mouse (%s)" , dev->driver_name); -strlcat (mce_kbd->phys,"/input0" ,sizeof (mce_kbd->phys)); - - idev->name = mce_kbd->name; - idev->phys = mce_kbd->phys; - -/* Keyboard bits */ -set_bit (EV_KEY , idev->evbit); -set_bit (EV_REP , idev->evbit); -for (i =0 ; i <sizeof (kbd_keycodes); i++) -set_bit (kbd_keycodes[i], idev->keybit); - -/* Mouse bits */ -set_bit (EV_REL , idev->evbit); -set_bit (REL_X , idev->relbit); -set_bit (REL_Y , idev->relbit); -set_bit (BTN_LEFT , idev->keybit); -set_bit (BTN_RIGHT , idev->keybit); - -/* Report scancodes too */ -set_bit (EV_MSC , idev->evbit); -set_bit (MSC_SCAN , idev->mscbit);timer_setup (&mce_kbd->rx_timeout, mce_kbd_rx_timeout,0 );spin_lock_init (&mce_kbd->keylock); -input_set_drvdata (idev, mce_kbd); - -#if 0 -/* Adding this reference means two input devices are associated with -* this rc-core device, which ir-keytable doesn't cope with yet */ - idev->dev.parent = &dev->dev; -#endif - - ret =input_register_device (idev); -if (ret <0 ) { -input_free_device (idev); -return -EIO ; - } - - mce_kbd->idev = idev; -return 0 ; }static int ir_mce_kbd_unregister (struct rc_dev *dev) {struct mce_kbd_dec *mce_kbd = &dev->raw->mce_kbd; -struct input_dev *idev = mce_kbd->idev;del_timer_sync (&mce_kbd->rx_timeout); -input_unregister_device (idev);return 0 ; }
drivers/media/rc/rc-core-priv.h +0 -3
@@ -110,12 +110,9 @@ struct ir_raw_event_ctrl {unsigned int pulse_len; } sharp;struct mce_kbd_dec { -struct input_dev *idev;/* locks key up timer */ spinlock_t keylock;struct timer_list rx_timeout; -char name[64 ]; -char phys[64 ];int state;u8 header;u32 body;
Signature · 1 line
2.17.1
Sean Young
maintainerPATCH 4/4 media: bpf: add bpf function to report mouse movement
In reply to Sean YoungSome IR remotes have a directional pad or other pointer-like thing that can be used as a mouse. Make it possible to decode these types of IR protocols in BPF.
--- drivers/media/rc/bpf-lirc.c | 24 +++++++++++++++++++++++ include/uapi/linux/bpf.h | 17 +++++++++++++++- tools/testing/selftests/bpf/bpf_helpers.h | 2 ++ 3 files changed, 42 insertions(+), 1 deletion(-)
drivers/media/rc/bpf-lirc.c +24 -0
@@ -59,6 +59,28 @@ static const struct bpf_func_proto rc_keydown_proto = { .arg4_type = ARG_ANYTHING, }; +BPF_CALL_3(bpf_rc_pointer_rel, u32*, sample, s32, rel_x, s32, rel_y) +{ +struct ir_raw_event_ctrl *ctrl; + + ctrl = container_of(sample, struct ir_raw_event_ctrl, bpf_sample); + +input_report_rel (ctrl->dev->input_dev,REL_X , rel_x); +input_report_rel (ctrl->dev->input_dev,REL_Y , rel_y); +input_sync (ctrl->dev->input_dev); + +return 0 ; +} + +static const struct bpf_func_proto rc_pointer_rel_proto = { + .func = bpf_rc_pointer_rel, + .gpl_only = true, + .ret_type =RET_INTEGER , + .arg1_type =ARG_PTR_TO_CTX , + .arg2_type =ARG_ANYTHING , + .arg3_type =ARG_ANYTHING , +}; +static const struct bpf_func_proto *lirc_mode2_func_proto (enum bpf_func_id func_id,const struct bpf_prog *prog) {
@@ -67,6 +89,8 @@ lirc_mode2_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)return &rc_repeat_proto;case BPF_FUNC_rc_keydown:return &rc_keydown_proto; +case BPF_FUNC_rc_pointer_rel: +return &rc_pointer_rel_proto;case BPF_FUNC_map_lookup_elem:return &bpf_map_lookup_elem_proto;case BPF_FUNC_map_update_elem:
include/uapi/linux/bpf.h +16 -1
@@ -2141,6 +2141,20 @@ union bpf_attr {* request in the skb. * Return * 0 on success, or a negative error in case of failure. +* +* int bpf_rc_pointer_rel(void *ctx, s32 rel_x, s32 rel_y) +* Description +* This helper is used in programs implementing IR decoding, to +* report a successfully decoded pointer movement. +* +* The *ctx* should point to the lirc sample as passed into +* the program. +* +* This helper is only available is the kernel was compiled with +* the **CONFIG_BPF_LIRC_MODE2** configuration option set to +* "**y**". +* Return +* 0 */ #define __BPF_FUNC_MAPPER (FN ) \ FN(unspec), \
@@ -2226,7 +2240,8 @@ union bpf_attr {FN (get_current_cgroup_id), \FN (get_local_storage), \FN (sk_select_reuseport), \ -FN (skb_ancestor_cgroup_id), +FN (skb_ancestor_cgroup_id), \ +FN (rc_pointer_rel),/* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call
tools/testing/selftests/bpf/bpf_helpers.h +2 -0
@@ -143,6 +143,8 @@ static unsigned long long (*bpf_skb_cgroup_id)(void *ctx) = (void *) BPF_FUNC_skb_cgroup_id;static unsigned long long (*bpf_skb_ancestor_cgroup_id)(void *ctx,int level) = (void *) BPF_FUNC_skb_ancestor_cgroup_id; +static int (*bpf_rc_pointer_rel)(void *ctx,int rel_x,int rel_y) = + (void *) BPF_FUNC_rc_pointer_rel;/* llvm builtin functions that eBPF C program may use to * emit BPF_LD_ABS and BPF_LD_IND instructions
Signature · 1 line
2.17.1