Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15abf142 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull input updates from Dmitry Torokhov:

 - newer systems with Elan touchpads will be switched over to SMBus

 - HP Spectre X360 will be using SMbus/RMI4

 - checks for invalid USB descriptors in kbtab and iforce

 - build fixes for applespi driver (misconfigs)

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: iforce - add sanity checks
  Input: applespi - use struct_size() helper
  Input: kbtab - sanity check for endpoint type
  Input: usbtouchscreen - initialize PM mutex before using it
  Input: applespi - add dependency on LEDS_CLASS
  Input: synaptics - enable RMI mode for HP Spectre X360
  Input: elantech - annotate fall-through case in elantech_use_host_notify()
  Input: elantech - enable SMBus on new (2018+) systems
  Input: applespi - fix trivial typo in struct description
  Input: applespi - select CRC16 module
  Input: applespi - fix warnings detected by sparse
parents 2226fb57 849f5ae3

drivers/input/joystick/iforce/iforce-usb.c

+5 −0
Original line number Diff line number Diff line
@@ -201,7 +201,12 @@ static int iforce_usb_probe(struct usb_interface *intf, 
		return -ENODEV;



	epirq = &interface->endpoint[0].desc;

	if (!usb_endpoint_is_int_in(epirq))

		return -ENODEV;



	epout = &interface->endpoint[1].desc;

	if (!usb_endpoint_is_int_out(epout))

		return -ENODEV;



	iforce_usb = kzalloc(sizeof(*iforce_usb), GFP_KERNEL);

	if (!iforce_usb)

drivers/input/keyboard/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ config KEYBOARD_APPLESPI 
	depends on ACPI && EFI

	depends on SPI

	depends on X86 || COMPILE_TEST

	depends on LEDS_CLASS

	select CRC16

	help

	  Say Y here if you are running Linux on any Apple MacBook8,1 or later,

	  or any MacBookPro13,* or MacBookPro14,*.

drivers/input/keyboard/applespi.c

+16 −13
Original line number Diff line number Diff line
@@ -134,10 +134,10 @@ struct keyboard_protocol { 
 * struct tp_finger - single trackpad finger structure, le16-aligned

 *

 * @origin:		zero when switching track finger

 * @abs_x:		absolute x coodinate

 * @abs_y:		absolute y coodinate

 * @rel_x:		relative x coodinate

 * @rel_y:		relative y coodinate

 * @abs_x:		absolute x coordinate

 * @abs_y:		absolute y coordinate

 * @rel_x:		relative x coordinate

 * @rel_y:		relative y coordinate

 * @tool_major:		tool area, major axis

 * @tool_minor:		tool area, minor axis

 * @orientation:	16384 when point, else 15 bit angle
@@ -944,10 +944,14 @@ static inline int le16_to_int(__le16 x) 
static void applespi_debug_update_dimensions(struct applespi_data *applespi,

					     const struct tp_finger *f)

{

	applespi->tp_dim_min_x = min_t(int, applespi->tp_dim_min_x, f->abs_x);

	applespi->tp_dim_max_x = max_t(int, applespi->tp_dim_max_x, f->abs_x);

	applespi->tp_dim_min_y = min_t(int, applespi->tp_dim_min_y, f->abs_y);

	applespi->tp_dim_max_y = max_t(int, applespi->tp_dim_max_y, f->abs_y);

	applespi->tp_dim_min_x = min(applespi->tp_dim_min_x,

				     le16_to_int(f->abs_x));

	applespi->tp_dim_max_x = max(applespi->tp_dim_max_x,

				     le16_to_int(f->abs_x));

	applespi->tp_dim_min_y = min(applespi->tp_dim_min_y,

				     le16_to_int(f->abs_y));

	applespi->tp_dim_max_y = max(applespi->tp_dim_max_y,

				     le16_to_int(f->abs_y));

}



static int applespi_tp_dim_open(struct inode *inode, struct file *file)
@@ -1490,8 +1494,7 @@ static void applespi_got_data(struct applespi_data *applespi) 
		size_t tp_len;



		tp = &message->touchpad;

		tp_len = sizeof(*tp) +

			 tp->number_of_fingers * sizeof(tp->fingers[0]);

		tp_len = struct_size(tp, fingers, tp->number_of_fingers);



		if (le16_to_cpu(message->length) + 2 != tp_len) {

			dev_warn_ratelimited(&applespi->spi->dev,
@@ -1611,8 +1614,8 @@ static void applespi_save_bl_level(struct applespi_data *applespi, 
	efi_attr = EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS |

		   EFI_VARIABLE_RUNTIME_ACCESS;



	sts = efivar_entry_set_safe(EFI_BL_LEVEL_NAME, efi_guid, efi_attr, true,

				    efi_data_len, &efi_data);

	sts = efivar_entry_set_safe((efi_char16_t *)EFI_BL_LEVEL_NAME, efi_guid,

				    efi_attr, true, efi_data_len, &efi_data);

	if (sts)

		dev_warn(&applespi->spi->dev,

			 "Error saving backlight level to EFI vars: %d\n", sts);
@@ -1953,7 +1956,7 @@ static const struct acpi_device_id applespi_acpi_match[] = { 
};

MODULE_DEVICE_TABLE(acpi, applespi_acpi_match);



const struct dev_pm_ops applespi_pm_ops = {

static const struct dev_pm_ops applespi_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(applespi_suspend, applespi_resume)

	.poweroff_late	= applespi_poweroff_late,

};

drivers/input/mouse/elantech.c

+26 −29
Original line number Diff line number Diff line
@@ -1827,6 +1827,31 @@ static int elantech_create_smbus(struct psmouse *psmouse, 
				  leave_breadcrumbs);

}



static bool elantech_use_host_notify(struct psmouse *psmouse,

				     struct elantech_device_info *info)

{

	if (ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version))

		return true;



	switch (info->bus) {

	case ETP_BUS_PS2_ONLY:

		/* expected case */

		break;

	case ETP_BUS_SMB_HST_NTFY_ONLY:

	case ETP_BUS_PS2_SMB_HST_NTFY:

		/* SMbus implementation is stable since 2018 */

		if (dmi_get_bios_year() >= 2018)

			return true;

		/* fall through */

	default:

		psmouse_dbg(psmouse,

			    "Ignoring SMBus bus provider %d\n", info->bus);

		break;

	}



	return false;

}



/**

 * elantech_setup_smbus - called once the PS/2 devices are enumerated

 * and decides to instantiate a SMBus InterTouch device.
@@ -1846,7 +1871,7 @@ static int elantech_setup_smbus(struct psmouse *psmouse, 
		 * i2c_blacklist_pnp_ids.

		 * Old ICs are up to the user to decide.

		 */

		if (!ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version) ||

		if (!elantech_use_host_notify(psmouse, info) ||

		    psmouse_matches_pnp_id(psmouse, i2c_blacklist_pnp_ids))

			return -ENXIO;

	}
@@ -1866,34 +1891,6 @@ static int elantech_setup_smbus(struct psmouse *psmouse, 
	return 0;

}



static bool elantech_use_host_notify(struct psmouse *psmouse,

				     struct elantech_device_info *info)

{

	if (ETP_NEW_IC_SMBUS_HOST_NOTIFY(info->fw_version))

		return true;



	switch (info->bus) {

	case ETP_BUS_PS2_ONLY:

		/* expected case */

		break;

	case ETP_BUS_SMB_ALERT_ONLY:

		/* fall-through  */

	case ETP_BUS_PS2_SMB_ALERT:

		psmouse_dbg(psmouse, "Ignoring SMBus provider through alert protocol.\n");

		break;

	case ETP_BUS_SMB_HST_NTFY_ONLY:

		/* fall-through  */

	case ETP_BUS_PS2_SMB_HST_NTFY:

		return true;

	default:

		psmouse_dbg(psmouse,

			    "Ignoring SMBus bus provider %d.\n",

			    info->bus);

	}



	return false;

}



int elantech_init_smbus(struct psmouse *psmouse)

{

	struct elantech_device_info info;

drivers/input/mouse/synaptics.c

+1 −0
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ static const char * const smbus_pnp_ids[] = { 
	"LEN2055", /* E580 */

	"SYN3052", /* HP EliteBook 840 G4 */

	"SYN3221", /* HP 15-ay000 */

	"SYN323d", /* HP Spectre X360 13-w013dx */

	NULL

};