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
This commit is contained in:
commit
15abf14202
|
@ -201,7 +201,12 @@ static int iforce_usb_probe(struct usb_interface *intf,
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
epirq = &interface->endpoint[0].desc;
|
epirq = &interface->endpoint[0].desc;
|
||||||
|
if (!usb_endpoint_is_int_in(epirq))
|
||||||
|
return -ENODEV;
|
||||||
|
|
||||||
epout = &interface->endpoint[1].desc;
|
epout = &interface->endpoint[1].desc;
|
||||||
|
if (!usb_endpoint_is_int_out(epout))
|
||||||
|
return -ENODEV;
|
||||||
|
|
||||||
iforce_usb = kzalloc(sizeof(*iforce_usb), GFP_KERNEL);
|
iforce_usb = kzalloc(sizeof(*iforce_usb), GFP_KERNEL);
|
||||||
if (!iforce_usb)
|
if (!iforce_usb)
|
||||||
|
|
|
@ -76,6 +76,8 @@ config KEYBOARD_APPLESPI
|
||||||
depends on ACPI && EFI
|
depends on ACPI && EFI
|
||||||
depends on SPI
|
depends on SPI
|
||||||
depends on X86 || COMPILE_TEST
|
depends on X86 || COMPILE_TEST
|
||||||
|
depends on LEDS_CLASS
|
||||||
|
select CRC16
|
||||||
help
|
help
|
||||||
Say Y here if you are running Linux on any Apple MacBook8,1 or later,
|
Say Y here if you are running Linux on any Apple MacBook8,1 or later,
|
||||||
or any MacBookPro13,* or MacBookPro14,*.
|
or any MacBookPro13,* or MacBookPro14,*.
|
||||||
|
|
|
@ -134,10 +134,10 @@ struct keyboard_protocol {
|
||||||
* struct tp_finger - single trackpad finger structure, le16-aligned
|
* struct tp_finger - single trackpad finger structure, le16-aligned
|
||||||
*
|
*
|
||||||
* @origin: zero when switching track finger
|
* @origin: zero when switching track finger
|
||||||
* @abs_x: absolute x coodinate
|
* @abs_x: absolute x coordinate
|
||||||
* @abs_y: absolute y coodinate
|
* @abs_y: absolute y coordinate
|
||||||
* @rel_x: relative x coodinate
|
* @rel_x: relative x coordinate
|
||||||
* @rel_y: relative y coodinate
|
* @rel_y: relative y coordinate
|
||||||
* @tool_major: tool area, major axis
|
* @tool_major: tool area, major axis
|
||||||
* @tool_minor: tool area, minor axis
|
* @tool_minor: tool area, minor axis
|
||||||
* @orientation: 16384 when point, else 15 bit angle
|
* @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,
|
static void applespi_debug_update_dimensions(struct applespi_data *applespi,
|
||||||
const struct tp_finger *f)
|
const struct tp_finger *f)
|
||||||
{
|
{
|
||||||
applespi->tp_dim_min_x = min_t(int, applespi->tp_dim_min_x, f->abs_x);
|
applespi->tp_dim_min_x = min(applespi->tp_dim_min_x,
|
||||||
applespi->tp_dim_max_x = max_t(int, applespi->tp_dim_max_x, f->abs_x);
|
le16_to_int(f->abs_x));
|
||||||
applespi->tp_dim_min_y = min_t(int, applespi->tp_dim_min_y, f->abs_y);
|
applespi->tp_dim_max_x = max(applespi->tp_dim_max_x,
|
||||||
applespi->tp_dim_max_y = max_t(int, applespi->tp_dim_max_y, f->abs_y);
|
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)
|
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;
|
size_t tp_len;
|
||||||
|
|
||||||
tp = &message->touchpad;
|
tp = &message->touchpad;
|
||||||
tp_len = sizeof(*tp) +
|
tp_len = struct_size(tp, fingers, tp->number_of_fingers);
|
||||||
tp->number_of_fingers * sizeof(tp->fingers[0]);
|
|
||||||
|
|
||||||
if (le16_to_cpu(message->length) + 2 != tp_len) {
|
if (le16_to_cpu(message->length) + 2 != tp_len) {
|
||||||
dev_warn_ratelimited(&applespi->spi->dev,
|
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_attr = EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS |
|
||||||
EFI_VARIABLE_RUNTIME_ACCESS;
|
EFI_VARIABLE_RUNTIME_ACCESS;
|
||||||
|
|
||||||
sts = efivar_entry_set_safe(EFI_BL_LEVEL_NAME, efi_guid, efi_attr, true,
|
sts = efivar_entry_set_safe((efi_char16_t *)EFI_BL_LEVEL_NAME, efi_guid,
|
||||||
efi_data_len, &efi_data);
|
efi_attr, true, efi_data_len, &efi_data);
|
||||||
if (sts)
|
if (sts)
|
||||||
dev_warn(&applespi->spi->dev,
|
dev_warn(&applespi->spi->dev,
|
||||||
"Error saving backlight level to EFI vars: %d\n", sts);
|
"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);
|
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)
|
SET_SYSTEM_SLEEP_PM_OPS(applespi_suspend, applespi_resume)
|
||||||
.poweroff_late = applespi_poweroff_late,
|
.poweroff_late = applespi_poweroff_late,
|
||||||
};
|
};
|
||||||
|
|
|
@ -1827,6 +1827,31 @@ static int elantech_create_smbus(struct psmouse *psmouse,
|
||||||
leave_breadcrumbs);
|
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
|
* elantech_setup_smbus - called once the PS/2 devices are enumerated
|
||||||
* and decides to instantiate a SMBus InterTouch device.
|
* and decides to instantiate a SMBus InterTouch device.
|
||||||
|
@ -1846,7 +1871,7 @@ static int elantech_setup_smbus(struct psmouse *psmouse,
|
||||||
* i2c_blacklist_pnp_ids.
|
* i2c_blacklist_pnp_ids.
|
||||||
* Old ICs are up to the user to decide.
|
* 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))
|
psmouse_matches_pnp_id(psmouse, i2c_blacklist_pnp_ids))
|
||||||
return -ENXIO;
|
return -ENXIO;
|
||||||
}
|
}
|
||||||
|
@ -1866,34 +1891,6 @@ static int elantech_setup_smbus(struct psmouse *psmouse,
|
||||||
return 0;
|
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)
|
int elantech_init_smbus(struct psmouse *psmouse)
|
||||||
{
|
{
|
||||||
struct elantech_device_info info;
|
struct elantech_device_info info;
|
||||||
|
|
|
@ -182,6 +182,7 @@ static const char * const smbus_pnp_ids[] = {
|
||||||
"LEN2055", /* E580 */
|
"LEN2055", /* E580 */
|
||||||
"SYN3052", /* HP EliteBook 840 G4 */
|
"SYN3052", /* HP EliteBook 840 G4 */
|
||||||
"SYN3221", /* HP 15-ay000 */
|
"SYN3221", /* HP 15-ay000 */
|
||||||
|
"SYN323d", /* HP Spectre X360 13-w013dx */
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -117,6 +117,10 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
|
||||||
if (intf->cur_altsetting->desc.bNumEndpoints < 1)
|
if (intf->cur_altsetting->desc.bNumEndpoints < 1)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
|
endpoint = &intf->cur_altsetting->endpoint[0].desc;
|
||||||
|
if (!usb_endpoint_is_int_in(endpoint))
|
||||||
|
return -ENODEV;
|
||||||
|
|
||||||
kbtab = kzalloc(sizeof(struct kbtab), GFP_KERNEL);
|
kbtab = kzalloc(sizeof(struct kbtab), GFP_KERNEL);
|
||||||
input_dev = input_allocate_device();
|
input_dev = input_allocate_device();
|
||||||
if (!kbtab || !input_dev)
|
if (!kbtab || !input_dev)
|
||||||
|
@ -155,8 +159,6 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
|
||||||
input_set_abs_params(input_dev, ABS_Y, 0, 0x1750, 4, 0);
|
input_set_abs_params(input_dev, ABS_Y, 0, 0x1750, 4, 0);
|
||||||
input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xff, 0, 0);
|
input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xff, 0, 0);
|
||||||
|
|
||||||
endpoint = &intf->cur_altsetting->endpoint[0].desc;
|
|
||||||
|
|
||||||
usb_fill_int_urb(kbtab->irq, dev,
|
usb_fill_int_urb(kbtab->irq, dev,
|
||||||
usb_rcvintpipe(dev, endpoint->bEndpointAddress),
|
usb_rcvintpipe(dev, endpoint->bEndpointAddress),
|
||||||
kbtab->data, 8,
|
kbtab->data, 8,
|
||||||
|
|
|
@ -1659,6 +1659,8 @@ static int usbtouch_probe(struct usb_interface *intf,
|
||||||
if (!usbtouch || !input_dev)
|
if (!usbtouch || !input_dev)
|
||||||
goto out_free;
|
goto out_free;
|
||||||
|
|
||||||
|
mutex_init(&usbtouch->pm_mutex);
|
||||||
|
|
||||||
type = &usbtouch_dev_info[id->driver_info];
|
type = &usbtouch_dev_info[id->driver_info];
|
||||||
usbtouch->type = type;
|
usbtouch->type = type;
|
||||||
if (!type->process_pkt)
|
if (!type->process_pkt)
|
||||||
|
|
Loading…
Reference in New Issue