History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Dmitry writes: "Input updates for v4.19-rc7 - we added a few scheduling points into various input interfaces to ensure that large writes will not cause RCU stalls - fixed configuring PS/2 keyboards as wakeup devices on newer platforms - added a new Xbox gamepad ID." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: uinput - add a schedule point in uinput_inject_events() Input: evdev - add a schedule point in evdev_write() Input: mousedev - add a schedule point in mousedev_write() Input: i8042 - enable keyboard wakeups by default when s2idle is used Input: xpad - add support for Xbox1 PDP Camo series gamepad

Greg Kroah-Hartman committed 8 years ago

Commit eb81bfb2 parents 0c53b6a cecf1077 files · +34 −9Browse files

Unified · Split

7 files
  1. drivers/input/evdev.c +1 −0
  2. drivers/input/joystick/xpad.c +3 −0
  3. drivers/input/misc/uinput.c +1 −0
  4. drivers/input/mousedev.c +1 −0
  5. drivers/input/serio/i8042.c +20 −9
  6. include/linux/suspend.h +2 −0
  7. kernel/power/suspend.c +6 −0
drivers/input/evdev.c+1−0
@@ -564,6 +564,7 @@ static ssize_t evdev_write(struct file *file, const char __user *buffer, · 563 unmodified lines
564 564
565 input_inject_event(&evdev->handle,565 input_inject_event(&evdev->handle,
566 event.type, event.code, event.value);566 event.type, event.code, event.value);
567 cond_resched();
567 }568 }
568 569
569 out:570 out:
drivers/input/joystick/xpad.c+3−0
@@ -231,6 +231,7 @@ static const struct xpad_device { · 230 unmodified lines
231 { 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015", 0, XTYPE_XBOXONE },231 { 0x0e6f, 0x0246, "Rock Candy Gamepad for Xbox One 2015", 0, XTYPE_XBOXONE },
232 { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE },232 { 0x0e6f, 0x02ab, "PDP Controller for Xbox One", 0, XTYPE_XBOXONE },
233 { 0x0e6f, 0x02a4, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE },233 { 0x0e6f, 0x02a4, "PDP Wired Controller for Xbox One - Stealth Series", 0, XTYPE_XBOXONE },
234 { 0x0e6f, 0x02a6, "PDP Wired Controller for Xbox One - Camo Series", 0, XTYPE_XBOXONE },
234 { 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 },235 { 0x0e6f, 0x0301, "Logic3 Controller", 0, XTYPE_XBOX360 },
235 { 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE },236 { 0x0e6f, 0x0346, "Rock Candy Gamepad for Xbox One 2016", 0, XTYPE_XBOXONE },
236 { 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 },237 { 0x0e6f, 0x0401, "Logic3 Controller", 0, XTYPE_XBOX360 },
@@ -530,6 +531,8 @@ static const struct xboxone_init_packet xboxone_init_packets[] = { · 293 unmodified lines
530 XBOXONE_INIT_PKT(0x0e6f, 0x02ab, xboxone_pdp_init2),531 XBOXONE_INIT_PKT(0x0e6f, 0x02ab, xboxone_pdp_init2),
531 XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init1),532 XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init1),
532 XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init2),533 XBOXONE_INIT_PKT(0x0e6f, 0x02a4, xboxone_pdp_init2),
534 XBOXONE_INIT_PKT(0x0e6f, 0x02a6, xboxone_pdp_init1),
535 XBOXONE_INIT_PKT(0x0e6f, 0x02a6, xboxone_pdp_init2),
533 XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init),536 XBOXONE_INIT_PKT(0x24c6, 0x541a, xboxone_rumblebegin_init),
534 XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumblebegin_init),537 XBOXONE_INIT_PKT(0x24c6, 0x542a, xboxone_rumblebegin_init),
535 XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init),538 XBOXONE_INIT_PKT(0x24c6, 0x543a, xboxone_rumblebegin_init),
drivers/input/misc/uinput.c+1−0
@@ -598,6 +598,7 @@ static ssize_t uinput_inject_events(struct uinput_device *udev, · 597 unmodified lines
598 598
599 input_event(udev->dev, ev.type, ev.code, ev.value);599 input_event(udev->dev, ev.type, ev.code, ev.value);
600 bytes += input_event_size();600 bytes += input_event_size();
601 cond_resched();
601 }602 }
602 603
603 return bytes;604 return bytes;
drivers/input/mousedev.c+1−0
@@ -707,6 +707,7 @@ static ssize_t mousedev_write(struct file *file, const char __user *buffer, · 706 unmodified lines
707 mousedev_generate_response(client, c);707 mousedev_generate_response(client, c);
708 708
709 spin_unlock_irq(&client->packet_lock);709 spin_unlock_irq(&client->packet_lock);
710 cond_resched();
710 }711 }
711 712
712 kill_fasync(&client->fasync, SIGIO, POLL_IN);713 kill_fasync(&client->fasync, SIGIO, POLL_IN);
drivers/input/serio/i8042.c+20−9
@@ -1395,15 +1395,26 @@ static void __init i8042_register_ports(void) · 1394 unmodified lines
1395 for (i = 0; i < I8042_NUM_PORTS; i++) {1395 for (i = 0; i < I8042_NUM_PORTS; i++) {
1396 struct serio *serio = i8042_ports[i].serio;1396 struct serio *serio = i8042_ports[i].serio;
1397 1397
1398 if (serio) {1398 if (!serio)
1399 printk(KERN_INFO "serio: %s at %#lx,%#lx irq %d\n",1399 continue;
1400 serio->name,1400
1401 (unsigned long) I8042_DATA_REG,1401 printk(KERN_INFO "serio: %s at %#lx,%#lx irq %d\n",
1402 (unsigned long) I8042_COMMAND_REG,1402 serio->name,
1403 i8042_ports[i].irq);1403 (unsigned long) I8042_DATA_REG,
1404 serio_register_port(serio);1404 (unsigned long) I8042_COMMAND_REG,
1405 device_set_wakeup_capable(&serio->dev, true);1405 i8042_ports[i].irq);
1406 }1406 serio_register_port(serio);
1407 device_set_wakeup_capable(&serio->dev, true);
1408
1409 /*
1410 * On platforms using suspend-to-idle, allow the keyboard to
1411 * wake up the system from sleep by enabling keyboard wakeups
1412 * by default. This is consistent with keyboard wakeup
1413 * behavior on many platforms using suspend-to-RAM (ACPI S3)
1414 * by default.
1415 */
1416 if (pm_suspend_via_s2idle() && i == I8042_KBD_PORT_NO)
1417 device_set_wakeup_enable(&serio->dev, true);
1407 }1418 }
1408}1419}
1409 1420
include/linux/suspend.h+2−0
@@ -251,6 +251,7 @@ static inline bool idle_should_enter_s2idle(void) · 250 unmodified lines
251 return unlikely(s2idle_state == S2IDLE_STATE_ENTER);251 return unlikely(s2idle_state == S2IDLE_STATE_ENTER);
252}252}
253 253
254extern bool pm_suspend_via_s2idle(void);
254extern void __init pm_states_init(void);255extern void __init pm_states_init(void);
255extern void s2idle_set_ops(const struct platform_s2idle_ops *ops);256extern void s2idle_set_ops(const struct platform_s2idle_ops *ops);
256extern void s2idle_wake(void);257extern void s2idle_wake(void);
@@ -282,6 +283,7 @@ static inline void pm_set_suspend_via_firmware(void) {} · 25 unmodified lines
282static inline void pm_set_resume_via_firmware(void) {}283static inline void pm_set_resume_via_firmware(void) {}
283static inline bool pm_suspend_via_firmware(void) { return false; }284static inline bool pm_suspend_via_firmware(void) { return false; }
284static inline bool pm_resume_via_firmware(void) { return false; }285static inline bool pm_resume_via_firmware(void) { return false; }
286static inline bool pm_suspend_via_s2idle(void) { return false; }
285 287
286static inline void suspend_set_ops(const struct platform_suspend_ops *ops) {}288static inline void suspend_set_ops(const struct platform_suspend_ops *ops) {}
287static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }289static inline int pm_suspend(suspend_state_t state) { return -ENOSYS; }
kernel/power/suspend.c+6−0
@@ -63,6 +63,12 @@ static DECLARE_SWAIT_QUEUE_HEAD(s2idle_wait_head); · 62 unmodified lines
63enum s2idle_states __read_mostly s2idle_state;63enum s2idle_states __read_mostly s2idle_state;
64static DEFINE_RAW_SPINLOCK(s2idle_lock);64static DEFINE_RAW_SPINLOCK(s2idle_lock);
65 65
66bool pm_suspend_via_s2idle(void)
67{
68 return mem_sleep_current == PM_SUSPEND_TO_IDLE;
69}
70EXPORT_SYMBOL_GPL(pm_suspend_via_s2idle);
71
66void s2idle_set_ops(const struct platform_s2idle_ops *ops)72void s2idle_set_ops(const struct platform_s2idle_ops *ops)
67{73{
68 lock_system_sleep();74 lock_system_sleep();

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t