Commit 727fb837 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'input-for-v6.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

Pull input fixes from Dmitry Torokhov:

 - a reworked way for handling reset delay on SMBus-connected Synaptics
   touchpads (the original one, while being correct, uncovered an old
   bug in fallback to PS/2 code that was fixed separately; the new one
   however avoids having delay in serio port "fast" resume, and instead
   has the wait in the RMI4 code)

 - a fix for potential crashes when devices with Elan controllers (and
   Synaptics) fall back to PS/2 code. Can't be hit without the original
   patch above, but still good to have it fixed

 - a couple new device IDs in xpad Xbox driver

 - another quirk for Goodix driver to deal with stuff vendors put in
   ACPI tables

 - a fix for use-after-free on disconnect for powermate driver

 - a quirk to not initialize PS/2 mouse port on Fujitsu Lifebook E5411
   laptop as it makes keyboard not usable and the device uses
   hid-over-i2c touchpad anyways

* tag 'input-for-v6.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: powermate - fix use-after-free in powermate_config_complete
  Input: xpad - add PXN V900 support
  Input: synaptics-rmi4 - handle reset delay when using SMBus trsnsport
  Input: psmouse - fix fast_reconnect function for PS/2 mode
  Revert "Input: psmouse - add delay when deactivating for SMBus mode"
  Input: goodix - ensure int GPIO is in input for gpio_count == 1 && gpio_int_idx == 0 case
  Input: i8042 - add Fujitsu Lifebook E5411 to i8042 quirk table
  Input: xpad - add HyperX Clutch Gladiate Support
parents 8cb1f10d 5c15c60e

drivers/input/joystick/xpad.c

+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ static const struct xpad_device { 
	{ 0x0079, 0x18d4, "GPD Win 2 X-Box Controller", 0, XTYPE_XBOX360 },

	{ 0x03eb, 0xff01, "Wooting One (Legacy)", 0, XTYPE_XBOX360 },

	{ 0x03eb, 0xff02, "Wooting Two (Legacy)", 0, XTYPE_XBOX360 },

	{ 0x03f0, 0x0495, "HyperX Clutch Gladiate", 0, XTYPE_XBOXONE },

	{ 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX },

	{ 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX },

	{ 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX },
@@ -272,6 +273,7 @@ static const struct xpad_device { 
	{ 0x1038, 0x1430, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 },

	{ 0x1038, 0x1431, "SteelSeries Stratus Duo", 0, XTYPE_XBOX360 },

	{ 0x11c9, 0x55f0, "Nacon GC-100XF", 0, XTYPE_XBOX360 },

	{ 0x11ff, 0x0511, "PXN V900", 0, XTYPE_XBOX360 },

	{ 0x1209, 0x2882, "Ardwiino Controller", 0, XTYPE_XBOX360 },

	{ 0x12ab, 0x0004, "Honey Bee Xbox360 dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },

	{ 0x12ab, 0x0301, "PDP AFTERGLOW AX.1", 0, XTYPE_XBOX360 },
@@ -459,6 +461,7 @@ static const struct usb_device_id xpad_table[] = { 
	{ USB_INTERFACE_INFO('X', 'B', 0) },	/* Xbox USB-IF not-approved class */

	XPAD_XBOX360_VENDOR(0x0079),		/* GPD Win 2 controller */

	XPAD_XBOX360_VENDOR(0x03eb),		/* Wooting Keyboards (Legacy) */

	XPAD_XBOXONE_VENDOR(0x03f0),		/* HP HyperX Xbox One controllers */

	XPAD_XBOX360_VENDOR(0x044f),		/* Thrustmaster Xbox 360 controllers */

	XPAD_XBOX360_VENDOR(0x045e),		/* Microsoft Xbox 360 controllers */

	XPAD_XBOXONE_VENDOR(0x045e),		/* Microsoft Xbox One controllers */
@@ -477,6 +480,7 @@ static const struct usb_device_id xpad_table[] = { 
	XPAD_XBOX360_VENDOR(0x1038),		/* SteelSeries controllers */

	XPAD_XBOXONE_VENDOR(0x10f5),		/* Turtle Beach Controllers */

	XPAD_XBOX360_VENDOR(0x11c9),		/* Nacon GC100XF */

	XPAD_XBOX360_VENDOR(0x11ff),		/* PXN V900 */

	XPAD_XBOX360_VENDOR(0x1209),		/* Ardwiino Controllers */

	XPAD_XBOX360_VENDOR(0x12ab),		/* Xbox 360 dance pads */

	XPAD_XBOX360_VENDOR(0x1430),		/* RedOctane Xbox 360 controllers */

drivers/input/misc/powermate.c

+1 −0
Original line number Diff line number Diff line
@@ -425,6 +425,7 @@ static void powermate_disconnect(struct usb_interface *intf) 
		pm->requires_update = 0;

		usb_kill_urb(pm->irq);

		input_unregister_device(pm->input);

		usb_kill_urb(pm->config);

		usb_free_urb(pm->irq);

		usb_free_urb(pm->config);

		powermate_free_buffers(interface_to_usbdev(intf), pm);

drivers/input/mouse/elantech.c

+1 −0
Original line number Diff line number Diff line
@@ -2114,6 +2114,7 @@ static int elantech_setup_ps2(struct psmouse *psmouse, 
	psmouse->protocol_handler = elantech_process_byte;

	psmouse->disconnect = elantech_disconnect;

	psmouse->reconnect = elantech_reconnect;

	psmouse->fast_reconnect = NULL;

	psmouse->pktsize = info->hw_version > 1 ? 6 : 4;



	return 0;

drivers/input/mouse/psmouse-smbus.c

+7 −12
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


#define pr_fmt(fmt)		KBUILD_MODNAME ": " fmt



#include <linux/delay.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/libps2.h>
@@ -119,18 +118,13 @@ static psmouse_ret_t psmouse_smbus_process_byte(struct psmouse *psmouse) 
	return PSMOUSE_FULL_PACKET;

}



static void psmouse_activate_smbus_mode(struct psmouse_smbus_dev *smbdev)

{

	if (smbdev->need_deactivate) {

		psmouse_deactivate(smbdev->psmouse);

		/* Give the device time to switch into SMBus mode */

		msleep(30);

	}

}



static int psmouse_smbus_reconnect(struct psmouse *psmouse)

{

	psmouse_activate_smbus_mode(psmouse->private);

	struct psmouse_smbus_dev *smbdev = psmouse->private;



	if (smbdev->need_deactivate)

		psmouse_deactivate(psmouse);



	return 0;

}
@@ -263,7 +257,8 @@ int psmouse_smbus_init(struct psmouse *psmouse, 
		}

	}



	psmouse_activate_smbus_mode(smbdev);

	if (need_deactivate)

		psmouse_deactivate(psmouse);



	psmouse->private = smbdev;

	psmouse->protocol_handler = psmouse_smbus_process_byte;

drivers/input/mouse/synaptics.c

+2 −0
Original line number Diff line number Diff line
@@ -1623,6 +1623,7 @@ static int synaptics_init_ps2(struct psmouse *psmouse, 
	psmouse->set_rate = synaptics_set_rate;

	psmouse->disconnect = synaptics_disconnect;

	psmouse->reconnect = synaptics_reconnect;

	psmouse->fast_reconnect = NULL;

	psmouse->cleanup = synaptics_reset;

	/* Synaptics can usually stay in sync without extra help */

	psmouse->resync_time = 0;
@@ -1752,6 +1753,7 @@ static int synaptics_create_intertouch(struct psmouse *psmouse, 
		psmouse_matches_pnp_id(psmouse, topbuttonpad_pnp_ids) &&

		!SYN_CAP_EXT_BUTTONS_STICK(info->ext_cap_10);

	const struct rmi_device_platform_data pdata = {

		.reset_delay_ms = 30,

		.sensor_pdata = {

			.sensor_type = rmi_sensor_touchpad,

			.axis_align.flip_y = true,